[libvirt] [PATCH v2 0/2] Add support for virtio-scsi controllers with ioeventfd
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1150484 v2: - Changed one occurence virTristateBool to virTristateSwitch as it should be - wrapped one line to be <= 80 characters long - Rebased on top of current master (with laine's patches pushed) Martin Kletzander (2): conf: Add ioeventfd option for controllers qemu: Enable ioeventfd usage for virtio-scsi controllers docs/formatdomain.html.in | 8 ++++++ docs/schemas/domaincommon.rng | 3 +++ src/conf/domain_conf.c | 20 +++++++++++++-- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 7 ++++++ .../qemuxml2argv-disk-virtio-scsi-ioeventfd.args | 9 +++++++ .../qemuxml2argv-disk-virtio-scsi-ioeventfd.xml | 29 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 +++ tests/qemuxml2xmltest.c | 1 + 9 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.xml -- 2.5.0
This will be used with a virtio-scsi controller later on. Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- docs/formatdomain.html.in | 8 ++++++ docs/schemas/domaincommon.rng | 3 +++ src/conf/domain_conf.c | 20 +++++++++++++-- src/conf/domain_conf.h | 1 + .../qemuxml2argv-disk-virtio-scsi-ioeventfd.xml | 29 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 6 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 7eb21a8897dc..c3b495ac22de 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3000,6 +3000,14 @@ a sector is 512 bytes. <span class="since">Since 1.2.7 (QEMU and KVM only)</span> </dd> + <dt><code>ioeventfd</code></dt> + <dd> + The optional <code>ioeventfd</code> attribute specifies + whether the controller should use + <a href='https://patchwork.kernel.org/patch/43390/'> + I/O asynchronous handling</a> or not. Accepted values are + "on" and "off". <span class="since">Since 1.2.18</span> + </dd> </dl> <p> USB companion controllers have an optional diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index ab02d14f8ee7..043c9757d268 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1832,6 +1832,9 @@ <ref name="unsignedInt"/> </attribute> </optional> + <optional> + <ref name="ioeventfd"/> + </optional> </element> </optional> </interleave> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8790aabe057a..fd0450f09b37 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7824,6 +7824,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, char *chassisNr = NULL; char *chassis = NULL; char *port = NULL; + char *ioeventfd = NULL; xmlNodePtr saved = ctxt->node; int rc; @@ -7867,6 +7868,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, queues = virXMLPropString(cur, "queues"); cmd_per_lun = virXMLPropString(cur, "cmd_per_lun"); max_sectors = virXMLPropString(cur, "max_sectors"); + ioeventfd = virXMLPropString(cur, "ioeventfd"); } else if (xmlStrEqual(cur->name, BAD_CAST "model")) { if (processedModel) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -7910,6 +7912,13 @@ virDomainControllerDefParseXML(xmlNodePtr node, goto error; } + if (ioeventfd && + (def->ioeventfd = virTristateSwitchTypeFromString(ioeventfd)) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Malformed 'ioeventfd' value %s'"), max_sectors); + goto error; + } + if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && def->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE) { VIR_DEBUG("Ignoring device address for none model usb controller"); @@ -8083,6 +8092,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, VIR_FREE(chassisNr); VIR_FREE(chassis); VIR_FREE(port); + VIR_FREE(ioeventfd); return def; @@ -19148,7 +19158,7 @@ virDomainControllerDefFormat(virBufferPtr buf, } if (pciModel || pciTarget || - def->queues || def->cmd_per_lun || def->max_sectors || + def->queues || def->cmd_per_lun || def->max_sectors || def->ioeventfd || virDomainDeviceInfoNeedsFormat(&def->info, flags) || pcihole64) { virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); @@ -19178,7 +19188,8 @@ virDomainControllerDefFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } - if (def->queues || def->cmd_per_lun || def->max_sectors) { + if (def->queues || def->cmd_per_lun || + def->max_sectors || def->ioeventfd) { virBufferAddLit(buf, "<driver"); if (def->queues) virBufferAsprintf(buf, " queues='%u'", def->queues); @@ -19188,6 +19199,11 @@ virDomainControllerDefFormat(virBufferPtr buf, if (def->max_sectors) virBufferAsprintf(buf, " max_sectors='%u'", def->max_sectors); + + if (def->ioeventfd) { + virBufferAsprintf(buf, " ioeventfd='%s'", + virTristateSwitchTypeToString(def->ioeventfd)); + } virBufferAddLit(buf, "/>\n"); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 86430efb1c7f..9762c4f27698 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -840,6 +840,7 @@ struct _virDomainControllerDef { unsigned int queues; unsigned int cmd_per_lun; unsigned int max_sectors; + int ioeventfd; /* enum virTristateSwitch */ union { virDomainVirtioSerialOpts vioserial; virDomainPCIControllerOpts pciopts; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.xml new file mode 100644 index 000000000000..f4487eb849c5 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>8</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sdb' bus='scsi'/> + <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'> + <driver ioeventfd='on'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index b261db2bcff1..08923faa8458 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -420,6 +420,7 @@ mymain(void) DO_TEST("disk-virtio-scsi-num_queues"); DO_TEST("disk-virtio-scsi-cmd_per_lun"); DO_TEST("disk-virtio-scsi-max_sectors"); + DO_TEST("disk-virtio-scsi-ioeventfd"); DO_TEST("disk-scsi-megasas"); DO_TEST_DIFFERENT("disk-mirror-old"); DO_TEST_FULL("disk-mirror", false, WHEN_ACTIVE); -- 2.5.0
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1150484 Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/qemu/qemu_command.c | 7 +++++++ .../qemuxml2argv-disk-virtio-scsi-ioeventfd.args | 9 +++++++++ tests/qemuxml2argvtest.c | 3 +++ 3 files changed, 19 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e12278c7b4fe..87468ca26fdb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4611,6 +4611,11 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, _("'max_sectors' is only supported by virtio-scsi controller")); return NULL; } + if (def->ioeventfd) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'ioeventfd' is only supported by virtio-scsi controller")); + return NULL; + } } switch (def->type) { @@ -4909,6 +4914,8 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, if (def->max_sectors) virBufferAsprintf(&buf, ",max_sectors=%u", def->max_sectors); + qemuBuildIoEventFdStr(&buf, def->ioeventfd, qemuCaps); + if (qemuBuildDeviceAddressStr(&buf, domainDef, &def->info, qemuCaps) < 0) goto error; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args new file mode 100644 index 000000000000..1c5318935512 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args @@ -0,0 +1,9 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M pc -m 214 -smp 8 -nographic -nodefconfig -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-device virtio-scsi-pci,id=scsi0,ioeventfd=on,bus=pci.0,addr=0x3 \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0 \ +-device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ +drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7c37e114f34a..c2482e612448 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -878,6 +878,9 @@ mymain(void) DO_TEST("disk-virtio-scsi-max_sectors", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI); + DO_TEST("disk-virtio-scsi-ioeventfd", + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_VIRTIO_IOEVENTFD, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-scsi-megasas", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_MEGASAS); -- 2.5.0
On Mon, Aug 10, 2015 at 10:23:47AM +0200, Martin Kletzander wrote:
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1150484
v2: - Changed one occurence virTristateBool to virTristateSwitch as it should be - wrapped one line to be <= 80 characters long - Rebased on top of current master (with laine's patches pushed)
Martin Kletzander (2): conf: Add ioeventfd option for controllers qemu: Enable ioeventfd usage for virtio-scsi controllers
docs/formatdomain.html.in | 8 ++++++ docs/schemas/domaincommon.rng | 3 +++ src/conf/domain_conf.c | 20 +++++++++++++-- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 7 ++++++ .../qemuxml2argv-disk-virtio-scsi-ioeventfd.args | 9 +++++++ .../qemuxml2argv-disk-virtio-scsi-ioeventfd.xml | 29 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 +++ tests/qemuxml2xmltest.c | 1 + 9 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.xml
ACK series Jan
participants (2)
-
Ján Tomko -
Martin Kletzander