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

qemu 2.7.0 introduces multiqueue virtio-blk(commit 2f27059). This patch introduces a new attribute "queues". An example of the XML: <disk type='file' device='disk'> <driver name='qemu' type='qcow2' queues='4'/> The corresponding QEMU command line: -device virtio-blk-pci,scsi=off,num-queues=4,id=virtio-disk0 Signed-off-by: Lin Ma <lma(a)suse.com&gt; --- docs/formatdomain.html.in | 6 +++- docs/schemas/domaincommon.rng | 5 ++++ src/conf/domain_conf.c | 18 ++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 7 +++++ src/qemu/qemu_domain.c | 24 +++++++++++++++ src/qemu/qemu_domain.h | 3 ++ .../qemuxml2argv-disk-virtio-drive-queues.args | 24 +++++++++++++++ .../qemuxml2argv-disk-virtio-drive-queues.xml | 34 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ .../qemuxml2xmlout-disk-virtio-drive-queues.xml | 34 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 12 files changed, 158 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-drive-queues.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-drive-queues.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-drive-queues.xml

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4f141e0..7e5c9cb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2083,6 +2083,13 @@ qemuBuildDriveDevStr(const virDomainDef *def, ? "on" : "off"); } + if (disk->queues) { + if (qemuDomainDefValidateDisk(disk, qemuCaps) < 0) + goto error;

+ else

+ virBufferAsprintf(&opt, ",num-queues=%u", disk->queues); + } + if (qemuBuildVirtioOptionsStr(&opt, disk->virtio, qemuCaps) < 0) goto error;