From nobody Thu Apr 25 19:32:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.25 as permitted sender) client-ip=209.132.183.25; envelope-from=libvir-list-bounces@redhat.com; helo=mx4-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.25 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by mx.zohomail.com with SMTPS id 148770729845019.146784580083136; Tue, 21 Feb 2017 12:01:38 -0800 (PST) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v1LJvpTB031882; Tue, 21 Feb 2017 14:57:51 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v1LJvnE1020736 for ; Tue, 21 Feb 2017 14:57:49 -0500 Received: from inaba.usersys.redhat.com (ovpn-204-99.brq.redhat.com [10.40.204.99]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1LJvjbC002979 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Tue, 21 Feb 2017 14:57:48 -0500 From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 21 Feb 2017 20:57:39 +0100 Message-Id: <1487707064-29602-2-git-send-email-abologna@redhat.com> In-Reply-To: <1487707064-29602-1-git-send-email-abologna@redhat.com> References: <1487707064-29602-1-git-send-email-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/6] conf: Remove dead code 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-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The switch in virDomainPCIControllerModelToConnectType() had some code that, while techically part of the _PCIE_SWITCH_DOWNSTREAM_PORT case, was in fact dead due to the early return. Get rid of the dead code, and fix the inaccurate function description while at it. --- src/conf/domain_addr.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 1649d84..519cc6b 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -35,9 +35,8 @@ VIR_LOG_INIT("conf.domain_addr"); virDomainPCIConnectFlags virDomainPCIControllerModelToConnectType(virDomainControllerModelPCI model) { - /* given a VIR_DOMAIN_CONTROLLER_MODEL_PCI*, set connectType to - * the equivalent VIR_PCI_CONNECT_TYPE_*. return 0 on success, -1 - * if the model wasn't recognized. + /* given a VIR_DOMAIN_CONTROLLER_MODEL_PCI*, return + * the equivalent VIR_PCI_CONNECT_TYPE_*. */ switch (model) { case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: @@ -70,14 +69,6 @@ virDomainPCIControllerModelToConnectType(virDomainContro= llerModelPCI model) =20 case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_DOWNSTREAM_PORT: return VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_DOWNSTREAM_PORT; - - /* if this happens, there is an error in the code. A - * PCI controller should always have a proper model - * set - */ - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("PCI controller model incorrectly set to 'last'")= ); - return -1; } return 0; } --=20 2.7.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 19:32:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.24 as permitted sender) client-ip=209.132.183.24; envelope-from=libvir-list-bounces@redhat.com; helo=mx3-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.24 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by mx.zohomail.com with SMTPS id 1487707307099970.7699106703332; Tue, 21 Feb 2017 12:01:47 -0800 (PST) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v1LJvpWG026085; Tue, 21 Feb 2017 14:57:51 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v1LJvome020744 for ; Tue, 21 Feb 2017 14:57:50 -0500 Received: from inaba.usersys.redhat.com (ovpn-204-99.brq.redhat.com [10.40.204.99]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1LJvjbD002979 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Tue, 21 Feb 2017 14:57:49 -0500 From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 21 Feb 2017 20:57:40 +0100 Message-Id: <1487707064-29602-3-git-send-email-abologna@redhat.com> In-Reply-To: <1487707064-29602-1-git-send-email-abologna@redhat.com> References: <1487707064-29602-1-git-send-email-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/6] qemu: Make switch statements more strict 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-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" When switching over the values in the virDomainControllerModelPCI enumeration, make sure the proper cast is in place so that the compiler can warn us when the coverage is not exaustive. For the same reason, fold some unstructured checks (performed by comparing directly against some values in the enumeration) inside an existing switch statement. --- src/qemu/qemu_command.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 552fdcf..f0b938f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2664,19 +2664,13 @@ qemuBuildControllerDevStr(const virDomainDef *domai= nDef, break; =20 case VIR_DOMAIN_CONTROLLER_TYPE_PCI: - if (def->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT || - def->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("wrong function called for pci-root/pcie-root= ")); - return NULL; - } if (def->idx =3D=3D 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("index for pci controllers of model '%s' must= be > 0"), virDomainControllerModelPCITypeToString(def->mo= del)); goto error; } - switch (def->model) { + switch ((virDomainControllerModelPCI) def->model) { case VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE: if (def->opts.pciopts.modelName =3D=3D VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_NONE || @@ -2917,6 +2911,12 @@ qemuBuildControllerDevStr(const virDomainDef *domain= Def, virBufferAsprintf(&buf, ",numa_node=3D%d", def->opts.pciopts.numaNode); break; + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT: + case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT: + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("wrong function called")); + goto error; } break; =20 @@ -6501,7 +6501,7 @@ qemuBuildGlobalControllerCommandLine(virCommandPtr cm= d, bool cap =3D false; bool machine =3D false; =20 - switch (cont->model) { + switch ((virDomainControllerModelPCI) cont->model) { case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT: hoststr =3D "i440FX-pcihost"; cap =3D virQEMUCapsGet(qemuCaps, QEMU_CAPS_I440FX_PCI_HOLE= 64_SIZE); --=20 2.7.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 19:32:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.24 as permitted sender) client-ip=209.132.183.24; envelope-from=libvir-list-bounces@redhat.com; helo=mx3-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.24 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by mx.zohomail.com with SMTPS id 1487707307322554.5965974141667; Tue, 21 Feb 2017 12:01:47 -0800 (PST) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v1LJw6pO026115; Tue, 21 Feb 2017 14:58:06 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v1LJvpgf020752 for ; Tue, 21 Feb 2017 14:57:51 -0500 Received: from inaba.usersys.redhat.com (ovpn-204-99.brq.redhat.com [10.40.204.99]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1LJvjbE002979 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Tue, 21 Feb 2017 14:57:50 -0500 From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 21 Feb 2017 20:57:41 +0100 Message-Id: <1487707064-29602-4-git-send-email-abologna@redhat.com> In-Reply-To: <1487707064-29602-1-git-send-email-abologna@redhat.com> References: <1487707064-29602-1-git-send-email-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/6] conf: Make switch statements more strict 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-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" When switching over the values in the virDomainControllerModelPCI enumeration, make sure the proper cast is in place so that the compiler can warn us when the coverage is not exaustive. For the same reason, remove the 'default' case from one of the existing switch statements. --- src/conf/domain_addr.c | 4 ++-- src/conf/domain_conf.c | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 519cc6b..933c2fe 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -344,9 +344,9 @@ virDomainPCIAddressBusSetModel(virDomainPCIAddressBusPt= r bus, bus->maxSlot =3D VIR_PCI_ADDRESS_SLOT_LAST; break; =20 - default: + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid PCI controller model %d"), model); + _("PCI controller model was not set correctly")); return -1; } =20 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 79bdbdf..3ac8467 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8834,7 +8834,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, break; } case VIR_DOMAIN_CONTROLLER_TYPE_PCI: - switch (def->model) { + switch ((virDomainControllerModelPCI) def->model) { case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT: case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT: { unsigned long long bytes; @@ -8859,6 +8859,16 @@ virDomainControllerDefParseXML(xmlNodePtr node, def->opts.pciopts.pcihole64 =3D true; def->opts.pciopts.pcihole64size =3D VIR_DIV_UP(bytes, 1024); } + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE: + case VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE: + case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT_PORT: + case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_UPSTREAM_PORT: + case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_DOWNSTREAM_PORT: + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_EXPANDER_BUS: + case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_EXPANDER_BUS: + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: + /* Other controller models don't require extra checks */ + break; } if (modelName && (def->opts.pciopts.modelName --=20 2.7.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 19:32:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.25 as permitted sender) client-ip=209.132.183.25; envelope-from=libvir-list-bounces@redhat.com; helo=mx4-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.25 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by mx.zohomail.com with SMTPS id 148770734308830.209885100621705; Tue, 21 Feb 2017 12:02:23 -0800 (PST) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v1LJw6oq031902; Tue, 21 Feb 2017 14:58:06 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v1LJvqpj020765 for ; Tue, 21 Feb 2017 14:57:52 -0500 Received: from inaba.usersys.redhat.com (ovpn-204-99.brq.redhat.com [10.40.204.99]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1LJvjbF002979 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Tue, 21 Feb 2017 14:57:51 -0500 From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 21 Feb 2017 20:57:42 +0100 Message-Id: <1487707064-29602-5-git-send-email-abologna@redhat.com> In-Reply-To: <1487707064-29602-1-git-send-email-abologna@redhat.com> References: <1487707064-29602-1-git-send-email-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/6] tests: Reduce usage of legacy PCI controllers on PCIe machines 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-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Up until a while ago, libvirt would automatically add a legacy PCI controllers combo (dmi-to-pci-bridge + pci-bridge) to any PCIe machine type (x86_64/q35 and aarch64/virt). As a result, a number of input and output files in the test suite ended up containing the legacy PCI controllers, even though they are not needed or in any way relevant to the feature being tested. Get rid of most of the occurrences. Most of the time, this just means removing the controllers from the input file and regenerating the output files; in a few instances, some minor tweaking is performed on the input file, most notably removing the memory balloon: as memory balloon support was not the scope of the test being changed, there is no loss of test coverage from doing so. Several occurrences of the legacy PCI controllers remain in the test suite, both because removing their usage would have required even more tweaking, and because we still want to have coverage of this perfectly valid combination. --- .../qemuxml2argv-boot-floppy-q35.args | 5 +- .../qemuxml2argv-boot-floppy-q35.xml | 10 +- .../qemuxml2argv-bootindex-floppy-q35.args | 5 +- .../qemuxml2argv-bootindex-floppy-q35.xml | 10 +- .../qemuxml2argv-intel-iommu-machine.args | 5 +- .../qemuxml2argv-intel-iommu-machine.xml | 13 +- .../qemuxml2argvdata/qemuxml2argv-intel-iommu.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-intel-iommu.xml | 13 +- .../qemuxml2argv-pcie-expander-bus-bad-bus.xml | 18 +- .../qemuxml2argv-pcie-expander-bus.args | 136 ++++++------- .../qemuxml2argv-pcie-expander-bus.xml | 85 ++++---- .../qemuxml2argv-pcie-root-port-too-many.xml | 6 +- .../qemuxml2argv-pcie-root-port.args | 6 +- .../qemuxml2argv-pcie-root-port.xml | 6 +- .../qemuxml2argv-pcie-switch-downstream-port.args | 22 +- .../qemuxml2argv-pcie-switch-downstream-port.xml | 18 +- .../qemuxml2argv-pcie-switch-upstream-port.args | 10 +- .../qemuxml2argv-pcie-switch-upstream-port.xml | 10 +- .../qemuxml2argv-pcihole64-q35.args | 2 - .../qemuxml2argv-pcihole64-q35.xml | 2 - .../qemuxml2argv-q35-dmi-bad-address1.xml | 5 +- .../qemuxml2argv-q35-dmi-bad-address2.xml | 21 +- .../qemuxml2argv-q35-wrong-root.xml | 7 - tests/qemuxml2argvdata/qemuxml2argv-q35.args | 2 - tests/qemuxml2argvdata/qemuxml2argv-q35.xml | 7 - .../qemuxml2argv-usb-controller-default-q35.args | 2 - .../qemuxml2argv-usb-controller-default-q35.xml | 5 - .../qemuxml2argv-usb-controller-explicit-q35.args | 2 - .../qemuxml2argv-usb-controller-explicit-q35.xml | 5 - .../qemuxml2argv-vcpu-placement-static.xml | 6 - .../qemuxml2xmlout-intel-iommu.xml | 13 +- .../qemuxml2xmlout-pcie-expander-bus.xml | 225 ++++++++++-------= ---- .../qemuxml2xmlout-pcie-root-port.xml | 15 +- .../qemuxml2xmlout-pcie-switch-downstream-port.xml | 61 +++--- .../qemuxml2xmlout-pcie-switch-upstream-port.xml | 25 +-- .../qemuxml2xmlout-pcihole64-q35.xml | 9 - tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml | 9 - .../qemuxml2xmlout-usb-controller-default-q35.xml | 9 - .../qemuxml2xmlout-usb-controller-explicit-q35.xml | 9 - .../qemuxml2xmlout-vcpu-placement-static.xml | 9 - 40 files changed, 300 insertions(+), 533 deletions(-) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args b/tes= ts/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args index b9c6126..caaf758 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args @@ -16,8 +16,5 @@ QEMU_AUDIO_DRV=3Dnone \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot a \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x1 \ -drive file=3D/tmp/firmware.img,format=3Draw,if=3Dnone,id=3Ddrive-fdc0-0-0= \ --device isa-fdc,driveA=3Ddrive-fdc0-0-0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x3 +-device isa-fdc,driveA=3Ddrive-fdc0-0-0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.xml b/test= s/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.xml index 70d3262..b94ad85 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.xml @@ -24,17 +24,9 @@
- -
- - -
- - -
- + diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args = b/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args index 8bcdc1f..10ae65e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args @@ -15,8 +15,5 @@ QEMU_AUDIO_DRV=3Dnone \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x1 \ -drive file=3D/tmp/firmware.img,format=3Draw,if=3Dnone,id=3Ddrive-fdc0-0-0= \ --device isa-fdc,driveA=3Ddrive-fdc0-0-0,bootindexA=3D1 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x3 +-device isa-fdc,driveA=3Ddrive-fdc0-0-0,bootindexA=3D1 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.xml b= /tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.xml index 70d3262..b94ad85 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.xml @@ -24,17 +24,9 @@
- -
- - -
- - -
- + diff --git a/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-machine.args b= /tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-machine.args index 9221b79..91e37e3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-machine.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-machine.args @@ -15,7 +15,4 @@ QEMU_AUDIO_DRV=3Dnone \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ --boot c \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x1 +-boot c diff --git a/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-machine.xml b/= tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-machine.xml index b5b2b51..de921f6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-machine.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-machine.xml @@ -15,23 +15,12 @@ /usr/bin/qemu - - -
- - - - -
-
- -
- + diff --git a/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu.args b/tests/q= emuxml2argvdata/qemuxml2argv-intel-iommu.args index fc64405..dfc2183 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu.args @@ -16,7 +16,4 @@ QEMU_AUDIO_DRV=3Dnone \ -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ -no-acpi \ -boot c \ --device intel-iommu \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x1 +-device intel-iommu diff --git a/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu.xml b/tests/qe= muxml2argvdata/qemuxml2argv-intel-iommu.xml index b5b2b51..de921f6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu.xml @@ -15,23 +15,12 @@ /usr/bin/qemu - - -
- - - - -
-
- -
- + diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus-bad-bus.= xml b/tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus-bad-bus.xml index 0305f35..4f4b0e6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus-bad-bus.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus-bad-bus.xml @@ -27,21 +27,9 @@
- - - - - - - - - - 1 - -
- - -
+ + +
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus.args b/t= ests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus.args index 7ce957c..92199ee 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus.args @@ -19,106 +19,104 @@ QEMU_AUDIO_DRV=3Dnone \ nowait \ -no-acpi \ -boot c \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D56,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device pxb-pcie,bus_nr=3D254,id=3Dpci.3,numa_node=3D0,bus=3Dpcie.0,addr= =3D0x4 \ --device ioh3420,port=3D0x0,chassis=3D4,id=3Dpci.4,bus=3Dpci.3,addr=3D0x0 \ --device x3130-upstream,id=3Dpci.5,bus=3Dpci.4,addr=3D0x0 \ --device xio3130-downstream,port=3D0x0,chassis=3D6,id=3Dpci.6,bus=3Dpci.5,a= ddr=3D0x0 \ --device xio3130-downstream,port=3D0x1,chassis=3D7,id=3Dpci.7,bus=3Dpci.5,a= ddr=3D0x1 \ --device xio3130-downstream,port=3D0x2,chassis=3D8,id=3Dpci.8,bus=3Dpci.5,a= ddr=3D0x2 \ --device xio3130-downstream,port=3D0x3,chassis=3D9,id=3Dpci.9,bus=3Dpci.5,a= ddr=3D0x3 \ --device xio3130-downstream,port=3D0x4,chassis=3D10,id=3Dpci.10,bus=3Dpci.5= ,addr=3D0x4 \ --device xio3130-downstream,port=3D0x5,chassis=3D11,id=3Dpci.11,bus=3Dpci.5= ,addr=3D0x5 \ --device xio3130-downstream,port=3D0x6,chassis=3D12,id=3Dpci.12,bus=3Dpci.5= ,addr=3D0x6 \ --device xio3130-downstream,port=3D0x7,chassis=3D13,id=3Dpci.13,bus=3Dpci.5= ,addr=3D0x7 \ --device xio3130-downstream,port=3D0x8,chassis=3D14,id=3Dpci.14,bus=3Dpci.5= ,addr=3D0x8 \ --device xio3130-downstream,port=3D0x9,chassis=3D15,id=3Dpci.15,bus=3Dpci.5= ,addr=3D0x9 \ --device xio3130-downstream,port=3D0xa,chassis=3D16,id=3Dpci.16,bus=3Dpci.5= ,addr=3D0xa \ --device xio3130-downstream,port=3D0xb,chassis=3D17,id=3Dpci.17,bus=3Dpci.5= ,addr=3D0xb \ --device xio3130-downstream,port=3D0xc,chassis=3D18,id=3Dpci.18,bus=3Dpci.5= ,addr=3D0xc \ --device xio3130-downstream,port=3D0xd,chassis=3D19,id=3Dpci.19,bus=3Dpci.5= ,addr=3D0xd \ --device xio3130-downstream,port=3D0xe,chassis=3D20,id=3Dpci.20,bus=3Dpci.5= ,addr=3D0xe \ --device xio3130-downstream,port=3D0xf,chassis=3D21,id=3Dpci.21,bus=3Dpci.5= ,addr=3D0xf \ --device xio3130-downstream,port=3D0x10,chassis=3D22,id=3Dpci.22,bus=3Dpci.= 5,addr=3D0x10 \ --device xio3130-downstream,port=3D0x11,chassis=3D23,id=3Dpci.23,bus=3Dpci.= 5,addr=3D0x11 \ --device xio3130-downstream,port=3D0x12,chassis=3D24,id=3Dpci.24,bus=3Dpci.= 5,addr=3D0x12 \ --device xio3130-downstream,port=3D0x13,chassis=3D25,id=3Dpci.25,bus=3Dpci.= 5,addr=3D0x13 \ --device xio3130-downstream,port=3D0x14,chassis=3D26,id=3Dpci.26,bus=3Dpci.= 5,addr=3D0x14 \ --device xio3130-downstream,port=3D0x15,chassis=3D27,id=3Dpci.27,bus=3Dpci.= 5,addr=3D0x15 \ --device xio3130-downstream,port=3D0x16,chassis=3D28,id=3Dpci.28,bus=3Dpci.= 5,addr=3D0x16 \ --device xio3130-downstream,port=3D0x17,chassis=3D29,id=3Dpci.29,bus=3Dpci.= 5,addr=3D0x17 \ --device xio3130-downstream,port=3D0x18,chassis=3D30,id=3Dpci.30,bus=3Dpci.= 5,addr=3D0x18 \ --device xio3130-downstream,port=3D0x19,chassis=3D31,id=3Dpci.31,bus=3Dpci.= 5,addr=3D0x19 \ --device xio3130-downstream,port=3D0x1a,chassis=3D32,id=3Dpci.32,bus=3Dpci.= 5,addr=3D0x1a \ --device xio3130-downstream,port=3D0x1b,chassis=3D33,id=3Dpci.33,bus=3Dpci.= 5,addr=3D0x1b \ --device xio3130-downstream,port=3D0x1c,chassis=3D34,id=3Dpci.34,bus=3Dpci.= 5,addr=3D0x1c \ --device xio3130-downstream,port=3D0x1d,chassis=3D35,id=3Dpci.35,bus=3Dpci.= 5,addr=3D0x1d \ --device xio3130-downstream,port=3D0x1e,chassis=3D36,id=3Dpci.36,bus=3Dpci.= 5,addr=3D0x1e \ --device xio3130-downstream,port=3D0x1f,chassis=3D37,id=3Dpci.37,bus=3Dpci.= 5,addr=3D0x1f \ +-device pxb-pcie,bus_nr=3D254,id=3Dpci.1,numa_node=3D0,bus=3Dpcie.0,addr= =3D0x4 \ +-device ioh3420,port=3D0x0,chassis=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ +-device x3130-upstream,id=3Dpci.3,bus=3Dpci.2,addr=3D0x0 \ +-device xio3130-downstream,port=3D0x0,chassis=3D4,id=3Dpci.4,bus=3Dpci.3,a= ddr=3D0x0 \ +-device xio3130-downstream,port=3D0x1,chassis=3D5,id=3Dpci.5,bus=3Dpci.3,a= ddr=3D0x1 \ +-device xio3130-downstream,port=3D0x2,chassis=3D6,id=3Dpci.6,bus=3Dpci.3,a= ddr=3D0x2 \ +-device xio3130-downstream,port=3D0x3,chassis=3D7,id=3Dpci.7,bus=3Dpci.3,a= ddr=3D0x3 \ +-device xio3130-downstream,port=3D0x4,chassis=3D8,id=3Dpci.8,bus=3Dpci.3,a= ddr=3D0x4 \ +-device xio3130-downstream,port=3D0x5,chassis=3D9,id=3Dpci.9,bus=3Dpci.3,a= ddr=3D0x5 \ +-device xio3130-downstream,port=3D0x6,chassis=3D10,id=3Dpci.10,bus=3Dpci.3= ,addr=3D0x6 \ +-device xio3130-downstream,port=3D0x7,chassis=3D11,id=3Dpci.11,bus=3Dpci.3= ,addr=3D0x7 \ +-device xio3130-downstream,port=3D0x8,chassis=3D12,id=3Dpci.12,bus=3Dpci.3= ,addr=3D0x8 \ +-device xio3130-downstream,port=3D0x9,chassis=3D13,id=3Dpci.13,bus=3Dpci.3= ,addr=3D0x9 \ +-device xio3130-downstream,port=3D0xa,chassis=3D14,id=3Dpci.14,bus=3Dpci.3= ,addr=3D0xa \ +-device xio3130-downstream,port=3D0xb,chassis=3D15,id=3Dpci.15,bus=3Dpci.3= ,addr=3D0xb \ +-device xio3130-downstream,port=3D0xc,chassis=3D16,id=3Dpci.16,bus=3Dpci.3= ,addr=3D0xc \ +-device xio3130-downstream,port=3D0xd,chassis=3D17,id=3Dpci.17,bus=3Dpci.3= ,addr=3D0xd \ +-device xio3130-downstream,port=3D0xe,chassis=3D18,id=3Dpci.18,bus=3Dpci.3= ,addr=3D0xe \ +-device xio3130-downstream,port=3D0xf,chassis=3D19,id=3Dpci.19,bus=3Dpci.3= ,addr=3D0xf \ +-device xio3130-downstream,port=3D0x10,chassis=3D20,id=3Dpci.20,bus=3Dpci.= 3,addr=3D0x10 \ +-device xio3130-downstream,port=3D0x11,chassis=3D21,id=3Dpci.21,bus=3Dpci.= 3,addr=3D0x11 \ +-device xio3130-downstream,port=3D0x12,chassis=3D22,id=3Dpci.22,bus=3Dpci.= 3,addr=3D0x12 \ +-device xio3130-downstream,port=3D0x13,chassis=3D23,id=3Dpci.23,bus=3Dpci.= 3,addr=3D0x13 \ +-device xio3130-downstream,port=3D0x14,chassis=3D24,id=3Dpci.24,bus=3Dpci.= 3,addr=3D0x14 \ +-device xio3130-downstream,port=3D0x15,chassis=3D25,id=3Dpci.25,bus=3Dpci.= 3,addr=3D0x15 \ +-device xio3130-downstream,port=3D0x16,chassis=3D26,id=3Dpci.26,bus=3Dpci.= 3,addr=3D0x16 \ +-device xio3130-downstream,port=3D0x17,chassis=3D27,id=3Dpci.27,bus=3Dpci.= 3,addr=3D0x17 \ +-device xio3130-downstream,port=3D0x18,chassis=3D28,id=3Dpci.28,bus=3Dpci.= 3,addr=3D0x18 \ +-device xio3130-downstream,port=3D0x19,chassis=3D29,id=3Dpci.29,bus=3Dpci.= 3,addr=3D0x19 \ +-device xio3130-downstream,port=3D0x1a,chassis=3D30,id=3Dpci.30,bus=3Dpci.= 3,addr=3D0x1a \ +-device xio3130-downstream,port=3D0x1b,chassis=3D31,id=3Dpci.31,bus=3Dpci.= 3,addr=3D0x1b \ +-device xio3130-downstream,port=3D0x1c,chassis=3D32,id=3Dpci.32,bus=3Dpci.= 3,addr=3D0x1c \ +-device xio3130-downstream,port=3D0x1d,chassis=3D33,id=3Dpci.33,bus=3Dpci.= 3,addr=3D0x1d \ +-device xio3130-downstream,port=3D0x1e,chassis=3D34,id=3Dpci.34,bus=3Dpci.= 3,addr=3D0x1e \ +-device xio3130-downstream,port=3D0x1f,chassis=3D35,id=3Dpci.35,bus=3Dpci.= 3,addr=3D0x1f \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ -device ide-drive,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0 \ --device rtl8139,vlan=3D0,id=3Dnet0,mac=3D52:54:00:f1:95:51,bus=3Dpci.6,add= r=3D0x0 \ +-device rtl8139,vlan=3D0,id=3Dnet0,mac=3D52:54:00:f1:95:51,bus=3Dpci.4,add= r=3D0x0 \ -net user,vlan=3D0,name=3Dhostnet0 \ --device e1000,vlan=3D1,id=3Dnet1,mac=3D52:54:00:5c:c6:1a,bus=3Dpci.7,addr= =3D0x0 \ +-device e1000,vlan=3D1,id=3Dnet1,mac=3D52:54:00:5c:c6:1a,bus=3Dpci.5,addr= =3D0x0 \ -net user,vlan=3D1,name=3Dhostnet1 \ --device e1000,vlan=3D2,id=3Dnet2,mac=3D52:54:00:39:97:ac,bus=3Dpci.8,addr= =3D0x0 \ +-device e1000,vlan=3D2,id=3Dnet2,mac=3D52:54:00:39:97:ac,bus=3Dpci.6,addr= =3D0x0 \ -net user,vlan=3D2,name=3Dhostnet2 \ --device e1000,vlan=3D3,id=3Dnet3,mac=3D52:54:00:ee:b9:a8,bus=3Dpci.9,addr= =3D0x0 \ +-device e1000,vlan=3D3,id=3Dnet3,mac=3D52:54:00:ee:b9:a8,bus=3Dpci.7,addr= =3D0x0 \ -net user,vlan=3D3,name=3Dhostnet3 \ --device e1000,vlan=3D4,id=3Dnet4,mac=3D52:54:00:a9:f7:17,bus=3Dpci.10,addr= =3D0x0 \ +-device e1000,vlan=3D4,id=3Dnet4,mac=3D52:54:00:a9:f7:17,bus=3Dpci.8,addr= =3D0x0 \ -net user,vlan=3D4,name=3Dhostnet4 \ --device e1000,vlan=3D5,id=3Dnet5,mac=3D52:54:00:df:2b:f3,bus=3Dpci.11,addr= =3D0x0 \ +-device e1000,vlan=3D5,id=3Dnet5,mac=3D52:54:00:df:2b:f3,bus=3Dpci.9,addr= =3D0x0 \ -net user,vlan=3D5,name=3Dhostnet5 \ --device e1000,vlan=3D6,id=3Dnet6,mac=3D52:54:00:78:94:b4,bus=3Dpci.12,addr= =3D0x0 \ +-device e1000,vlan=3D6,id=3Dnet6,mac=3D52:54:00:78:94:b4,bus=3Dpci.10,addr= =3D0x0 \ -net user,vlan=3D6,name=3Dhostnet6 \ --device e1000,vlan=3D7,id=3Dnet7,mac=3D52:54:00:6b:9b:06,bus=3Dpci.13,addr= =3D0x0 \ +-device e1000,vlan=3D7,id=3Dnet7,mac=3D52:54:00:6b:9b:06,bus=3Dpci.11,addr= =3D0x0 \ -net user,vlan=3D7,name=3Dhostnet7 \ --device e1000,vlan=3D8,id=3Dnet8,mac=3D52:54:00:17:df:bc,bus=3Dpci.14,addr= =3D0x0 \ +-device e1000,vlan=3D8,id=3Dnet8,mac=3D52:54:00:17:df:bc,bus=3Dpci.12,addr= =3D0x0 \ -net user,vlan=3D8,name=3Dhostnet8 \ --device e1000,vlan=3D9,id=3Dnet9,mac=3D52:54:00:3b:d0:51,bus=3Dpci.15,addr= =3D0x0 \ +-device e1000,vlan=3D9,id=3Dnet9,mac=3D52:54:00:3b:d0:51,bus=3Dpci.13,addr= =3D0x0 \ -net user,vlan=3D9,name=3Dhostnet9 \ --device e1000,vlan=3D10,id=3Dnet10,mac=3D52:54:00:8d:2d:17,bus=3Dpci.16,ad= dr=3D0x0 \ +-device e1000,vlan=3D10,id=3Dnet10,mac=3D52:54:00:8d:2d:17,bus=3Dpci.14,ad= dr=3D0x0 \ -net user,vlan=3D10,name=3Dhostnet10 \ --device e1000,vlan=3D11,id=3Dnet11,mac=3D52:54:00:a7:66:af,bus=3Dpci.17,ad= dr=3D0x0 \ +-device e1000,vlan=3D11,id=3Dnet11,mac=3D52:54:00:a7:66:af,bus=3Dpci.15,ad= dr=3D0x0 \ -net user,vlan=3D11,name=3Dhostnet11 \ --device e1000,vlan=3D12,id=3Dnet12,mac=3D52:54:00:54:ab:d7,bus=3Dpci.18,ad= dr=3D0x0 \ +-device e1000,vlan=3D12,id=3Dnet12,mac=3D52:54:00:54:ab:d7,bus=3Dpci.16,ad= dr=3D0x0 \ -net user,vlan=3D12,name=3Dhostnet12 \ --device e1000,vlan=3D13,id=3Dnet13,mac=3D52:54:00:1f:99:90,bus=3Dpci.19,ad= dr=3D0x0 \ +-device e1000,vlan=3D13,id=3Dnet13,mac=3D52:54:00:1f:99:90,bus=3Dpci.17,ad= dr=3D0x0 \ -net user,vlan=3D13,name=3Dhostnet13 \ --device e1000,vlan=3D14,id=3Dnet14,mac=3D52:54:00:c8:43:87,bus=3Dpci.20,ad= dr=3D0x0 \ +-device e1000,vlan=3D14,id=3Dnet14,mac=3D52:54:00:c8:43:87,bus=3Dpci.18,ad= dr=3D0x0 \ -net user,vlan=3D14,name=3Dhostnet14 \ --device e1000,vlan=3D15,id=3Dnet15,mac=3D52:54:00:df:22:b2,bus=3Dpci.21,ad= dr=3D0x0 \ +-device e1000,vlan=3D15,id=3Dnet15,mac=3D52:54:00:df:22:b2,bus=3Dpci.19,ad= dr=3D0x0 \ -net user,vlan=3D15,name=3Dhostnet15 \ --device e1000,vlan=3D16,id=3Dnet16,mac=3D52:54:00:d2:9a:47,bus=3Dpci.22,ad= dr=3D0x0 \ +-device e1000,vlan=3D16,id=3Dnet16,mac=3D52:54:00:d2:9a:47,bus=3Dpci.20,ad= dr=3D0x0 \ -net user,vlan=3D16,name=3Dhostnet16 \ --device e1000,vlan=3D17,id=3Dnet17,mac=3D52:54:00:86:05:e2,bus=3Dpci.23,ad= dr=3D0x0 \ +-device e1000,vlan=3D17,id=3Dnet17,mac=3D52:54:00:86:05:e2,bus=3Dpci.21,ad= dr=3D0x0 \ -net user,vlan=3D17,name=3Dhostnet17 \ --device e1000,vlan=3D18,id=3Dnet18,mac=3D52:54:00:8c:1c:c2,bus=3Dpci.24,ad= dr=3D0x0 \ +-device e1000,vlan=3D18,id=3Dnet18,mac=3D52:54:00:8c:1c:c2,bus=3Dpci.22,ad= dr=3D0x0 \ -net user,vlan=3D18,name=3Dhostnet18 \ --device e1000,vlan=3D19,id=3Dnet19,mac=3D52:54:00:48:58:92,bus=3Dpci.25,ad= dr=3D0x0 \ +-device e1000,vlan=3D19,id=3Dnet19,mac=3D52:54:00:48:58:92,bus=3Dpci.23,ad= dr=3D0x0 \ -net user,vlan=3D19,name=3Dhostnet19 \ --device e1000,vlan=3D20,id=3Dnet20,mac=3D52:54:00:99:e5:bf,bus=3Dpci.26,ad= dr=3D0x0 \ +-device e1000,vlan=3D20,id=3Dnet20,mac=3D52:54:00:99:e5:bf,bus=3Dpci.24,ad= dr=3D0x0 \ -net user,vlan=3D20,name=3Dhostnet20 \ --device e1000,vlan=3D21,id=3Dnet21,mac=3D52:54:00:b1:8c:25,bus=3Dpci.27,ad= dr=3D0x0 \ +-device e1000,vlan=3D21,id=3Dnet21,mac=3D52:54:00:b1:8c:25,bus=3Dpci.25,ad= dr=3D0x0 \ -net user,vlan=3D21,name=3Dhostnet21 \ --device e1000,vlan=3D22,id=3Dnet22,mac=3D52:54:00:60:e0:d0,bus=3Dpci.28,ad= dr=3D0x0 \ +-device e1000,vlan=3D22,id=3Dnet22,mac=3D52:54:00:60:e0:d0,bus=3Dpci.26,ad= dr=3D0x0 \ -net user,vlan=3D22,name=3Dhostnet22 \ --device e1000,vlan=3D23,id=3Dnet23,mac=3D52:54:00:37:00:6a,bus=3Dpci.29,ad= dr=3D0x0 \ +-device e1000,vlan=3D23,id=3Dnet23,mac=3D52:54:00:37:00:6a,bus=3Dpci.27,ad= dr=3D0x0 \ -net user,vlan=3D23,name=3Dhostnet23 \ --device e1000,vlan=3D24,id=3Dnet24,mac=3D52:54:00:c7:c8:ad,bus=3Dpci.30,ad= dr=3D0x0 \ +-device e1000,vlan=3D24,id=3Dnet24,mac=3D52:54:00:c7:c8:ad,bus=3Dpci.28,ad= dr=3D0x0 \ -net user,vlan=3D24,name=3Dhostnet24 \ --device e1000,vlan=3D25,id=3Dnet25,mac=3D52:54:00:4e:a7:cf,bus=3Dpci.31,ad= dr=3D0x0 \ +-device e1000,vlan=3D25,id=3Dnet25,mac=3D52:54:00:4e:a7:cf,bus=3Dpci.29,ad= dr=3D0x0 \ -net user,vlan=3D25,name=3Dhostnet25 \ --device e1000,vlan=3D26,id=3Dnet26,mac=3D52:54:00:00:79:69,bus=3Dpci.32,ad= dr=3D0x0 \ +-device e1000,vlan=3D26,id=3Dnet26,mac=3D52:54:00:00:79:69,bus=3Dpci.30,ad= dr=3D0x0 \ -net user,vlan=3D26,name=3Dhostnet26 \ --device e1000,vlan=3D27,id=3Dnet27,mac=3D52:54:00:47:00:6f,bus=3Dpci.33,ad= dr=3D0x0 \ +-device e1000,vlan=3D27,id=3Dnet27,mac=3D52:54:00:47:00:6f,bus=3Dpci.31,ad= dr=3D0x0 \ -net user,vlan=3D27,name=3Dhostnet27 \ --device e1000,vlan=3D28,id=3Dnet28,mac=3D52:54:00:2a:8c:8b,bus=3Dpci.34,ad= dr=3D0x0 \ +-device e1000,vlan=3D28,id=3Dnet28,mac=3D52:54:00:2a:8c:8b,bus=3Dpci.32,ad= dr=3D0x0 \ -net user,vlan=3D28,name=3Dhostnet28 \ --device e1000,vlan=3D29,id=3Dnet29,mac=3D52:54:00:ec:d5:e3,bus=3Dpci.35,ad= dr=3D0x0 \ +-device e1000,vlan=3D29,id=3Dnet29,mac=3D52:54:00:ec:d5:e3,bus=3Dpci.33,ad= dr=3D0x0 \ -net user,vlan=3D29,name=3Dhostnet29 \ --device e1000,vlan=3D30,id=3Dnet30,mac=3D52:54:00:7e:6e:c8,bus=3Dpci.36,ad= dr=3D0x0 \ +-device e1000,vlan=3D30,id=3Dnet30,mac=3D52:54:00:7e:6e:c8,bus=3Dpci.34,ad= dr=3D0x0 \ -net user,vlan=3D30,name=3Dhostnet30 \ --device e1000,vlan=3D31,id=3Dnet31,mac=3D52:54:00:7e:6d:c9,bus=3Dpci.37,ad= dr=3D0x0 \ +-device e1000,vlan=3D31,id=3Dnet31,mac=3D52:54:00:7e:6d:c9,bus=3Dpci.35,ad= dr=3D0x0 \ -net user,vlan=3D31,name=3Dhostnet31 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus.xml b/te= sts/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus.xml index 72681ce..80f2ea6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus.xml @@ -27,29 +27,24 @@
- - - - - - - - + 0
- + 1 -
+
- -
+ +
+ + @@ -80,167 +75,165 @@ - - -
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-too-many.xm= l b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-too-many.xml index 98be1cd..5234e3b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-too-many.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-too-many.xml @@ -20,8 +20,8 @@
- - + + @@ -49,8 +49,6 @@ - - diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args b/test= s/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args index 9a71281..4e852ff 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args @@ -16,11 +16,9 @@ QEMU_AUDIO_DRV=3Dnone \ -monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ -no-acpi \ -boot c \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device ioh3420,port=3D0x10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,multifunct= ion=3Don,\ +-device ioh3420,port=3D0x10,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multifunct= ion=3Don,\ addr=3D0x2 \ --device ioh3420,port=3D0x1a,chassis=3D40,id=3Dpci.4,bus=3Dpcie.0,addr=3D0x= 2.0x1 \ +-device ioh3420,port=3D0x1a,chassis=3D40,id=3Dpci.2,bus=3Dpcie.0,addr=3D0x= 2.0x1 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ -device ide-drive,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0 \ -device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpcie.0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.xml b/tests= /qemuxml2argvdata/qemuxml2argv-pcie-root-port.xml index 795f8dd..7ecc4a6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.xml @@ -20,10 +20,8 @@
- - - - + + diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-por= t.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.ar= gs index 3b3e80d..1102b38 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args @@ -16,18 +16,16 @@ QEMU_AUDIO_DRV=3Dnone \ -monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ -no-acpi \ -boot c \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device ioh3420,port=3D0x10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x2= \ --device x3130-upstream,id=3Dpci.4,bus=3Dpci.3,addr=3D0x0 \ --device xio3130-downstream,port=3D0x0,chassis=3D5,id=3Dpci.5,bus=3Dpci.4,a= ddr=3D0x0 \ --device xio3130-downstream,port=3D0x1,chassis=3D6,id=3Dpci.6,bus=3Dpci.4,a= ddr=3D0x1 \ --device xio3130-downstream,port=3D0x2,chassis=3D7,id=3Dpci.7,bus=3Dpci.4,a= ddr=3D0x2 \ --device xio3130-downstream,port=3D0x27,chassis=3D30,id=3Dpci.8,bus=3Dpci.4= ,addr=3D0x3 \ --device x3130-upstream,id=3Dpci.9,bus=3Dpci.5,addr=3D0x0 \ --device xio3130-downstream,port=3D0x4,chassis=3D10,id=3Dpci.10,bus=3Dpci.4= ,addr=3D0x4 \ --device xio3130-downstream,port=3D0x5,chassis=3D11,id=3Dpci.11,bus=3Dpci.4= ,addr=3D0x5 \ --device xio3130-downstream,port=3D0x6,chassis=3D12,id=3Dpci.12,bus=3Dpci.4= ,addr=3D0x6 \ +-device ioh3420,port=3D0x10,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x2= \ +-device x3130-upstream,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ +-device xio3130-downstream,port=3D0x0,chassis=3D3,id=3Dpci.3,bus=3Dpci.2,a= ddr=3D0x0 \ +-device xio3130-downstream,port=3D0x1,chassis=3D4,id=3Dpci.4,bus=3Dpci.2,a= ddr=3D0x1 \ +-device xio3130-downstream,port=3D0x2,chassis=3D5,id=3Dpci.5,bus=3Dpci.2,a= ddr=3D0x2 \ +-device xio3130-downstream,port=3D0x27,chassis=3D30,id=3Dpci.6,bus=3Dpci.2= ,addr=3D0x3 \ +-device x3130-upstream,id=3Dpci.7,bus=3Dpci.3,addr=3D0x0 \ +-device xio3130-downstream,port=3D0x4,chassis=3D8,id=3Dpci.8,bus=3Dpci.2,a= ddr=3D0x4 \ +-device xio3130-downstream,port=3D0x5,chassis=3D9,id=3Dpci.9,bus=3Dpci.2,a= ddr=3D0x5 \ +-device xio3130-downstream,port=3D0x6,chassis=3D10,id=3Dpci.10,bus=3Dpci.2= ,addr=3D0x6 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ -device ide-drive,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0 \ -device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpcie.0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-por= t.xml b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.xml index b781675..578cc87 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.xml @@ -20,21 +20,19 @@
- - - - + + + + - - - + - + + + - - diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.= args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args index 10aedd5..05db65b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args @@ -16,13 +16,11 @@ QEMU_AUDIO_DRV=3Dnone \ -monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ -no-acpi \ -boot c \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device ioh3420,port=3D0x10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,multifunct= ion=3Don,\ +-device ioh3420,port=3D0x10,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multifunct= ion=3Don,\ addr=3D0x2 \ --device ioh3420,port=3D0x11,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr=3D0x2= .0x1 \ --device x3130-upstream,id=3Dpci.5,bus=3Dpci.3,addr=3D0x0 \ --device x3130-upstream,id=3Dpci.6,bus=3Dpci.4,addr=3D0x0 \ +-device ioh3420,port=3D0x11,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=3D0x2= .0x1 \ +-device x3130-upstream,id=3Dpci.3,bus=3Dpci.1,addr=3D0x0 \ +-device x3130-upstream,id=3Dpci.4,bus=3Dpci.2,addr=3D0x0 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ -device ide-drive,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0 \ -device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpcie.0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.= xml b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.xml index 4205f8a..4caf229 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.xml @@ -20,12 +20,10 @@
- - - - - - + + + + diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args b/tests= /qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args index ee9f699..179a7c5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args @@ -17,8 +17,6 @@ QEMU_AUDIO_DRV=3Dnone \ -no-acpi \ -boot c \ -global q35-pcihost.pci-hole64-size=3D1048576K \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ -device ide-drive,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0 \ -device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,bus= =3Dpcie.0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml b/tests/= qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml index a967bf4..9367384 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml @@ -22,8 +22,6 @@ 1048576 - - diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-dmi-bad-address1.xml b= /tests/qemuxml2argvdata/qemuxml2argv-q35-dmi-bad-address1.xml index e23c874..05e23d9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-q35-dmi-bad-address1.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-dmi-bad-address1.xml @@ -22,9 +22,8 @@ - - -
+ +
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-dmi-bad-address2.xml b= /tests/qemuxml2argvdata/qemuxml2argv-q35-dmi-bad-address2.xml index c3c1b6a..7796e52 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-q35-dmi-bad-address2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-dmi-bad-address2.xml @@ -14,26 +14,11 @@ destroy /usr/libexec/qemu-kvm - - - -
- - - + + +
- - - - - - -
- - diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-wrong-root.xml b/tests= /qemuxml2argvdata/qemuxml2argv-q35-wrong-root.xml index 836de52..8d9f27d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-q35-wrong-root.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-wrong-root.xml @@ -15,13 +15,6 @@ /usr/bin/qemu-kvm - - - - - - - diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35.args b/tests/qemuxml2a= rgvdata/qemuxml2argv-q35.args index 733a4dc..e572e8c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35.args @@ -16,8 +16,6 @@ QEMU_AUDIO_DRV=3Dnone \ -monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ -no-acpi \ -boot c \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D56,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ -device ich9-usb-ehci1,id=3Dusb,bus=3Dpcie.0,addr=3D0x1d.0x7 \ -device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpcie.0,multif= unction=3Don,\ addr=3D0x1d \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35.xml b/tests/qemuxml2ar= gvdata/qemuxml2argv-q35.xml index 0c3da85..85e72cd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-q35.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35.xml @@ -20,13 +20,6 @@
- - - - - - - diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35= .args b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.args index f45400d..36237d6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.args @@ -16,6 +16,4 @@ QEMU_AUDIO_DRV=3Dnone \ -monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ -no-acpi \ -boot c \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D56,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpcie.0,addr=3D0x1 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35= .xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.xml index 5f949d6..9c2a234 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.xml @@ -15,11 +15,6 @@ /usr/libexec/qemu-kvm - - - - -
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q3= 5.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.ar= gs index 92a4ee3..6ea531f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.args @@ -16,6 +16,4 @@ QEMU_AUDIO_DRV=3Dnone \ -monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ -no-acpi \ -boot c \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D56,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ -device nec-usb-xhci,id=3Dusb,bus=3Dpcie.0,addr=3D0x1 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q3= 5.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.xml index f6d95b4..c0827f2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.xml @@ -15,11 +15,6 @@ /usr/libexec/qemu-kvm - - - - -
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-vcpu-placement-static.xml = b/tests/qemuxml2argvdata/qemuxml2argv-vcpu-placement-static.xml index 9cd00c0..a777f50 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-vcpu-placement-static.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-vcpu-placement-static.xml @@ -26,12 +26,6 @@
- -
- - -
- diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu.xml b/test= s/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu.xml index b5b2b51..de921f6 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu.xml @@ -15,23 +15,12 @@ /usr/bin/qemu - - -
- - - - -
-
- -
- + diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-expander-bus.xml = b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-expander-bus.xml index 7a37870..377ced2 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-expander-bus.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-expander-bus.xml @@ -27,192 +27,183 @@
- - -
- - - - -
- - + 0
- + - + 1 -
+
- + -
+
+ + + + +
+ + + + +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
- - - - -
- - - - -
+ +
@@ -220,162 +211,162 @@ -
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port.xml b/t= ests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port.xml index 5c1ebef..5775eb9 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port.xml @@ -20,21 +20,12 @@
- - -
- - - - -
- - + - +
- +
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-switch-downstream= -port.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-switch-downstream-= port.xml index beb6ca8..a80316c 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-switch-downstream-port.x= ml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-switch-downstream-port.x= ml @@ -20,62 +20,53 @@
- - -
- - - - -
- - + - +
- + -
+
- + - -
+ +
- + - -
+ +
- + - -
+ +
- + -
+
- + -
+
- + - -
+ +
- + - -
+ +
- + - -
+ +
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-switch-upstream-p= ort.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-switch-upstream-port= .xml index f35ebf7..b35be3c 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-switch-upstream-port.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-switch-upstream-port.xml @@ -20,32 +20,23 @@
- - -
- - - - -
- - + - +
- + - +
- + -
+
- + -
+
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-q35.xml b/te= sts/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-q35.xml index dad7d1a..03a4e8e 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-q35.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-q35.xml @@ -22,15 +22,6 @@ 1048576 - - -
- - - - -
-
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml b/tests/qemuxm= l2xmloutdata/qemuxml2xmlout-q35.xml index 58c7fab..e3d4fa0 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml @@ -20,15 +20,6 @@
- - -
- - - - -
-
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-controller-default= -q35.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-controller-default-q= 35.xml index 456fd54..b4f94b6 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-controller-default-q35.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-controller-default-q35.xml @@ -15,15 +15,6 @@ /usr/libexec/qemu-kvm - - -
- - - - -
-
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-controller-explici= t-q35.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-controller-explicit= -q35.xml index db92c22..8baaee4 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-controller-explicit-q35.x= ml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-controller-explicit-q35.x= ml @@ -15,15 +15,6 @@ /usr/libexec/qemu-kvm - - -
- - - - -
-
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-vcpu-placement-static.= xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-vcpu-placement-static.xml index c6471e3..a777f50 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-vcpu-placement-static.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-vcpu-placement-static.xml @@ -26,15 +26,6 @@
- - -
- - - - -
- --=20 2.7.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 19:32:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.25 as permitted sender) client-ip=209.132.183.25; envelope-from=libvir-list-bounces@redhat.com; helo=mx4-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.25 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by mx.zohomail.com with SMTPS id 1487707295369735.715090010652; Tue, 21 Feb 2017 12:01:35 -0800 (PST) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v1LJw8fi031921; Tue, 21 Feb 2017 14:58:08 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v1LJvsW7020772 for ; Tue, 21 Feb 2017 14:57:54 -0500 Received: from inaba.usersys.redhat.com (ovpn-204-99.brq.redhat.com [10.40.204.99]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1LJvjbG002979 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Tue, 21 Feb 2017 14:57:53 -0500 From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 21 Feb 2017 20:57:43 +0100 Message-Id: <1487707064-29602-6-git-send-email-abologna@redhat.com> In-Reply-To: <1487707064-29602-1-git-send-email-abologna@redhat.com> References: <1487707064-29602-1-git-send-email-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 5/6] qemu: Allow multiple bridges when pci-bridges is not available 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-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" qemuDomainAssignPCIAddresses() hardcoded the assumption that the only way to support devices on a non-zero bus is to add one or more pci-bridges; however, since we now support a large selection of PCI controllers that can be used instead, the assumption is no longer true. Moreover, this check was always redundant, because the only sensible time to check for the availability of pci-bridge is when building the QEMU command line, and such a check is of course already in place. In fact, there were *two* such checks, but since one of the two was relying on the incorrect assumption explained above, and it was redundant anyway, it has been dropped. --- src/qemu/qemu_command.c | 7 ------- src/qemu/qemu_domain_address.c | 10 +--------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f0b938f..0ff1e7d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -342,13 +342,6 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, } } =20 - if (info->addr.pci.bus !=3D 0 && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_PCI_BRIDGE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Multiple PCI buses are not supported " - "with this QEMU binary")); - goto cleanup; - } virBufferAsprintf(buf, ",bus=3D%s", contAlias); =20 if (info->addr.pci.multi =3D=3D VIR_TRISTATE_SWITCH_ON) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 5b75044..f8995c9 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -1983,9 +1983,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, if (qemuDomainFillAllPCIConnectFlags(def, qemuCaps, driver) < 0) goto cleanup; =20 - if (nbuses > 0 && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_PCI_BRIDGE)) { - + if (nbuses > 0) { /* 1st pass to figure out how many PCI bridges we need */ if (!(addrs =3D qemuDomainPCIAddressSetCreate(def, nbuses, true))) goto cleanup; @@ -2109,12 +2107,6 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, nbuses =3D addrs->nbuses; virDomainPCIAddressSetFree(addrs); addrs =3D NULL; - - } else if (max_idx > 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("PCI bridges are not supported " - "by this QEMU binary")); - goto cleanup; } =20 if (!(addrs =3D qemuDomainPCIAddressSetCreate(def, nbuses, false))) --=20 2.7.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 19:32:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.25 as permitted sender) client-ip=209.132.183.25; envelope-from=libvir-list-bounces@redhat.com; helo=mx4-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.25 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by mx.zohomail.com with SMTPS id 1487707312162932.7827686077209; Tue, 21 Feb 2017 12:01:52 -0800 (PST) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v1LJw82M031914; Tue, 21 Feb 2017 14:58:08 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v1LJvtXO020780 for ; Tue, 21 Feb 2017 14:57:55 -0500 Received: from inaba.usersys.redhat.com (ovpn-204-99.brq.redhat.com [10.40.204.99]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1LJvjbH002979 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Tue, 21 Feb 2017 14:57:54 -0500 From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 21 Feb 2017 20:57:44 +0100 Message-Id: <1487707064-29602-7-git-send-email-abologna@redhat.com> In-Reply-To: <1487707064-29602-1-git-send-email-abologna@redhat.com> References: <1487707064-29602-1-git-send-email-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 6/6] tests: Reduce QEMU_CAPS_DEVICE_{DMI_TO_, }PCI_BRIDGE usage 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-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Now that QEMU_CAPS_DEVICE_PCI_BRIDGE is no longer checked unless a pci-bridge is really part of the configuration, and most uses of the legacy PCI controller combo have been dropped from tests that use PCIe machine types, we can drop the corresponding capabilities from a lot of test cases. --- tests/qemuxml2argvtest.c | 83 +++++++++-----------------------------------= ---- tests/qemuxml2xmltest.c | 56 +++++++++----------------------- 2 files changed, 30 insertions(+), 109 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index f55b04b..b5b7555 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -702,13 +702,9 @@ mymain(void) DO_TEST("boot-network", NONE); DO_TEST("boot-floppy", NONE); DO_TEST("boot-floppy-q35", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI); DO_TEST("bootindex-floppy-q35", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_BOOT_MENU, QEMU_CAPS_BOOTINDEX); @@ -1392,24 +1388,20 @@ mymain(void) DO_TEST_PARSE_ERROR("usb-none-usbtablet", QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); DO_TEST("usb-controller-default-q35", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_NEC_USB_XHCI); DO_TEST_FAILURE("usb-controller-default-unavailable-q35", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_PCI_OHCI, QEMU_CAPS_NEC_USB_XHCI); DO_TEST("usb-controller-explicit-q35", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_NEC_USB_XHCI); DO_TEST_FAILURE("usb-controller-explicit-unavailable-q35", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PIIX3_USB_UHCI); DO_TEST("usb-controller-xhci", QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_= UHCI, @@ -1684,8 +1676,7 @@ mymain(void) DO_TEST("video-device-pciaddr-default", QEMU_CAPS_KVM, QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_DEVICE_PCI_BRIDGE); + QEMU_CAPS_DEVICE_QXL); DO_TEST("video-vga-nodevice", QEMU_CAPS_DEVICE_VGA); DO_TEST("video-vga-device", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); @@ -1791,30 +1782,21 @@ mymain(void) QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST("pci-autofill-addr", QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST("pci-many", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST("pci-bridge-many-disks", QEMU_CAPS_DEVICE_PCI_BRIDGE); DO_TEST("pcie-root", QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420); DO_TEST("q35", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); DO_TEST_PARSE_ERROR("q35-dmi-bad-address1", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420); DO_TEST_PARSE_ERROR("q35-dmi-bad-address2", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420); DO_TEST("q35-pm-disable", QEMU_CAPS_DEVICE_PCI_BRIDGE, @@ -1917,8 +1899,6 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION, @@ -1940,8 +1920,6 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION, @@ -1963,8 +1941,6 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION, @@ -1991,8 +1967,6 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION, @@ -2006,8 +1980,6 @@ mymain(void) QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_USB_REDIR); DO_TEST("pcie-root-port", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION, @@ -2031,8 +2003,6 @@ mymain(void) QEMU_CAPS_HDA_DUPLEX); =20 DO_TEST_PARSE_ERROR("q35-wrong-root", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, @@ -2041,16 +2011,12 @@ mymain(void) DO_TEST_PARSE_ERROR("440fx-wrong-root", NONE); =20 DO_TEST_PARSE_ERROR("pcie-root-port-too-many", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); =20 DO_TEST("pcie-switch-upstream-port", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_X3130_UPSTREAM, QEMU_CAPS_ICH9_AHCI, @@ -2058,8 +2024,6 @@ mymain(void) QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); DO_TEST("pcie-switch-downstream-port", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_X3130_UPSTREAM, QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, @@ -2068,35 +2032,25 @@ mymain(void) QEMU_CAPS_DEVICE_QXL); =20 DO_TEST("pci-expander-bus", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_PXB); DO_TEST_PARSE_ERROR("pci-expander-bus-bad-node", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_PXB); DO_TEST_PARSE_ERROR("pci-expander-bus-bad-machine", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_PXB); DO_TEST_PARSE_ERROR("pci-expander-bus-bad-bus", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_PXB); =20 DO_TEST("pcie-expander-bus", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_X3130_UPSTREAM, QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, QEMU_CAPS_DEVICE_PXB_PCIE); DO_TEST_PARSE_ERROR("pcie-expander-bus-bad-machine", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_X3130_UPSTREAM, QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, QEMU_CAPS_DEVICE_PXB_PCIE); DO_TEST_PARSE_ERROR("pcie-expander-bus-bad-bus", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_PXB_PCIE); =20 @@ -2137,14 +2091,10 @@ mymain(void) DO_TEST("mlock-off", QEMU_CAPS_REALTIME_MLOCK); DO_TEST("mlock-unsupported", NONE); =20 - DO_TEST_PARSE_ERROR("pci-bridge-negative-index-invalid", - QEMU_CAPS_DEVICE_PCI_BRIDGE); - DO_TEST_PARSE_ERROR("pci-bridge-duplicate-index", - QEMU_CAPS_DEVICE_PCI_BRIDGE); - DO_TEST_PARSE_ERROR("pci-root-nonzero-index", - QEMU_CAPS_DEVICE_PCI_BRIDGE); - DO_TEST_PARSE_ERROR("pci-root-address", - QEMU_CAPS_DEVICE_PCI_BRIDGE); + DO_TEST_PARSE_ERROR("pci-bridge-negative-index-invalid", NONE); + DO_TEST_PARSE_ERROR("pci-bridge-duplicate-index", NONE); + DO_TEST_PARSE_ERROR("pci-root-nonzero-index", NONE); + DO_TEST_PARSE_ERROR("pci-root-address", NONE); =20 DO_TEST("hotplug-base", QEMU_CAPS_KVM, QEMU_CAPS_VIRTIO_SCSI); @@ -2152,8 +2102,6 @@ mymain(void) DO_TEST("pcihole64", QEMU_CAPS_I440FX_PCI_HOLE64_SIZE); DO_TEST_FAILURE("pcihole64-none", NONE); DO_TEST("pcihole64-q35", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, @@ -2187,9 +2135,8 @@ mymain(void) QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_PCI_MULTIFUNCTION, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420); DO_TEST("aarch64-virt-2.6-virtio-pci-default", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, @@ -2212,7 +2159,7 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI); DO_TEST("aarch64-video-virtio-gpu-pci", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX, - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_BOOTINDEX); DO_TEST("aarch64-aavmf-virtio-mmio", @@ -2466,12 +2413,12 @@ mymain(void) QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_USB_HUB); =20 DO_TEST("acpi-table", NONE); - DO_TEST("intel-iommu", QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, + DO_TEST("intel-iommu", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_INTEL_IOMMU); - DO_TEST("intel-iommu-machine", QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_= MACHINE_OPT, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_MACHINE_IOMMU); + DO_TEST("intel-iommu-machine", + QEMU_CAPS_MACHINE_OPT, + QEMU_CAPS_MACHINE_IOMMU); =20 DO_TEST("cpu-hotplug-startup", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS); =20 diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 0702f58..d3d37a6 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -565,8 +565,7 @@ mymain(void) DO_TEST("cputune-iothreadsched", NONE); DO_TEST("cputune-iothreadsched-zeropriority", NONE); DO_TEST("cputune-numatune", NONE); - DO_TEST("vcpu-placement-static", - QEMU_CAPS_DEVICE_PCI_BRIDGE); + DO_TEST("vcpu-placement-static", NONE); =20 DO_TEST("smp", NONE); DO_TEST("iothreads", NONE); @@ -593,12 +592,12 @@ mymain(void) DO_TEST("usb-piix3-controller", QEMU_CAPS_PIIX3_USB_UHCI); DO_TEST("usb-controller-default-q35", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDG= E, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_NEC_USB_XHCI); DO_TEST("usb-controller-explicit-q35", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDG= E, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_NEC_USB_XHCI); @@ -668,24 +667,19 @@ mymain(void) DO_TEST("metadata", NONE); DO_TEST("metadata-duplicate", NONE); =20 - DO_TEST("pci-bridge", - QEMU_CAPS_DEVICE_PCI_BRIDGE); - DO_TEST("pci-bridge-many-disks", - QEMU_CAPS_DEVICE_PCI_BRIDGE); - DO_TEST("pci-autoadd-addr", - QEMU_CAPS_DEVICE_PCI_BRIDGE); - DO_TEST("pci-autoadd-idx", - QEMU_CAPS_DEVICE_PCI_BRIDGE); + DO_TEST("pci-bridge", NONE); + DO_TEST("pci-bridge-many-disks", NONE); + DO_TEST("pci-autoadd-addr", NONE); + DO_TEST("pci-autoadd-idx", NONE); DO_TEST("pci-autofill-addr", NONE); =20 DO_TEST("q35", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDG= E, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); DO_TEST("q35-usb2", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, @@ -693,13 +687,13 @@ mymain(void) QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); DO_TEST("q35-usb2-multi", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDG= E, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); DO_TEST("q35-usb2-reorder", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDG= E, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, @@ -718,7 +712,6 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, @@ -741,7 +734,6 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, @@ -765,8 +757,6 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION, @@ -788,8 +778,6 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION, @@ -811,8 +799,6 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION, @@ -834,8 +820,6 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION, @@ -844,35 +828,30 @@ mymain(void) QEMU_CAPS_DEVICE_ICH9_INTEL_HDA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); DO_TEST("pcie-root", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDG= E, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); DO_TEST("pcie-root-port", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDG= E, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); DO_TEST("pcie-switch-upstream-port", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDG= E, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); DO_TEST("pcie-switch-downstream-port", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDG= E, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); DO_TEST("pci-expander-bus", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_PXB); + QEMU_CAPS_DEVICE_PXB); DO_TEST("pcie-expander-bus", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDG= E, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_X3130_UPSTREAM, QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, QEMU_CAPS_DEVICE_PXB_PCIE= ); DO_TEST("autoindex", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDG= E, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_X3130_UPSTREAM, QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, @@ -880,7 +859,6 @@ mymain(void) /* Make sure the user can always override libvirt's default device * placement policy by providing an explicit PCI address */ DO_TEST("q35-pci-force-address", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_HDA_DUPLEX); @@ -944,7 +922,6 @@ mymain(void) DO_TEST("pcihole64-gib", NONE); DO_TEST("pcihole64-none", NONE); DO_TEST("pcihole64-q35", - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDG= E, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL, @@ -990,23 +967,22 @@ mymain(void) QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_PCI_MULTIFUNCTION, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("aarch64-virtio-pci-manual-addresses", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("aarch64-video-virtio-gpu-pci", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX, - QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_BOOTINDEX); =20 @@ -1054,8 +1030,6 @@ mymain(void) DO_TEST("video-virtio-gpu-secondary", NONE); =20 DO_TEST("intel-iommu", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420); =20 qemuTestDriverFree(&driver); --=20 2.7.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list