From 18b428980f85e8c48de0b4a9d09a732495190bdc Mon Sep 17 00:00:00 2001
From: Osier Yang <jyang@redhat.com>
Date: Wed, 24 Apr 2013 17:24:13 +0800
Subject: [PATCH] Change the tag name "num_queues" into "queues"

Instead of making a choice between the underscore and camelCase, this
simply changes "num_queues" into "queues", which is also consistent
with Michal's multiple queue support for interface.
---
 docs/formatdomain.html.in                          |  2 +-
 docs/schemas/domaincommon.rng                      |  2 +-
 src/conf/domain_conf.c                             | 14 +++++++-------
 src/conf/domain_conf.h                             |  2 +-
 src/qemu/qemu_command.c                            |  8 ++++----
 .../qemuxml2argv-disk-virtio-scsi-num_queues.xml   |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index bb75943bc4..4e9665fb31 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -2135,7 +2135,7 @@
       controller.  A "scsi" controller has an optional
       attribute <code>model</code>, which is one of "auto", "buslogic",
       "ibmvscsi", "lsilogic", "lsisas1068", "lsisas1078", "virtio-scsi" or
-      "vmpvscsi".  The attribute <code>num_queues</code>
+      "vmpvscsi".  The attribute <code>queues</code>
       (<span class="since">1.0.5 (QEMU and KVM only)</span>) specifies
       the number of queues for the controller. For best performance, it's
       recommended to specify a value matching the number of vCPUs.  A "usb"
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 3976b82952..b1c4c2f854 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1444,7 +1444,7 @@
               </attribute>
             </optional>
             <optional>
-              <attribute name="num_queues">
+              <attribute name="queues">
                 <ref name="unsignedInt"/>
               </attribute>
             </optional>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index dc0ecaa1dc..253c9ef70a 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5159,7 +5159,7 @@ virDomainControllerDefParseXML(xmlNodePtr node,
     char *type = NULL;
     char *idx = NULL;
     char *model = NULL;
-    char *num_queues = NULL;
+    char *queues = NULL;
 
     if (VIR_ALLOC(def) < 0) {
         virReportOOMError();
@@ -5195,10 +5195,10 @@ virDomainControllerDefParseXML(xmlNodePtr node,
         def->model = -1;
     }
 
-    if ((num_queues = virXMLPropString(node, "num_queues"))) {
-        if (virStrToLong_ui(num_queues, NULL, 10, &def->num_queues) < 0) {
+    if ((queues = virXMLPropString(node, "queues"))) {
+        if (virStrToLong_ui(queues, NULL, 10, &def->queues) < 0) {
             virReportError(VIR_ERR_XML_ERROR,
-                           _("Malformed 'num_queues' value '%s'"), num_queues);
+                           _("Malformed 'queues' value '%s'"), queues);
             goto error;
         }
     }
@@ -5280,7 +5280,7 @@ cleanup:
     VIR_FREE(type);
     VIR_FREE(idx);
     VIR_FREE(model);
-    VIR_FREE(num_queues);
+    VIR_FREE(queues);
 
     return def;
 
@@ -13524,8 +13524,8 @@ virDomainControllerDefFormat(virBufferPtr buf,
         virBufferEscapeString(buf, " model='%s'", model);
     }
 
-    if (def->num_queues)
-        virBufferAsprintf(buf, " num_queues='%u'", def->num_queues);
+    if (def->queues)
+        virBufferAsprintf(buf, " queues='%u'", def->queues);
 
     switch (def->type) {
     case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL:
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 5b069b681c..acf18f8b6c 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -742,7 +742,7 @@ struct _virDomainControllerDef {
     int type;
     int idx;
     int model; /* -1 == undef */
-    unsigned int num_queues;
+    unsigned int queues;
     union {
         virDomainVirtioSerialOpts vioserial;
     } opts;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 1e2be0d2be..7245b27c18 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3524,11 +3524,11 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef,
     virBuffer buf = VIR_BUFFER_INITIALIZER;
     int model;
 
-    if (def->num_queues &&
+    if (def->queues &&
         !(def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI &&
           def->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI)) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("'num_queues' is only supported by virtio-scsi controller"));
+                       _("'queues' is only supported by virtio-scsi controller"));
         return NULL;
     }
 
@@ -3615,8 +3615,8 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef,
         goto error;
     }
 
-    if (def->num_queues)
-        virBufferAsprintf(&buf, ",num_queues=%u", def->num_queues);
+    if (def->queues)
+        virBufferAsprintf(&buf, ",num_queues=%u", def->queues);
 
     if (qemuBuildDeviceAddressStr(&buf, &def->info, qemuCaps) < 0)
         goto error;
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml
index dfa9cf183c..b3b1289f85 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml
@@ -20,7 +20,7 @@
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <controller type='usb' index='0'/>
-    <controller type='scsi' index='0' model='virtio-scsi' num_queues='8'/>
+    <controller type='scsi' index='0' model='virtio-scsi' queues='8'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>
-- 
GitLab