External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

Change the tag name "num_queues" into "queues"

Browse Source 
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.
This commit is contained in:
Osier Yang 2013-04-24 17:24:13 +08:00
parent 148edcce66
commit 18b428980f
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/formatdomain.html.in
View File

@ -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"

2
docs/schemas/domaincommon.rng
View File

@ -1444,7 +1444,7 @@
</attribute>
</optional>
<optional>
<attribute name="num_queues">
<attribute name="queues">
<ref name="unsignedInt"/>
</attribute>
</optional>

14
src/conf/domain_conf.c
View File

@ -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:

2
src/conf/domain_conf.h
View File

@ -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;

8
src/qemu/qemu_command.c
View File

@ -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;

2
tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml
View File

@ -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>