From nobody Fri May 3 06:16:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1535724200342310.7407821140099; Fri, 31 Aug 2018 07:03:20 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F073180F8D; Fri, 31 Aug 2018 14:03:17 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A73FF100034A; Fri, 31 Aug 2018 14:03:17 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5D410181A12D; Fri, 31 Aug 2018 14:03:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w7VE3GB1027179 for ; Fri, 31 Aug 2018 10:03:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2563E5033E; Fri, 31 Aug 2018 14:03:16 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BB4A942224 for ; Fri, 31 Aug 2018 14:03:15 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 31 Aug 2018 16:03:09 +0200 Message-Id: <20180831140310.3843-2-abologna@redhat.com> In-Reply-To: <20180831140310.3843-1-abologna@redhat.com> References: <20180831140310.3843-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/2] tests: Fix use of virtio-serial for aarch64/virt X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 31 Aug 2018 14:03:19 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" virtio-serial is an alias for virtio-serial-pci, which should not have been used for a PCIe-less aarch64/virt guest but it ended up being used anyway because the virtio-mmio capability was missing and the algorithm is buggy. Fix the test case so that we can fix the algorithm next. Signed-off-by: Andrea Bolognani Reviewed-by: J=EF=BF=BDn Tomko --- tests/qemuxml2argvdata/mach-virt-console-virtio.args | 2 +- tests/qemuxml2argvtest.c | 3 ++- tests/qemuxml2xmloutdata/mach-virt-console-virtio.xml | 4 +++- tests/qemuxml2xmltest.c | 6 ++++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/qemuxml2argvdata/mach-virt-console-virtio.args b/tests/q= emuxml2argvdata/mach-virt-console-virtio.args index d76c5892aa..f4a43ff7c6 100644 --- a/tests/qemuxml2argvdata/mach-virt-console-virtio.args +++ b/tests/qemuxml2argvdata/mach-virt-console-virtio.args @@ -20,6 +20,6 @@ server,nowait \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ --device virtio-serial,id=3Dvirtio-serial0 \ +-device virtio-serial-device,id=3Dvirtio-serial0 \ -chardev pty,id=3Dcharconsole0 \ -device virtconsole,chardev=3Dcharconsole0,id=3Dconsole0 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 9bfe864597..144e595310 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1976,7 +1976,8 @@ mymain(void) QEMU_CAPS_DEVICE_USB_SERIAL); DO_TEST("mach-virt-console-native", QEMU_CAPS_DEVICE_PL011); - DO_TEST("mach-virt-console-virtio", NONE); + DO_TEST("mach-virt-console-virtio", + QEMU_CAPS_DEVICE_VIRTIO_MMIO); DO_TEST_PARSE_ERROR("mach-virt-serial-invalid-machine", NONE); =20 DO_TEST("disk-ide-split", diff --git a/tests/qemuxml2xmloutdata/mach-virt-console-virtio.xml b/tests/= qemuxml2xmloutdata/mach-virt-console-virtio.xml index 3e46cd2012..84e5c37ad9 100644 --- a/tests/qemuxml2xmloutdata/mach-virt-console-virtio.xml +++ b/tests/qemuxml2xmloutdata/mach-virt-console-virtio.xml @@ -18,7 +18,9 @@ /usr/bin/qemu-system-aarch64 - + +
+ diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 43fd4e5f0f..47da7a7201 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -644,8 +644,10 @@ mymain(void) QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, QEMU_CAPS_DEVICE_QEMU_XHCI, QEMU_CAPS_DEVICE_USB_SERIAL); - DO_TEST("mach-virt-console-native", NONE); - DO_TEST("mach-virt-console-virtio", NONE); + DO_TEST("mach-virt-console-native", + QEMU_CAPS_DEVICE_PL011); + DO_TEST("mach-virt-console-virtio", + QEMU_CAPS_DEVICE_VIRTIO_MMIO); =20 DO_TEST("balloon-device-auto", NONE); DO_TEST("balloon-device-period", NONE); --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 06:16:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1535724204962163.0036754313736; Fri, 31 Aug 2018 07:03:24 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1485A301A3BA; Fri, 31 Aug 2018 14:03:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C7E46605BF; Fri, 31 Aug 2018 14:03:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 82D3F181A12E; Fri, 31 Aug 2018 14:03:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w7VE3Hv3027185 for ; Fri, 31 Aug 2018 10:03:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0948B39DDC; Fri, 31 Aug 2018 14:03:17 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6244442224 for ; Fri, 31 Aug 2018 14:03:16 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 31 Aug 2018 16:03:10 +0200 Message-Id: <20180831140310.3843-3-abologna@redhat.com> In-Reply-To: <20180831140310.3843-1-abologna@redhat.com> References: <20180831140310.3843-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] qemu: Unify generation of command line for virtio devices X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Fri, 31 Aug 2018 14:03:24 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" A virtio device such as will be translated to one of four different QEMU devices based on the address type. This behavior is the same for all virtio devices, but unfortunately we have separate ad-hoc code dealing with each and every one of them: not only this is pointless duplication, but it turns out that most of that code is not robust against new address types being introduced and some of it is outright buggy. Introduce a new function, qemuBuildVirtioDevStr(), which deals with the issue in a generic fashion, and rewrite all existing code to use it. This fixes a bunch of issues such as virtio-serial-pci being used with virtio-mmio addresses and virtio-gpu not being usable at all with virtio-mmio addresses. It also introduces a couple of minor regressions, namely no longer erroring out when attempting to use virtio-balloon and virtio-input devices with virtio-s390 addresses; that said, virtio-s390 has been superseded by virtio-ccw such a long time ago that recent QEMU releases have dropped support for the former entirely, so re-implementing such device-specific validation is not worth it. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_command.c | 299 ++++++++++++++++++++++------------------ 1 file changed, 163 insertions(+), 136 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8aa20496bc..04554d958b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1812,6 +1812,62 @@ qemuBuildDriveDevCacheStr(virDomainDiskDefPtr disk, } =20 =20 +static char* +qemuBuildVirtioDevStr(const virDomainDeviceInfo *info, + const char *baseName) +{ + virBuffer buf =3D VIR_BUFFER_INITIALIZER; + const char *implName =3D NULL; + + switch ((virDomainDeviceAddressType)info->type) { + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: + implName =3D "pci"; + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO: + implName =3D "device"; + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: + implName =3D "ccw"; + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390: + implName =3D "s390"; + break; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected address type for %s"), baseName); + goto error; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST: + default: + virReportEnumRangeError(virDomainDeviceAddressType, + info->type); + goto error; + } + + virBufferAsprintf(&buf, "%s-%s", baseName, implName); + + if (virBufferCheckError(&buf) < 0) + goto error; + + return virBufferContentAndReset(&buf); + + error: + virBufferFreeAndReset(&buf); + return NULL; +} + + char * qemuBuildDiskDeviceStr(const virDomainDef *def, virDomainDiskDefPtr disk, @@ -1822,6 +1878,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, const char *bus =3D virDomainDiskQEMUBusTypeToString(disk->bus); const char *contAlias; char *backendAlias =3D NULL; + char *devStr =3D NULL; int controllerModel; =20 if (qemuCheckDiskConfig(disk, qemuCaps) < 0) @@ -2002,21 +2059,19 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, break; =20 case VIR_DOMAIN_DISK_BUS_VIRTIO: - if (disk->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { - virBufferAddLit(&opt, "virtio-blk-ccw"); - if (disk->iothread) - virBufferAsprintf(&opt, ",iothread=3Diothread%u", disk->io= thread); - } else if (disk->info.type =3D=3D - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) { - virBufferAddLit(&opt, "virtio-blk-s390"); - } else if (disk->info.type =3D=3D - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO) { - virBufferAddLit(&opt, "virtio-blk-device"); - } else { - virBufferAddLit(&opt, "virtio-blk-pci"); - if (disk->iothread) - virBufferAsprintf(&opt, ",iothread=3Diothread%u", disk->io= thread); + + if (!(devStr =3D qemuBuildVirtioDevStr(&(disk->info), "virtio-blk"= ))) + goto error; + + virBufferAddStr(&opt, devStr); + VIR_FREE(devStr); + + if (disk->iothread && + (disk->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW || + disk->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI)) { + virBufferAsprintf(&opt, ",iothread=3Diothread%u", disk->iothre= ad); } + qemuBuildIoEventFdStr(&opt, disk->ioeventfd, qemuCaps); if (disk->event_idx && virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_EVENT_IDX)) { @@ -2150,6 +2205,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, return virBufferContentAndReset(&opt); =20 error: + VIR_FREE(devStr); VIR_FREE(backendAlias); virBufferFreeAndReset(&opt); return NULL; @@ -2539,6 +2595,7 @@ qemuBuildFSDevStr(const virDomainDef *def, virQEMUCapsPtr qemuCaps) { virBuffer opt =3D VIR_BUFFER_INITIALIZER; + char *devStr =3D NULL; =20 if (fs->type !=3D VIR_DOMAIN_FS_TYPE_MOUNT) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -2546,10 +2603,11 @@ qemuBuildFSDevStr(const virDomainDef *def, goto error; } =20 - if (fs->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) - virBufferAddLit(&opt, "virtio-9p-ccw"); - else - virBufferAddLit(&opt, "virtio-9p-pci"); + if (!(devStr =3D qemuBuildVirtioDevStr(&(fs->info), "virtio-9p"))) + goto error; + + virBufferAddStr(&opt, devStr); + VIR_FREE(devStr); =20 virBufferAsprintf(&opt, ",id=3D%s", fs->info.alias); virBufferAsprintf(&opt, ",fsdev=3D%s%s", @@ -2569,6 +2627,7 @@ qemuBuildFSDevStr(const virDomainDef *def, return virBufferContentAndReset(&opt); =20 error: + VIR_FREE(devStr); virBufferFreeAndReset(&opt); return NULL; } @@ -2744,7 +2803,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD= ef, int *nusbcontroller) { virBuffer buf =3D VIR_BUFFER_INITIALIZER; - int address_type =3D def->info.type; + char *devStr =3D NULL; =20 *devstr =3D NULL; =20 @@ -2752,19 +2811,11 @@ qemuBuildControllerDevStr(const virDomainDef *domai= nDef, case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: switch ((virDomainControllerModelSCSI) def->model) { case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI: - switch (address_type) { - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: - virBufferAddLit(&buf, "virtio-scsi-ccw"); - break; - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390: - virBufferAddLit(&buf, "virtio-scsi-s390"); - break; - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO: - virBufferAddLit(&buf, "virtio-scsi-device"); - break; - default: - virBufferAddLit(&buf, "virtio-scsi-pci"); - } + if (!(devStr =3D qemuBuildVirtioDevStr(&(def->info), "virtio-s= csi"))) + goto error; + + virBufferAddStr(&buf, devStr); + VIR_FREE(devStr); =20 if (def->iothread) { virBufferAsprintf(&buf, ",iothread=3Diothread%u", @@ -2804,22 +2855,12 @@ qemuBuildControllerDevStr(const virDomainDef *domai= nDef, break; =20 case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: - switch (address_type) { - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: - virBufferAddLit(&buf, "virtio-serial-pci"); - break; - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: - virBufferAddLit(&buf, "virtio-serial-ccw"); - break; - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390: - virBufferAddLit(&buf, "virtio-serial-s390"); - break; - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO: - virBufferAddLit(&buf, "virtio-serial-device"); - break; - default: - virBufferAddLit(&buf, "virtio-serial"); - } + if (!(devStr =3D qemuBuildVirtioDevStr(&(def->info), "virtio-seria= l"))) + goto error; + + virBufferAddStr(&buf, devStr); + VIR_FREE(devStr); + virBufferAsprintf(&buf, ",id=3D%s", def->info.alias); if (def->opts.vioserial.ports !=3D -1) { virBufferAsprintf(&buf, ",max_ports=3D%d", @@ -2948,6 +2989,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD= ef, return 0; =20 error: + VIR_FREE(devStr); virBufferFreeAndReset(&buf); return -1; } @@ -3520,21 +3562,20 @@ qemuBuildNicDevStr(virDomainDefPtr def, const char *nic =3D net->model; bool usingVirtio =3D false; char macaddr[VIR_MAC_STRING_BUFLEN]; + char *devStr =3D NULL; =20 if (STREQ(net->model, "virtio")) { - if (net->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) - nic =3D "virtio-net-ccw"; - else if (net->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRT= IO_S390) - nic =3D "virtio-net-s390"; - else if (net->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRT= IO_MMIO) - nic =3D "virtio-net-device"; - else - nic =3D "virtio-net-pci"; - usingVirtio =3D true; + + if (!(devStr =3D qemuBuildVirtioDevStr(&(net->info), "virtio-net")= )) + goto error; + + virBufferAddStr(&buf, devStr); + VIR_FREE(devStr); + } else { + virBufferAddStr(&buf, nic); } =20 - virBufferAdd(&buf, nic, -1); if (usingVirtio && net->driver.virtio.txmode) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_TX_ALG)) { virBufferAddLit(&buf, ",tx=3D"); @@ -3681,6 +3722,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, return virBufferContentAndReset(&buf); =20 error: + VIR_FREE(devStr); virBufferFreeAndReset(&buf); return NULL; } @@ -3914,6 +3956,7 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps) { virBuffer buf =3D VIR_BUFFER_INITIALIZER; + char *devStr =3D NULL; =20 if (STRPREFIX(def->os.machine, "s390-virtio") && virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_S390) && def->memballoon) @@ -3929,22 +3972,11 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd, return -1; } =20 - switch (def->memballoon->info.type) { - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: - virBufferAddLit(&buf, "virtio-balloon-pci"); - break; - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: - virBufferAddLit(&buf, "virtio-balloon-ccw"); - break; - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO: - virBufferAddLit(&buf, "virtio-balloon-device"); - break; - default: - virReportError(VIR_ERR_XML_ERROR, - _("memballoon unsupported with address type '%s= '"), - virDomainDeviceAddressTypeToString(def->memball= oon->info.type)); - goto error; - } + if (!(devStr =3D qemuBuildVirtioDevStr(&(def->memballoon->info), "virt= io-balloon"))) + goto error; + + virBufferAddStr(&buf, devStr); + VIR_FREE(devStr); =20 virBufferAsprintf(&buf, ",id=3D%s", def->memballoon->info.alias); if (qemuBuildDeviceAddressStr(&buf, def, &def->memballoon->info, qemuC= aps) < 0) @@ -3969,6 +4001,7 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd, return 0; =20 error: + VIR_FREE(devStr); virBufferFreeAndReset(&buf); return -1; } @@ -4040,63 +4073,57 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def, virQEMUCapsPtr qemuCaps) { virBuffer buf =3D VIR_BUFFER_INITIALIZER; - const char *suffix; - - if (dev->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { - suffix =3D "-pci"; - } else if (dev->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { - suffix =3D "-ccw"; - } else if (dev->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO= _MMIO) { - suffix =3D "-device"; - } else { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported address type %s for virtio input dev= ice"), - virDomainDeviceAddressTypeToString(dev->info.type)); - goto error; - } + const char *baseName; + char *devStr; + int cap; + int ccwCap; =20 switch ((virDomainInputType)dev->type) { case VIR_DOMAIN_INPUT_TYPE_MOUSE: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_MOUSE) || - (dev->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW))= ) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio-mouse is not supported by this QEMU b= inary")); - goto error; - } - virBufferAsprintf(&buf, "virtio-mouse%s,id=3D%s", suffix, dev->inf= o.alias); + baseName =3D "virtio-mouse"; + cap =3D QEMU_CAPS_VIRTIO_MOUSE; + ccwCap =3D QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW; break; case VIR_DOMAIN_INPUT_TYPE_TABLET: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_TABLET) || - (dev->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW)= )) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio-tablet is not supported by this QEMU = binary")); - goto error; - } - virBufferAsprintf(&buf, "virtio-tablet%s,id=3D%s", suffix, dev->in= fo.alias); + baseName =3D "virtio-tablet"; + cap =3D QEMU_CAPS_VIRTIO_TABLET; + ccwCap =3D QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW; break; case VIR_DOMAIN_INPUT_TYPE_KBD: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_KEYBOARD) || - (dev->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_KEYBOARD_CC= W))) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio-keyboard is not supported by this QEM= U binary")); - goto error; - } - virBufferAsprintf(&buf, "virtio-keyboard%s,id=3D%s", suffix, dev->= info.alias); + baseName =3D "virtio-keyboard"; + cap =3D QEMU_CAPS_VIRTIO_KEYBOARD; + ccwCap =3D QEMU_CAPS_DEVICE_VIRTIO_KEYBOARD_CCW; break; case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_INPUT_HOST)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio-input-host is not supported by this Q= EMU binary")); - goto error; - } - virBufferAsprintf(&buf, "virtio-input-host%s,id=3D%s,evdev=3D", su= ffix, dev->info.alias); - virQEMUBuildBufferEscapeComma(&buf, dev->source.evdev); + baseName =3D "virtio-input-host"; + cap =3D QEMU_CAPS_VIRTIO_INPUT_HOST; + ccwCap =3D QEMU_CAPS_VIRTIO_INPUT_HOST; break; case VIR_DOMAIN_INPUT_TYPE_LAST: - break; + default: + virReportEnumRangeError(virDomainInputType, + dev->type); + goto error; + } + + if (!virQEMUCapsGet(qemuCaps, cap) || + (dev->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW && + !virQEMUCapsGet(qemuCaps, ccwCap))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("%s is not supported by this QEMU binary"), + baseName); + goto error; + } + + if (!(devStr =3D qemuBuildVirtioDevStr(&(dev->info), baseName))) + goto error; + + virBufferAsprintf(&buf, "%s,id=3D%s", devStr, dev->info.alias); + VIR_FREE(devStr); + + if (dev->type =3D=3D VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH) { + virBufferAddLit(&buf, ",evdev=3D"); + virQEMUBuildBufferEscapeComma(&buf, dev->source.evdev); } =20 if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0) @@ -4111,6 +4138,7 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def, return virBufferContentAndReset(&buf); =20 error: + VIR_FREE(devStr); virBufferFreeAndReset(&buf); return NULL; } @@ -4378,6 +4406,7 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, { virBuffer buf =3D VIR_BUFFER_INITIALIZER; const char *model; + char *devStr =3D NULL; =20 /* We try to chose the best model for primary video device by preferri= ng * model with VGA compatibility mode. For some video devices on some @@ -4396,10 +4425,11 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, } =20 if (STREQ(model, "virtio-gpu")) { - if (video->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) - virBufferAsprintf(&buf, "%s-ccw", model); - else - virBufferAsprintf(&buf, "%s-pci", model); + if (!(devStr =3D qemuBuildVirtioDevStr(&(video->info), "virtio-gpu= "))) + goto error; + + virBufferAddStr(&buf, devStr); + VIR_FREE(devStr); } else { virBufferAsprintf(&buf, "%s", model); } @@ -4462,6 +4492,7 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, return virBufferContentAndReset(&buf); =20 error: + VIR_FREE(devStr); virBufferFreeAndReset(&buf); return NULL; } @@ -5817,6 +5848,7 @@ qemuBuildRNGDevStr(const virDomainDef *def, virQEMUCapsPtr qemuCaps) { virBuffer buf =3D VIR_BUFFER_INITIALIZER; + char *devStr =3D NULL; =20 if (dev->model !=3D VIR_DOMAIN_RNG_MODEL_VIRTIO || !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_RNG)) { @@ -5830,18 +5862,12 @@ qemuBuildRNGDevStr(const virDomainDef *def, dev->source.file)) goto error; =20 - if (dev->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) - virBufferAsprintf(&buf, "virtio-rng-ccw,rng=3Dobj%s,id=3D%s", - dev->info.alias, dev->info.alias); - else if (dev->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S= 390) - virBufferAsprintf(&buf, "virtio-rng-s390,rng=3Dobj%s,id=3D%s", - dev->info.alias, dev->info.alias); - else if (dev->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_M= MIO) - virBufferAsprintf(&buf, "virtio-rng-device,rng=3Dobj%s,id=3D%s", - dev->info.alias, dev->info.alias); - else - virBufferAsprintf(&buf, "virtio-rng-pci,rng=3Dobj%s,id=3D%s", - dev->info.alias, dev->info.alias); + if (!(devStr =3D qemuBuildVirtioDevStr(&(dev->info), "virtio-rng"))) + goto error; + + virBufferAsprintf(&buf, "%s,rng=3Dobj%s,id=3D%s", + devStr, dev->info.alias, dev->info.alias); + VIR_FREE(devStr); =20 if (dev->rate > 0) { virBufferAsprintf(&buf, ",max-bytes=3D%u", dev->rate); @@ -5862,6 +5888,7 @@ qemuBuildRNGDevStr(const virDomainDef *def, return virBufferContentAndReset(&buf); =20 error: + VIR_FREE(devStr); virBufferFreeAndReset(&buf); return NULL; } --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list