Re: [libvirt] [PATCH 2/2] qemu: Support multiqueue virtio-blk

@@ -3053,6 +3053,10 @@ <code>bus</code> and "pci" or "ccw" <code>address</code> types. <span class='since'>Since 1.2.8 (QEMU 2.1)</span> </li> + <li> + The optional <code>queues</code> attribute specifies the number of + virt queues for virtio-blk. (<span class="since">Since 3.8.0</span>)

+ </li> <li> For virtio disks, <a href="#elementsVirtio">Virtio-specific options</a> can also be

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 87192eb2d..90572d51a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8761,6 +8761,15 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def, } VIR_FREE(tmp); + if ((tmp = virXMLPropString(cur, "queues")) && + virStrToLong_ui(tmp, NULL, 10, &def->queues) < 0) {

+ virReportError(VIR_ERR_XML_ERROR, + _("'queues' attribute must be positive number: %s"), + tmp); + goto cleanup; + } + VIR_FREE(tmp); + ret = 0; cleanup: @@ -21996,6 +22005,16 @@ virDomainDiskDefFormat(virBufferPtr buf, virBufferAsprintf(&driverBuf, " iothread='%u'", def->iothread); if (def->detect_zeroes) virBufferAsprintf(&driverBuf, " detect_zeroes='%s'", detect_zeroes); + if (def->queues) { + if (def->bus == VIR_DOMAIN_DISK_BUS_VIRTIO) + virBufferAsprintf(&driverBuf, " queues='%u'", def->queues); + else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("queues attribute in disk driver element is only " + "supported by virtio-blk")); + return -1;

+ } + } virDomainVirtioOptionsFormat(&driverBuf, def->virtio);

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4f141e0ac..4d2787d8f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2082,6 +2082,10 @@ qemuBuildDriveDevStr(const virDomainDef *def, (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) ? "on" : "off"); } + if (disk->queues && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES)) { + virBufferAsprintf(&opt, ",num-queues=%u", disk->queues);

+ } if (qemuBuildVirtioOptionsStr(&opt, disk->virtio, qemuCaps) < 0) goto error;