From nobody Thu Apr 25 17:37:07 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: <libvir-list-bounces@redhat.com>
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 <libvir-list@listman.util.phx.redhat.com>;
	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 <libvir-list@redhat.com>; Tue, 21 Feb 2017 14:57:51 -0500
From: Andrea Bolognani <abologna@redhat.com>
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
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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 @@
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
     </controller>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1e' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x01' f=
unction=3D'0x0'/>
-    </controller>
     <controller type=3D'fdc' index=3D'0'/>
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x03' f=
unction=3D'0x0'/>
-    </memballoon>
+    <memballoon model=3D'none'/>
   </devices>
 </domain>
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 @@
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
     </controller>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1e' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x01' f=
unction=3D'0x0'/>
-    </controller>
     <controller type=3D'fdc' index=3D'0'/>
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x03' f=
unction=3D'0x0'/>
-    </memballoon>
+    <memballoon model=3D'none'/>
   </devices>
 </domain>
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 @@
   <devices>
     <emulator>/usr/bin/qemu</emulator>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
-      <model name=3D'i82801b11-bridge'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1e' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <model name=3D'pci-bridge'/>
-      <target chassisNr=3D'2'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
     <controller type=3D'sata' index=3D'0'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
     </controller>
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x01' f=
unction=3D'0x0'/>
-    </memballoon>
+    <memballoon model=3D'none'/>
     <iommu model=3D'intel'/>
   </devices>
 </domain>
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 @@
   <devices>
     <emulator>/usr/bin/qemu</emulator>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
-      <model name=3D'i82801b11-bridge'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1e' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <model name=3D'pci-bridge'/>
-      <target chassisNr=3D'2'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
     <controller type=3D'sata' index=3D'0'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
     </controller>
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x01' f=
unction=3D'0x0'/>
-    </memballoon>
+    <memballoon model=3D'none'/>
     <iommu model=3D'intel'/>
   </devices>
 </domain>
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 @@
       <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
     </disk>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
-      <model name=3D'i82801b11-bridge'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <model name=3D'pci-bridge'/>
-      <target chassisNr=3D'56'/>
-    </controller>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
-      <target busNr=3D'220'>
-        <node>1</node>
-      </target>
-      <address type=3D'pci' bus=3D'0x00'/>
-    </controller>
-    <controller type=3D'pci' index=3D'4' model=3D'pcie-expander-bus'>
-      <address type=3D'pci' bus=3D'3'/>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'/>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-expander-bus'>
+      <address type=3D'pci' bus=3D'1'/>
     </controller>
     <memballoon model=3D'none'/>
   </devices>
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 @@
       <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
     </disk>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
-      <model name=3D'i82801b11-bridge'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <model name=3D'pci-bridge'/>
-      <target chassisNr=3D'56'/>
-    </controller>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-expander-bus'>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-expander-bus'>
       <model name=3D'pxb-pcie'/>
       <target busNr=3D'254'>
         <node>0</node>
       </target>
       <address type=3D'pci' bus=3D'0x00' slot=3D'4'/>
     </controller>
-    <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
       <target busNr=3D'220'>
         <node>1</node>
       </target>
-      <address type=3D'pci' bus=3D'0x03'/>
+      <address type=3D'pci' bus=3D'0x01'/>
     </controller>
-    <controller type=3D'pci' index=3D'5' model=3D'pcie-switch-upstream-por=
t'>
-      <address type=3D'pci' bus=3D'0x04'/>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-switch-upstream-por=
t'>
+      <address type=3D'pci' bus=3D'0x02'/>
     </controller>
+    <controller type=3D'pci' index=3D'4' model=3D'pcie-switch-downstream-p=
ort'/>
+    <controller type=3D'pci' index=3D'5' model=3D'pcie-switch-downstream-p=
ort'/>
     <controller type=3D'pci' index=3D'6' model=3D'pcie-switch-downstream-p=
ort'/>
     <controller type=3D'pci' index=3D'7' model=3D'pcie-switch-downstream-p=
ort'/>
     <controller type=3D'pci' index=3D'8' model=3D'pcie-switch-downstream-p=
ort'/>
@@ -80,167 +75,165 @@
     <controller type=3D'pci' index=3D'33' model=3D'pcie-switch-downstream-=
port'/>
     <controller type=3D'pci' index=3D'34' model=3D'pcie-switch-downstream-=
port'/>
     <controller type=3D'pci' index=3D'35' model=3D'pcie-switch-downstream-=
port'/>
-    <controller type=3D'pci' index=3D'36' model=3D'pcie-switch-downstream-=
port'/>
-    <controller type=3D'pci' index=3D'37' model=3D'pcie-switch-downstream-=
port'/>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:f1:95:51'/>
       <model type=3D'rtl8139'/>
-      <address type=3D'pci' bus=3D'6'/>
+      <address type=3D'pci' bus=3D'4'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:5c:c6:1a'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'07'/>
+      <address type=3D'pci' bus=3D'5'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:39:97:ac'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'8'/>
+      <address type=3D'pci' bus=3D'6'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:ee:b9:a8'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'9'/>
+      <address type=3D'pci' bus=3D'7'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:a9:f7:17'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'10'/>
+      <address type=3D'pci' bus=3D'8'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:df:2b:f3'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'11'/>
+      <address type=3D'pci' bus=3D'9'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:78:94:b4'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'12'/>
+      <address type=3D'pci' bus=3D'10'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:6b:9b:06'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'13'/>
+      <address type=3D'pci' bus=3D'11'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:17:df:bc'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'14'/>
+      <address type=3D'pci' bus=3D'12'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:3b:d0:51'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'15'/>
+      <address type=3D'pci' bus=3D'13'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:8d:2d:17'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'16'/>
+      <address type=3D'pci' bus=3D'14'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:a7:66:af'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'17'/>
+      <address type=3D'pci' bus=3D'15'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:54:ab:d7'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'18'/>
+      <address type=3D'pci' bus=3D'16'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:1f:99:90'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'19'/>
+      <address type=3D'pci' bus=3D'17'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:c8:43:87'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'20'/>
+      <address type=3D'pci' bus=3D'18'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:df:22:b2'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'21'/>
+      <address type=3D'pci' bus=3D'19'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:d2:9a:47'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'22'/>
+      <address type=3D'pci' bus=3D'20'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:86:05:e2'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'23'/>
+      <address type=3D'pci' bus=3D'21'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:8c:1c:c2'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'24'/>
+      <address type=3D'pci' bus=3D'22'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:48:58:92'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'25'/>
+      <address type=3D'pci' bus=3D'23'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:99:e5:bf'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'26'/>
+      <address type=3D'pci' bus=3D'24'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:b1:8c:25'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'27'/>
+      <address type=3D'pci' bus=3D'25'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:60:e0:d0'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'28'/>
+      <address type=3D'pci' bus=3D'26'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:37:00:6a'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'29'/>
+      <address type=3D'pci' bus=3D'27'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:c7:c8:ad'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'30'/>
+      <address type=3D'pci' bus=3D'28'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:4e:a7:cf'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'31'/>
+      <address type=3D'pci' bus=3D'29'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:00:79:69'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'32'/>
+      <address type=3D'pci' bus=3D'30'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:47:00:6f'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'33'/>
+      <address type=3D'pci' bus=3D'31'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:2a:8c:8b'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'34'/>
+      <address type=3D'pci' bus=3D'32'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:ec:d5:e3'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'35'/>
+      <address type=3D'pci' bus=3D'33'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:7e:6e:c8'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'36'/>
+      <address type=3D'pci' bus=3D'34'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:7e:6d:c9'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' bus=3D'37'/>
+      <address type=3D'pci' bus=3D'35'/>
     </interface>
     <memballoon model=3D'none'/>
   </devices>
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 @@
       <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
     </disk>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'/>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'/>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'/>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'/>
     <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'/>
     <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'/>
     <controller type=3D'pci' index=3D'5' model=3D'pcie-root-port'/>
@@ -49,8 +49,6 @@
     <controller type=3D'pci' index=3D'27' model=3D'pcie-root-port'/>
     <controller type=3D'pci' index=3D'28' model=3D'pcie-root-port'/>
     <controller type=3D'pci' index=3D'29' model=3D'pcie-root-port'/>
-    <controller type=3D'pci' index=3D'30' model=3D'pcie-root-port'/>
-    <controller type=3D'pci' index=3D'31' model=3D'pcie-root-port'/>
     <controller type=3D'sata' index=3D'0'/>
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
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 @@
       <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
     </disk>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'/>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'/>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'/>
-    <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'/>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
       <model name=3D'ioh3420'/>
       <target chassis=3D'40' port=3D'0x1a'/>
     </controller>
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 @@
       <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
     </disk>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'/>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'/>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'/>
-    <controller type=3D'pci' index=3D'4' model=3D'pcie-switch-upstream-por=
t'/>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'/>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-switch-upstream-por=
t'/>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-switch-downstream-p=
ort'/>
+    <controller type=3D'pci' index=3D'4' model=3D'pcie-switch-downstream-p=
ort'/>
     <controller type=3D'pci' index=3D'5' model=3D'pcie-switch-downstream-p=
ort'/>
-    <controller type=3D'pci' index=3D'6' model=3D'pcie-switch-downstream-p=
ort'/>
-    <controller type=3D'pci' index=3D'7' model=3D'pcie-switch-downstream-p=
ort'/>
-    <controller type=3D'pci' index=3D'8' model=3D'pcie-switch-downstream-p=
ort'>
+    <controller type=3D'pci' index=3D'6' model=3D'pcie-switch-downstream-p=
ort'>
       <model name=3D'xio3130-downstream'/>
       <target chassis=3D'30' port=3D'0x27'/>
     </controller>
-    <controller type=3D'pci' index=3D'9' model=3D'pcie-switch-upstream-por=
t'/>
+    <controller type=3D'pci' index=3D'7' model=3D'pcie-switch-upstream-por=
t'/>
+    <controller type=3D'pci' index=3D'8' model=3D'pcie-switch-downstream-p=
ort'/>
+    <controller type=3D'pci' index=3D'9' model=3D'pcie-switch-downstream-p=
ort'/>
     <controller type=3D'pci' index=3D'10' model=3D'pcie-switch-downstream-=
port'/>
-    <controller type=3D'pci' index=3D'11' model=3D'pcie-switch-downstream-=
port'/>
-    <controller type=3D'pci' index=3D'12' model=3D'pcie-switch-downstream-=
port'/>
     <controller type=3D'sata' index=3D'0'/>
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
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 @@
       <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
     </disk>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'/>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'/>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'/>
-    <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'/>
-    <controller type=3D'pci' index=3D'5' model=3D'pcie-switch-upstream-por=
t'/>
-    <controller type=3D'pci' index=3D'6' model=3D'pcie-switch-upstream-por=
t'>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'/>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'/>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-switch-upstream-por=
t'/>
+    <controller type=3D'pci' index=3D'4' model=3D'pcie-switch-upstream-por=
t'>
       <model name=3D'x3130-upstream'/>
     </controller>
     <controller type=3D'sata' index=3D'0'/>
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 @@
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'>
       <pcihole64 unit=3D'KiB'>1048576</pcihole64>
     </controller>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'/>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'/>
     <controller type=3D'sata' index=3D'0'/>
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
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 @@
       <model name=3D'pci-bridge'/>
       <target chassisNr=3D'56'/>
     </controller>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'/>
-    <controller type=3D'pci' index=3D'4' model=3D'dmi-to-pci-bridge'>
-      <address type=3D'pci' bus=3D'2' slot=3D'3'/>
+    <controller type=3D'pci' index=3D'2' model=3D'dmi-to-pci-bridge'>
+      <address type=3D'pci' bus=3D'2'/>
     </controller>
     <memballoon model=3D'none'/>
   </devices>
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 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/libexec/qemu-kvm</emulator>
-    <disk type=3D'block' device=3D'disk'>
-      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
-      <target dev=3D'sda' bus=3D'sata'/>
-      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
-    </disk>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
-      <model name=3D'i82801b11-bridge'/>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'/>
+    <controller type=3D'pci' index=3D'2' model=3D'dmi-to-pci-bridge'>
+      <address type=3D'pci' bus=3D'1'/>
     </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <model name=3D'pci-bridge'/>
-      <target chassisNr=3D'56'/>
-    </controller>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'/>
-    <controller type=3D'pci' index=3D'4' model=3D'dmi-to-pci-bridge'>
-      <address type=3D'pci' bus=3D'3'/>
-    </controller>
-    <video>
-      <model type=3D'qxl' ram=3D'65536' vram=3D'32768' vgamem=3D'8192' hea=
ds=3D'1'/>
-    </video>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
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 @@
   <devices>
     <emulator>/usr/bin/qemu-kvm</emulator>
     <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
-      <model name=3D'i82801b11-bridge'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <model name=3D'pci-bridge'/>
-      <target chassisNr=3D'56'/>
-    </controller>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
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 @@
       <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
     </disk>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
-      <model name=3D'i82801b11-bridge'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <model name=3D'pci-bridge'/>
-      <target chassisNr=3D'56'/>
-    </controller>
     <video>
       <model type=3D'qxl' ram=3D'65536' vram=3D'32768' vgamem=3D'8192' hea=
ds=3D'1'/>
     </video>
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 @@
   <devices>
     <emulator>/usr/libexec/qemu-kvm</emulator>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'/>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <model name=3D'pci-bridge'/>
-      <target chassisNr=3D'56'/>
-    </controller>
     <controller type=3D'usb' index=3D'0'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
     </controller>
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 @@
   <devices>
     <emulator>/usr/libexec/qemu-kvm</emulator>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'/>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <model name=3D'pci-bridge'/>
-      <target chassisNr=3D'56'/>
-    </controller>
     <controller type=3D'usb' index=3D'0' model=3D'nec-xhci'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
     </controller>
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 @@
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
     </controller>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1e' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x01' f=
unction=3D'0x0'/>
-    </controller>
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <memballoon model=3D'none'/>
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 @@
   <devices>
     <emulator>/usr/bin/qemu</emulator>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
-      <model name=3D'i82801b11-bridge'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1e' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <model name=3D'pci-bridge'/>
-      <target chassisNr=3D'2'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
     <controller type=3D'sata' index=3D'0'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
     </controller>
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x01' f=
unction=3D'0x0'/>
-    </memballoon>
+    <memballoon model=3D'none'/>
     <iommu model=3D'intel'/>
   </devices>
 </domain>
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 @@
       <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
     </disk>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
-      <model name=3D'i82801b11-bridge'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1e' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <model name=3D'pci-bridge'/>
-      <target chassisNr=3D'56'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-expander-bus'>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-expander-bus'>
       <model name=3D'pxb-pcie'/>
       <target busNr=3D'254'>
         <node>0</node>
       </target>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
     </controller>
-    <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
       <model name=3D'ioh3420'/>
-      <target chassis=3D'4' port=3D'0x0' busNr=3D'220'>
+      <target chassis=3D'2' port=3D'0x0' busNr=3D'220'>
         <node>1</node>
       </target>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
     </controller>
-    <controller type=3D'pci' index=3D'5' model=3D'pcie-switch-upstream-por=
t'>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-switch-upstream-por=
t'>
       <model name=3D'x3130-upstream'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'4' model=3D'pcie-switch-downstream-p=
ort'>
+      <model name=3D'xio3130-downstream'/>
+      <target chassis=3D'4' port=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'5' model=3D'pcie-switch-downstream-p=
ort'>
+      <model name=3D'xio3130-downstream'/>
+      <target chassis=3D'5' port=3D'0x1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x01' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'6' model=3D'pcie-switch-downstream-p=
ort'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'6' port=3D'0x0'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <target chassis=3D'6' port=3D'0x2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x02' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'7' model=3D'pcie-switch-downstream-p=
ort'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'7' port=3D'0x1'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x01' f=
unction=3D'0x0'/>
+      <target chassis=3D'7' port=3D'0x3'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x03' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'8' model=3D'pcie-switch-downstream-p=
ort'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'8' port=3D'0x2'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x02' f=
unction=3D'0x0'/>
+      <target chassis=3D'8' port=3D'0x4'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x04' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'9' model=3D'pcie-switch-downstream-p=
ort'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'9' port=3D'0x3'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x03' f=
unction=3D'0x0'/>
+      <target chassis=3D'9' port=3D'0x5'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x05' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'10' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'10' port=3D'0x4'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x04' f=
unction=3D'0x0'/>
+      <target chassis=3D'10' port=3D'0x6'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x06' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'11' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'11' port=3D'0x5'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x05' f=
unction=3D'0x0'/>
+      <target chassis=3D'11' port=3D'0x7'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x07' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'12' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'12' port=3D'0x6'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x06' f=
unction=3D'0x0'/>
+      <target chassis=3D'12' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x08' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'13' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'13' port=3D'0x7'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x07' f=
unction=3D'0x0'/>
+      <target chassis=3D'13' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x09' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'14' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'14' port=3D'0x8'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x08' f=
unction=3D'0x0'/>
+      <target chassis=3D'14' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x0a' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'15' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'15' port=3D'0x9'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x09' f=
unction=3D'0x0'/>
+      <target chassis=3D'15' port=3D'0xb'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x0b' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'16' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'16' port=3D'0xa'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x0a' f=
unction=3D'0x0'/>
+      <target chassis=3D'16' port=3D'0xc'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x0c' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'17' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'17' port=3D'0xb'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x0b' f=
unction=3D'0x0'/>
+      <target chassis=3D'17' port=3D'0xd'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x0d' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'18' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'18' port=3D'0xc'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x0c' f=
unction=3D'0x0'/>
+      <target chassis=3D'18' port=3D'0xe'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x0e' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'19' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'19' port=3D'0xd'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x0d' f=
unction=3D'0x0'/>
+      <target chassis=3D'19' port=3D'0xf'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x0f' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'20' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'20' port=3D'0xe'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x0e' f=
unction=3D'0x0'/>
+      <target chassis=3D'20' port=3D'0x10'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x10' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'21' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'21' port=3D'0xf'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x0f' f=
unction=3D'0x0'/>
+      <target chassis=3D'21' port=3D'0x11'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x11' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'22' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'22' port=3D'0x10'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x10' f=
unction=3D'0x0'/>
+      <target chassis=3D'22' port=3D'0x12'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x12' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'23' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'23' port=3D'0x11'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x11' f=
unction=3D'0x0'/>
+      <target chassis=3D'23' port=3D'0x13'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x13' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'24' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'24' port=3D'0x12'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x12' f=
unction=3D'0x0'/>
+      <target chassis=3D'24' port=3D'0x14'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x14' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'25' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'25' port=3D'0x13'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x13' f=
unction=3D'0x0'/>
+      <target chassis=3D'25' port=3D'0x15'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x15' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'26' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'26' port=3D'0x14'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x14' f=
unction=3D'0x0'/>
+      <target chassis=3D'26' port=3D'0x16'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x16' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'27' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'27' port=3D'0x15'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x15' f=
unction=3D'0x0'/>
+      <target chassis=3D'27' port=3D'0x17'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x17' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'28' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'28' port=3D'0x16'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x16' f=
unction=3D'0x0'/>
+      <target chassis=3D'28' port=3D'0x18'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x18' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'29' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'29' port=3D'0x17'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x17' f=
unction=3D'0x0'/>
+      <target chassis=3D'29' port=3D'0x19'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x19' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'30' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'30' port=3D'0x18'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x18' f=
unction=3D'0x0'/>
+      <target chassis=3D'30' port=3D'0x1a'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x1a' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'31' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'31' port=3D'0x19'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x19' f=
unction=3D'0x0'/>
+      <target chassis=3D'31' port=3D'0x1b'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x1b' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'32' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'32' port=3D'0x1a'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x1a' f=
unction=3D'0x0'/>
+      <target chassis=3D'32' port=3D'0x1c'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x1c' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'33' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'33' port=3D'0x1b'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x1b' f=
unction=3D'0x0'/>
+      <target chassis=3D'33' port=3D'0x1d'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x1d' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'34' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'34' port=3D'0x1c'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x1c' f=
unction=3D'0x0'/>
+      <target chassis=3D'34' port=3D'0x1e'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x1e' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'pci' index=3D'35' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'35' port=3D'0x1d'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x1d' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'36' model=3D'pcie-switch-downstream-=
port'>
-      <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'36' port=3D'0x1e'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x1e' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'37' model=3D'pcie-switch-downstream-=
port'>
-      <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'37' port=3D'0x1f'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x1f' f=
unction=3D'0x0'/>
+      <target chassis=3D'35' port=3D'0x1f'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x1f' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'sata' index=3D'0'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
@@ -220,162 +211,162 @@
     <interface type=3D'user'>
       <mac address=3D'52:54:00:f1:95:51'/>
       <model type=3D'rtl8139'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x06' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:5c:c6:1a'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x07' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:39:97:ac'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x08' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x06' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:ee:b9:a8'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x09' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x07' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:a9:f7:17'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0a' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x08' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:df:2b:f3'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0b' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x09' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:78:94:b4'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0c' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0a' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:6b:9b:06'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0d' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0b' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:17:df:bc'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0e' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0c' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:3b:d0:51'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0f' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0d' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:8d:2d:17'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x10' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0e' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:a7:66:af'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x11' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0f' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:54:ab:d7'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x12' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x10' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:1f:99:90'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x13' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x11' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:c8:43:87'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x14' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x12' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:df:22:b2'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x15' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x13' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:d2:9a:47'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x16' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x14' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:86:05:e2'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x17' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x15' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:8c:1c:c2'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x18' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x16' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:48:58:92'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x19' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x17' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:99:e5:bf'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x1a' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x18' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:b1:8c:25'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x1b' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x19' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:60:e0:d0'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x1c' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x1a' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:37:00:6a'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x1d' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x1b' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:c7:c8:ad'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x1e' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x1c' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:4e:a7:cf'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x1f' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x1d' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:00:79:69'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x20' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x1e' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:47:00:6f'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x21' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x1f' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:2a:8c:8b'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x22' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x20' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:ec:d5:e3'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x23' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x21' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:7e:6e:c8'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x24' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x22' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'52:54:00:7e:6d:c9'/>
       <model type=3D'e1000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x25' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x23' slot=3D'0x00' f=
unction=3D'0x0'/>
     </interface>
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
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 @@
       <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
     </disk>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
-      <model name=3D'i82801b11-bridge'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1e' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <model name=3D'pci-bridge'/>
-      <target chassisNr=3D'2'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
       <model name=3D'ioh3420'/>
-      <target chassis=3D'3' port=3D'0x10'/>
+      <target chassis=3D'1' port=3D'0x10'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0' multifunction=3D'on'/>
     </controller>
-    <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
       <model name=3D'ioh3420'/>
       <target chassis=3D'40' port=3D'0x1a'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x1'/>
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 @@
       <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
     </disk>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
-      <model name=3D'i82801b11-bridge'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1e' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <model name=3D'pci-bridge'/>
-      <target chassisNr=3D'2'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
       <model name=3D'ioh3420'/>
-      <target chassis=3D'3' port=3D'0x10'/>
+      <target chassis=3D'1' port=3D'0x10'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
     </controller>
-    <controller type=3D'pci' index=3D'4' model=3D'pcie-switch-upstream-por=
t'>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-switch-upstream-por=
t'>
       <model name=3D'x3130-upstream'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
     </controller>
-    <controller type=3D'pci' index=3D'5' model=3D'pcie-switch-downstream-p=
ort'>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-switch-downstream-p=
ort'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'5' port=3D'0x0'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <target chassis=3D'3' port=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
     </controller>
-    <controller type=3D'pci' index=3D'6' model=3D'pcie-switch-downstream-p=
ort'>
+    <controller type=3D'pci' index=3D'4' model=3D'pcie-switch-downstream-p=
ort'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'6' port=3D'0x1'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x01' f=
unction=3D'0x0'/>
+      <target chassis=3D'4' port=3D'0x1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x01' f=
unction=3D'0x0'/>
     </controller>
-    <controller type=3D'pci' index=3D'7' model=3D'pcie-switch-downstream-p=
ort'>
+    <controller type=3D'pci' index=3D'5' model=3D'pcie-switch-downstream-p=
ort'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'7' port=3D'0x2'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x02' f=
unction=3D'0x0'/>
+      <target chassis=3D'5' port=3D'0x2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x02' f=
unction=3D'0x0'/>
     </controller>
-    <controller type=3D'pci' index=3D'8' model=3D'pcie-switch-downstream-p=
ort'>
+    <controller type=3D'pci' index=3D'6' model=3D'pcie-switch-downstream-p=
ort'>
       <model name=3D'xio3130-downstream'/>
       <target chassis=3D'30' port=3D'0x27'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x03' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x03' f=
unction=3D'0x0'/>
     </controller>
-    <controller type=3D'pci' index=3D'9' model=3D'pcie-switch-upstream-por=
t'>
+    <controller type=3D'pci' index=3D'7' model=3D'pcie-switch-upstream-por=
t'>
       <model name=3D'x3130-upstream'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x00' f=
unction=3D'0x0'/>
     </controller>
-    <controller type=3D'pci' index=3D'10' model=3D'pcie-switch-downstream-=
port'>
+    <controller type=3D'pci' index=3D'8' model=3D'pcie-switch-downstream-p=
ort'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'10' port=3D'0x4'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x04' f=
unction=3D'0x0'/>
+      <target chassis=3D'8' port=3D'0x4'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x04' f=
unction=3D'0x0'/>
     </controller>
-    <controller type=3D'pci' index=3D'11' model=3D'pcie-switch-downstream-=
port'>
+    <controller type=3D'pci' index=3D'9' model=3D'pcie-switch-downstream-p=
ort'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'11' port=3D'0x5'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x05' f=
unction=3D'0x0'/>
+      <target chassis=3D'9' port=3D'0x5'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x05' f=
unction=3D'0x0'/>
     </controller>
-    <controller type=3D'pci' index=3D'12' model=3D'pcie-switch-downstream-=
port'>
+    <controller type=3D'pci' index=3D'10' model=3D'pcie-switch-downstream-=
port'>
       <model name=3D'xio3130-downstream'/>
-      <target chassis=3D'12' port=3D'0x6'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x06' f=
unction=3D'0x0'/>
+      <target chassis=3D'10' port=3D'0x6'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x06' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'sata' index=3D'0'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
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 @@
       <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
     </disk>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
-      <model name=3D'i82801b11-bridge'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1e' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <model name=3D'pci-bridge'/>
-      <target chassisNr=3D'2'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
       <model name=3D'ioh3420'/>
-      <target chassis=3D'3' port=3D'0x10'/>
+      <target chassis=3D'1' port=3D'0x10'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0' multifunction=3D'on'/>
     </controller>
-    <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
       <model name=3D'ioh3420'/>
-      <target chassis=3D'4' port=3D'0x11'/>
+      <target chassis=3D'2' port=3D'0x11'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x1'/>
     </controller>
-    <controller type=3D'pci' index=3D'5' model=3D'pcie-switch-upstream-por=
t'>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-switch-upstream-por=
t'>
       <model name=3D'x3130-upstream'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
     </controller>
-    <controller type=3D'pci' index=3D'6' model=3D'pcie-switch-upstream-por=
t'>
+    <controller type=3D'pci' index=3D'4' model=3D'pcie-switch-upstream-por=
t'>
       <model name=3D'x3130-upstream'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x00' f=
unction=3D'0x0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
     </controller>
     <controller type=3D'sata' index=3D'0'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
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 @@
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'>
       <pcihole64 unit=3D'KiB'>1048576</pcihole64>
     </controller>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
-      <model name=3D'i82801b11-bridge'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1e' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <model name=3D'pci-bridge'/>
-      <target chassisNr=3D'2'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
     <controller type=3D'sata' index=3D'0'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
     </controller>
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 @@
       <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
     </disk>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
-      <model name=3D'i82801b11-bridge'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1e' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <model name=3D'pci-bridge'/>
-      <target chassisNr=3D'56'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
     <controller type=3D'usb' index=3D'0' model=3D'ich9-ehci1'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1d' f=
unction=3D'0x7'/>
     </controller>
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 @@
   <devices>
     <emulator>/usr/libexec/qemu-kvm</emulator>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
-      <model name=3D'i82801b11-bridge'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1e' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <model name=3D'pci-bridge'/>
-      <target chassisNr=3D'56'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
     <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
     </controller>
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 @@
   <devices>
     <emulator>/usr/libexec/qemu-kvm</emulator>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
-      <model name=3D'i82801b11-bridge'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1e' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <model name=3D'pci-bridge'/>
-      <target chassisNr=3D'56'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
-    </controller>
     <controller type=3D'usb' index=3D'0' model=3D'nec-xhci'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
     </controller>
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 @@
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
     </controller>
     <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
-    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
-      <model name=3D'i82801b11-bridge'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1e' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
-      <model name=3D'pci-bridge'/>
-      <target chassisNr=3D'2'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x01' f=
unction=3D'0x0'/>
-    </controller>
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <memballoon model=3D'none'/>
--=20
2.7.4

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list