[RFC PATCH 29/43] [fixup] Fix test fallout in tests/qemuxml2xmloutdata

Friday, 9 April 2021

---
 tests/qemuxml2xmloutdata/autoindex.xml        |   4 +-
 .../balloon-device-auto.xml                   |   2 +-
 .../bios-nvram-os-interleave.xml              |   2 +-
 tests/qemuxml2xmloutdata/bios-nvram.xml       |   2 +-
 tests/qemuxml2xmloutdata/blkiotune-device.xml |   2 +-
 tests/qemuxml2xmloutdata/blkiotune.xml        |   2 +-
 .../boot-menu-disable-with-timeout.xml        |   2 +-
 .../qemuxml2xmloutdata/boot-menu-disable.xml  |   2 +-
 .../boot-menu-enable-with-timeout.xml         |   2 +-
 tests/qemuxml2xmloutdata/boot-multi.xml       |   2 +-
 tests/qemuxml2xmloutdata/boot-order.xml       |   6 +-
 tests/qemuxml2xmloutdata/channel-guestfwd.xml |   2 +-
 .../channel-unix-source-path-active.xml       |   2 +-
 .../channel-unix-source-path-inactive.xml     |   2 +-
 .../channel-virtio-auto.xml                   |   6 +-
 .../channel-virtio-state-active.xml           |   2 +-
 .../channel-virtio-state-inactive.xml         |   2 +-
 tests/qemuxml2xmloutdata/channel-virtio.xml   |   2 +-
 tests/qemuxml2xmloutdata/chardev-label.xml    |   4 +-
 tests/qemuxml2xmloutdata/clock-catchup.xml    |   2 +-
 .../clock-timer-hyperv-rtc.xml                |   2 +-
 .../console-compat-auto.xml                   |   2 +-
 tests/qemuxml2xmloutdata/console-compat2.xml  |   2 +-
 .../console-virtio-many.xml                   |   4 +-
 tests/qemuxml2xmloutdata/console-virtio.xml   |   4 +-
 .../controller-usb-order.xml                  |   2 +-
 .../controller-virtio-scsi.xml                |  12 +-
 .../cpu-check-default-none.xml                |   2 +-
 .../cpu-check-default-none2.xml               |   2 +-
 .../cpu-check-default-partial.xml             |   2 +-
 .../cpu-check-default-partial2.xml            |   2 +-
 tests/qemuxml2xmloutdata/cpu-check-full.xml   |   2 +-
 tests/qemuxml2xmloutdata/cpu-check-none.xml   |   2 +-
 .../qemuxml2xmloutdata/cpu-check-partial.xml  |   2 +-
 tests/qemuxml2xmloutdata/cpu-empty.xml        |   2 +-
 tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml |   2 +-
 tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml  |   2 +-
 .../qemuxml2xmloutdata/cpu-host-kvmclock.xml  |   2 +-
 .../cpu-host-model-features.xml               |   2 +-
 .../cpu-host-model-vendor.xml                 |   2 +-
 .../cpu-host-passthrough-features.xml         |   2 +-
 tests/qemuxml2xmloutdata/cpu-kvmclock.xml     |   2 +-
 .../qemuxml2xmloutdata/cpu-numa-disjoint.xml  |   2 +-
 .../cpu-numa-disordered.xml                   |   2 +-
 .../qemuxml2xmloutdata/cpu-numa-memshared.xml |   2 +-
 .../cpu-numa-no-memory-element.xml            |   2 +-
 tests/qemuxml2xmloutdata/cpu-numa1.xml        |   2 +-
 tests/qemuxml2xmloutdata/cpu-numa2.xml        |   2 +-
 .../qemuxml2xmloutdata/cputune-iothreads.xml  |   2 +-
 .../cputune-iothreadsched-zeropriority.xml    |   2 +-
 .../cputune-iothreadsched.xml                 |   2 +-
 .../cputune-zero-shares.xml                   |   2 +-
 tests/qemuxml2xmloutdata/cputune.xml          |   2 +-
 .../default-kvm-host-arch.xml                 |   2 +-
 .../default-qemu-host-arch.xml                |   2 +-
 .../disk-active-commit-active.xml             |   2 +-
 .../disk-active-commit-inactive.xml           |   2 +-
 tests/qemuxml2xmloutdata/disk-aio.xml         |   2 +-
 .../disk-backing-chains-active.xml            |  12 +-
 .../disk-backing-chains-inactive.xml          |  12 +-
 .../disk-backing-chains-index-active.xml      |  14 +-
 .../disk-backing-chains-index-inactive.xml    |  14 +-
 .../disk-backing-chains-noindex.xml           |  14 +-
 .../qemuxml2xmloutdata/disk-copy_on_read.xml  |   4 +-
 .../qemuxml2xmloutdata/disk-mirror-active.xml |   8 +-
 .../disk-mirror-inactive.xml                  |   8 +-
 .../disk-mirror-old-active.xml                |   6 +-
 .../disk-mirror-old-inactive.xml              |   6 +-
 .../disk-network-gluster.xml                  |   6 +-
 .../qemuxml2xmloutdata/disk-network-iscsi.xml |  10 +-
 tests/qemuxml2xmloutdata/disk-network-nbd.xml |  10 +-
 tests/qemuxml2xmloutdata/disk-network-rbd.xml |  12 +-
 .../disk-network-sheepdog.xml                 |   2 +-
 .../disk-network-source-auth.xml              |   6 +-
 .../disk-scsi-device-auto.xml                 |   4 +-
 .../qemuxml2xmloutdata/disk-scsi-disk-vpd.xml |   6 +-
 .../disk-scsi-lun-passthrough-sgio.xml        |   6 +-
 tests/qemuxml2xmloutdata/disk-serial.xml      |   2 +-
 .../disk-source-pool-mode.xml                 |   2 +-
 tests/qemuxml2xmloutdata/disk-source-pool.xml |   4 +-
 tests/qemuxml2xmloutdata/disk-usb-device.xml  |   2 +-
 tests/qemuxml2xmloutdata/disk-virtio.xml      |   4 +-
 tests/qemuxml2xmloutdata/encrypted-disk.xml   |   2 +-
 tests/qemuxml2xmloutdata/eoi-disabled.xml     |   2 +-
 tests/qemuxml2xmloutdata/eoi-enabled.xml      |   2 +-
 tests/qemuxml2xmloutdata/event_idx.xml        |   4 +-
 tests/qemuxml2xmloutdata/floppy-drive-fat.xml |   2 +-
 .../hostdev-mdev-precreated.xml               |   2 +-
 .../hostdev-pci-address-unassigned.xml        |   8 +-
 .../hostdev-pci-address.xml                   |   2 +-
 .../hostdev-pci-multifunction.xml             |  16 +-
 .../hostdev-scsi-autogen-address.xml          |   6 +-
 .../hostdev-scsi-large-unit.xml               |   4 +-
 tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml |   4 +-
 .../qemuxml2xmloutdata/hostdev-scsi-rawio.xml |   4 +-
 .../qemuxml2xmloutdata/hostdev-scsi-sgio.xml  |   4 +-
 .../hostdev-scsi-shareable.xml                |   4 +-
 .../hostdev-scsi-vhost-scsi-pci.xml           |   2 +-
 .../hostdev-scsi-vhost-scsi-pcie.xml          |   8 +-
 .../hostdev-scsi-virtio-scsi.xml              |   4 +-
 tests/qemuxml2xmloutdata/hostdev-vfio.xml     |   4 +-
 .../qemuxml2xmloutdata/hugepages-default.xml  |   2 +-
 tests/qemuxml2xmloutdata/hugepages-shared.xml |   2 +-
 tests/qemuxml2xmloutdata/hyperv-off.xml       |   2 +-
 tests/qemuxml2xmloutdata/interface-driver.xml |   4 +-
 tests/qemuxml2xmloutdata/iothreads-disk.xml   |   2 +-
 tests/qemuxml2xmloutdata/kvm-features-off.xml |   2 +-
 tests/qemuxml2xmloutdata/lease.xml            |   2 +-
 .../qemuxml2xmloutdata/luks-disks-source.xml  |   6 +-
 .../memory-hotplug-dimm.xml                   |   2 +-
 tests/qemuxml2xmloutdata/memory-hotplug.xml   |   2 +-
 .../qemuxml2xmloutdata/memorybacking-set.xml  |   2 +-
 .../memorybacking-unset.xml                   |   2 +-
 .../qemuxml2xmloutdata/memtune-unlimited.xml  |   2 +-
 tests/qemuxml2xmloutdata/memtune.xml          |   2 +-
 .../qemuxml2xmloutdata/metadata-duplicate.xml |   2 +-
 tests/qemuxml2xmloutdata/metadata.xml         |   2 +-
 tests/qemuxml2xmloutdata/minimal.xml          |   2 +-
 tests/qemuxml2xmloutdata/net-coalesce.xml     |   8 +-
 tests/qemuxml2xmloutdata/net-eth-hostip.xml   |   2 +-
 tests/qemuxml2xmloutdata/net-eth-ifname.xml   |   2 +-
 .../net-eth-unmanaged-tap.xml                 |   2 +-
 tests/qemuxml2xmloutdata/net-eth.xml          |   2 +-
 .../net-hostdev-bootorder.xml                 |   2 +-
 tests/qemuxml2xmloutdata/net-hostdev-vfio.xml |   4 +-
 tests/qemuxml2xmloutdata/net-hostdev.xml      |   4 +-
 tests/qemuxml2xmloutdata/net-many-models.xml  |  12 +-
 tests/qemuxml2xmloutdata/net-midonet.xml      |   4 +-
 tests/qemuxml2xmloutdata/net-mtu.xml          |   6 +-
 tests/qemuxml2xmloutdata/net-openvswitch.xml  |   4 +-
 tests/qemuxml2xmloutdata/net-udp.xml          |   4 +-
 tests/qemuxml2xmloutdata/net-user.xml         |   2 +-
 tests/qemuxml2xmloutdata/net-vdpa.xml         |   2 +-
 tests/qemuxml2xmloutdata/net-vhostuser.xml    |   6 +-
 .../qemuxml2xmloutdata/net-virtio-device.xml  |   4 +-
 .../net-virtio-disable-offloads.xml           |   4 +-
 .../net-virtio-network-portgroup.xml          |   8 +-
 .../net-virtio-rxtxqueuesize.xml              |   4 +-
 .../net-virtio-teaming-network.xml            |   6 +-
 .../qemuxml2xmloutdata/net-virtio-teaming.xml |  10 +-
 tests/qemuxml2xmloutdata/net-virtio.xml       |   2 +-
 .../numad-auto-memory-vcpu-cpuset.xml         |   2 +-
 ...to-memory-vcpu-no-cpuset-and-placement.xml |   2 +-
 .../numad-auto-vcpu-no-numatune.xml           |   2 +-
 .../numad-static-vcpu-no-numatune.xml         |   2 +-
 .../numatune-auto-prefer.xml                  |   2 +-
 .../qemuxml2xmloutdata/numatune-distances.xml |   2 +-
 .../numatune-memnode-no-memory.xml            |   2 +-
 tests/qemuxml2xmloutdata/numatune-memnode.xml |   2 +-
 tests/qemuxml2xmloutdata/panic-isa.xml        |   2 +-
 tests/qemuxml2xmloutdata/panic-no-address.xml |   2 +-
 tests/qemuxml2xmloutdata/panic.xml            |   2 +-
 .../pci-bridge-many-disks.xml                 | 216 +++++++++---------
 tests/qemuxml2xmloutdata/pci-expander-bus.xml |  68 +++---
 .../pci-rom-disabled-invalid.xml              |   2 +-
 tests/qemuxml2xmloutdata/pci-rom-disabled.xml |   2 +-
 tests/qemuxml2xmloutdata/pci-rom.xml          |  10 +-
 .../pci-serial-dev-chardev.xml                |   2 +-
 .../pcie-root-port-model-generic.xml          |  12 +-
 .../pcie-root-port-model-ioh3420.xml          |   8 +-
 tests/qemuxml2xmloutdata/pcihole64-gib.xml    |   2 +-
 tests/qemuxml2xmloutdata/pcihole64-none.xml   |   2 +-
 tests/qemuxml2xmloutdata/pcihole64.xml        |   2 +-
 .../pv-spinlock-disabled.xml                  |   2 +-
 .../pv-spinlock-enabled.xml                   |   2 +-
 .../q35-pci-force-address.xml                 |   4 +-
 .../qemuxml2xmloutdata/seclabel-dac-none.xml  |   2 +-
 .../seclabel-device-multiple.xml              |   2 +-
 .../seclabel-dynamic-baselabel-inactive.xml   |   2 +-
 .../seclabel-dynamic-labelskip-inactive.xml   |   2 +-
 .../seclabel-dynamic-none.xml                 |   2 +-
 .../seclabel-dynamic-override-inactive.xml    |   2 +-
 .../seclabel-dynamic-relabel-inactive.xml     |   2 +-
 tests/qemuxml2xmloutdata/seclabel-none.xml    |   2 +-
 .../seclabel-static-labelskip-active.xml      |   2 +-
 .../seclabel-static-labelskip-inactive.xml    |   2 +-
 tests/qemuxml2xmloutdata/seclabel-static.xml  |   2 +-
 .../serial-spiceport-nospice.xml              |   2 +-
 .../serial-target-port-auto.xml               |   2 +-
 .../serial-tcp-tlsx509-chardev.xml            |   2 +-
 .../shmem-plain-doorbell.xml                  |  14 +-
 tests/qemuxml2xmloutdata/shmem.xml            |  14 +-
 .../smartcard-controller.xml                  |   2 +-
 .../smartcard-host-certificates-database.xml  |   2 +-
 .../smartcard-host-certificates.xml           |   2 +-
 tests/qemuxml2xmloutdata/smartcard-host.xml   |   2 +-
 .../smartcard-passthrough-spicevmc.xml        |   2 +-
 .../smartcard-passthrough-tcp.xml             |   2 +-
 .../smbios-multiple-type2.xml                 |   2 +-
 tests/qemuxml2xmloutdata/smbios.xml           |   2 +-
 tests/qemuxml2xmloutdata/sound-device.xml     |  14 +-
 tests/qemuxml2xmloutdata/sound.xml            |   4 +-
 .../tap-vhost-incorrect.xml                   |   6 +-
 tests/qemuxml2xmloutdata/tap-vhost.xml        |   4 +-
 .../qemuxml2xmloutdata/tseg-explicit-size.xml |   4 +-
 tests/qemuxml2xmloutdata/usb-controller.xml   |   2 +-
 .../qemuxml2xmloutdata/usb-ich9-ehci-addr.xml |  26 +--
 tests/qemuxml2xmloutdata/usb-none.xml         |   2 +-
 .../usb-piix3-controller.xml                  |   2 +-
 tests/qemuxml2xmloutdata/usb-port-missing.xml |   2 +-
 .../usb-redir-filter-version.xml              |   2 +-
 tests/qemuxml2xmloutdata/usb-redir-filter.xml |   2 +-
 tests/qemuxml2xmloutdata/usb-redir.xml        |   2 +-
 tests/qemuxml2xmloutdata/vhost-vsock-auto.xml |   2 +-
 tests/qemuxml2xmloutdata/vhost_queues.xml     |   4 +-
 .../virtio-input-passthrough.xml              |   4 +-
 tests/qemuxml2xmloutdata/virtio-input.xml     |   6 +-
 tests/qemuxml2xmloutdata/virtio-lun.xml       |   4 +-
 tests/qemuxml2xmloutdata/virtio-rng-egd.xml   |   4 +-
 .../qemuxml2xmloutdata/virtio-rng-random.xml  |   4 +-
 tests/qemuxml2xmloutdata/vmcoreinfo.xml       |   2 +-
 211 files changed, 537 insertions(+), 537 deletions(-)

diff --git a/tests/qemuxml2xmloutdata/autoindex.xml
b/tests/qemuxml2xmloutdata/autoindex.xml
index 3e1c2889cb..8f622d56b2 100644
--- a/tests/qemuxml2xmloutdata/autoindex.xml
+++ b/tests/qemuxml2xmloutdata/autoindex.xml
@@ -32,8 +32,8 @@
     </controller>
     <controller type='pci' index='3'
model='pcie-root-port'>
       <model name='ioh3420'/>
-      <target chassis='3' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+      <target chassis='3' port='0x8'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0'/>
     </controller>
     <controller type='pci' index='4'
model='pcie-switch-upstream-port'>
       <model name='x3130-upstream'/>
diff --git a/tests/qemuxml2xmloutdata/balloon-device-auto.xml
b/tests/qemuxml2xmloutdata/balloon-device-auto.xml
index 094ecb38db..4c58641aca 100644
--- a/tests/qemuxml2xmloutdata/balloon-device-auto.xml
+++ b/tests/qemuxml2xmloutdata/balloon-device-auto.xml
@@ -31,7 +31,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml
b/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml
index e5ee451722..0a2f718faa 100644
--- a/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml
+++ b/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml
@@ -46,7 +46,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/bios-nvram.xml
b/tests/qemuxml2xmloutdata/bios-nvram.xml
index 294e65cd13..17f15fd00b 100644
--- a/tests/qemuxml2xmloutdata/bios-nvram.xml
+++ b/tests/qemuxml2xmloutdata/bios-nvram.xml
@@ -38,7 +38,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/blkiotune-device.xml
b/tests/qemuxml2xmloutdata/blkiotune-device.xml
index 46b534d2c7..6ac1464c65 100644
--- a/tests/qemuxml2xmloutdata/blkiotune-device.xml
+++ b/tests/qemuxml2xmloutdata/blkiotune-device.xml
@@ -50,7 +50,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/blkiotune.xml
b/tests/qemuxml2xmloutdata/blkiotune.xml
index 2f4d3f29d3..6eb9df13f3 100644
--- a/tests/qemuxml2xmloutdata/blkiotune.xml
+++ b/tests/qemuxml2xmloutdata/blkiotune.xml
@@ -34,7 +34,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
index 631df4bbb4..82285b3017 100644
--- a/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
@@ -33,7 +33,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable.xml
b/tests/qemuxml2xmloutdata/boot-menu-disable.xml
index 631df4bbb4..82285b3017 100644
--- a/tests/qemuxml2xmloutdata/boot-menu-disable.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-disable.xml
@@ -33,7 +33,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
index b6775d3a47..994331ce0f 100644
--- a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
@@ -33,7 +33,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/boot-multi.xml
b/tests/qemuxml2xmloutdata/boot-multi.xml
index ebcbcb7e62..abb098be58 100644
--- a/tests/qemuxml2xmloutdata/boot-multi.xml
+++ b/tests/qemuxml2xmloutdata/boot-multi.xml
@@ -36,7 +36,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/boot-order.xml
b/tests/qemuxml2xmloutdata/boot-order.xml
index bdd7e1b16f..0d884152dd 100644
--- a/tests/qemuxml2xmloutdata/boot-order.xml
+++ b/tests/qemuxml2xmloutdata/boot-order.xml
@@ -34,7 +34,7 @@
       </source>
       <target dev='vda' bus='virtio'/>
       <boot order='3'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </disk>
     <disk type='file' device='floppy'>
       <driver name='qemu' type='raw'/>
@@ -55,13 +55,13 @@
       <mac address='00:11:22:33:44:55'/>
       <model type='virtio'/>
       <boot order='2'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/channel-guestfwd.xml
b/tests/qemuxml2xmloutdata/channel-guestfwd.xml
index baf99c58cc..acaab47946 100644
--- a/tests/qemuxml2xmloutdata/channel-guestfwd.xml
+++ b/tests/qemuxml2xmloutdata/channel-guestfwd.xml
@@ -35,7 +35,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml
b/tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml
index 2917ed292a..6ee9de6512 100644
--- a/tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml
+++ b/tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml
@@ -19,7 +19,7 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </controller>
     <channel type='unix'>
       <source mode='bind'
path='/tmp/channel/QEMUGuest1.org.qemu.guest_agent.0'/>
diff --git a/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.xml
b/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.xml
index c5d219183e..a36a94f9f0 100644
--- a/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.xml
+++ b/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.xml
@@ -19,7 +19,7 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </controller>
     <channel type='unix'>
       <target type='virtio' name='org.qemu.guest_agent.0'/>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
b/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
index 94b0eaf34e..ec82bacea5 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
@@ -27,14 +27,14 @@
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
     </controller>
     <controller type='virtio-serial' index='0' ports='16'
vectors='4'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </controller>
     <controller type='virtio-serial' index='1'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <controller type='virtio-serial' index='2'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </controller>
     <channel type='pty'>
       <target type='virtio' name='org.linux-kvm.port.0'/>
@@ -64,7 +64,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
b/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
index 351a99b4c8..ef87c7727c 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
@@ -46,7 +46,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
index 18b799f066..598241d01b 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
@@ -46,7 +46,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio.xml
b/tests/qemuxml2xmloutdata/channel-virtio.xml
index 22e5f01db6..a90679eafe 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio.xml
@@ -38,7 +38,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/chardev-label.xml
b/tests/qemuxml2xmloutdata/chardev-label.xml
index e90f7c2b25..4dc09cfb38 100644
--- a/tests/qemuxml2xmloutdata/chardev-label.xml
+++ b/tests/qemuxml2xmloutdata/chardev-label.xml
@@ -47,13 +47,13 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
     <rng model='virtio'>
       <backend model='egd' type='pipe'>
         <source path='/dev/null'/>
       </backend>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </rng>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/clock-catchup.xml
b/tests/qemuxml2xmloutdata/clock-catchup.xml
index 2b7633db12..196e41b4a7 100644
--- a/tests/qemuxml2xmloutdata/clock-catchup.xml
+++ b/tests/qemuxml2xmloutdata/clock-catchup.xml
@@ -41,7 +41,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
b/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
index fc2a5efdcb..0f106073a9 100644
--- a/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
+++ b/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
@@ -27,7 +27,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/console-compat-auto.xml
b/tests/qemuxml2xmloutdata/console-compat-auto.xml
index eebef5aa15..37336a15c7 100644
--- a/tests/qemuxml2xmloutdata/console-compat-auto.xml
+++ b/tests/qemuxml2xmloutdata/console-compat-auto.xml
@@ -39,7 +39,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/console-compat2.xml
b/tests/qemuxml2xmloutdata/console-compat2.xml
index b8f710abf6..e943ef6e28 100644
--- a/tests/qemuxml2xmloutdata/console-compat2.xml
+++ b/tests/qemuxml2xmloutdata/console-compat2.xml
@@ -28,7 +28,7 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </controller>
     <serial type='pty'>
       <target type='isa-serial' port='0'>
diff --git a/tests/qemuxml2xmloutdata/console-virtio-many.xml
b/tests/qemuxml2xmloutdata/console-virtio-many.xml
index a2d72269b2..5d3e551aa7 100644
--- a/tests/qemuxml2xmloutdata/console-virtio-many.xml
+++ b/tests/qemuxml2xmloutdata/console-virtio-many.xml
@@ -27,7 +27,7 @@
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
     </controller>
     <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <serial type='pty'>
@@ -51,7 +51,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/console-virtio.xml
b/tests/qemuxml2xmloutdata/console-virtio.xml
index d540b81a4e..491f00687a 100644
--- a/tests/qemuxml2xmloutdata/console-virtio.xml
+++ b/tests/qemuxml2xmloutdata/console-virtio.xml
@@ -28,7 +28,7 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </controller>
     <console type='pty'>
       <target type='virtio' port='0'/>
@@ -37,7 +37,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/controller-usb-order.xml
b/tests/qemuxml2xmloutdata/controller-usb-order.xml
index cb4d8a1e6e..3a7e7a323a 100644
--- a/tests/qemuxml2xmloutdata/controller-usb-order.xml
+++ b/tests/qemuxml2xmloutdata/controller-usb-order.xml
@@ -33,7 +33,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
index 207bc87cf5..f25ec8ee54 100644
--- a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
+++ b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
@@ -48,30 +48,30 @@
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
     </controller>
     <controller type='scsi' index='0' model='virtio-scsi'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </controller>
     <controller type='scsi' index='1' model='virtio-scsi'>
       <driver queues='8'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </controller>
     <controller type='scsi' index='2' model='virtio-scsi'>
       <driver cmd_per_lun='50'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </controller>
     <controller type='scsi' index='3' model='virtio-scsi'>
       <driver max_sectors='512'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </controller>
     <controller type='scsi' index='4' model='virtio-scsi'>
       <driver ioeventfd='on'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-none.xml
b/tests/qemuxml2xmloutdata/cpu-check-default-none.xml
index 473fb7e6f1..d2ec332183 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-default-none.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-default-none.xml
@@ -23,7 +23,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-none2.xml
b/tests/qemuxml2xmloutdata/cpu-check-default-none2.xml
index e87bf64416..a7b5932314 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-default-none2.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-default-none2.xml
@@ -25,7 +25,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-partial.xml
b/tests/qemuxml2xmloutdata/cpu-check-default-partial.xml
index 2856fd4f43..ab1a42929d 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-default-partial.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-default-partial.xml
@@ -23,7 +23,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml
b/tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml
index 1423620aa8..98f2fc8fd0 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml
@@ -25,7 +25,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-full.xml
b/tests/qemuxml2xmloutdata/cpu-check-full.xml
index a978f70135..11fa1349a2 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-full.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-full.xml
@@ -25,7 +25,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-none.xml
b/tests/qemuxml2xmloutdata/cpu-check-none.xml
index c4ea77cdf9..4bf679692c 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-none.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-none.xml
@@ -25,7 +25,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-partial.xml
b/tests/qemuxml2xmloutdata/cpu-check-partial.xml
index 1423620aa8..98f2fc8fd0 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-partial.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-partial.xml
@@ -25,7 +25,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-empty.xml
b/tests/qemuxml2xmloutdata/cpu-empty.xml
index 394588b8f5..ee700da00d 100644
--- a/tests/qemuxml2xmloutdata/cpu-empty.xml
+++ b/tests/qemuxml2xmloutdata/cpu-empty.xml
@@ -22,7 +22,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
index 176c7c3cbf..7ae2c7034b 100644
--- a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
+++ b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
@@ -30,7 +30,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
index 84cd2106eb..bee4fd0240 100644
--- a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
+++ b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
@@ -30,7 +30,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml
b/tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml
index 40148c3686..8de03f032c 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml
@@ -25,7 +25,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
b/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
index be51410d53..3a61d47abd 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
@@ -35,7 +35,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
b/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
index 670c171ebc..482edbeb3d 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
@@ -25,7 +25,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
b/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
index cc217f41a1..99f52bed9a 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
@@ -41,7 +41,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
b/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
index 090fff2d10..dcc3ccf8d3 100644
--- a/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
+++ b/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
@@ -27,7 +27,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
index 8219c16939..58707b0d11 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
@@ -29,7 +29,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
b/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
index dd15201aad..3d57037bf1 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
@@ -30,7 +30,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
b/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
index 0c53679827..1883a8368d 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
@@ -29,7 +29,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
index 99269812d9..02c12542c0 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
@@ -29,7 +29,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa1.xml
b/tests/qemuxml2xmloutdata/cpu-numa1.xml
index 99269812d9..02c12542c0 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa1.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa1.xml
@@ -29,7 +29,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa2.xml
b/tests/qemuxml2xmloutdata/cpu-numa2.xml
index 99269812d9..02c12542c0 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa2.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa2.xml
@@ -29,7 +29,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cputune-iothreads.xml
b/tests/qemuxml2xmloutdata/cputune-iothreads.xml
index cc7b7a112f..36c4b0920f 100644
--- a/tests/qemuxml2xmloutdata/cputune-iothreads.xml
+++ b/tests/qemuxml2xmloutdata/cputune-iothreads.xml
@@ -42,7 +42,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
b/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
index e4491a9eee..b6a79108e3 100644
--- a/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
+++ b/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
@@ -45,7 +45,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
b/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
index da5f10ff64..ca94bc8a38 100644
--- a/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
+++ b/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
@@ -45,7 +45,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cputune-zero-shares.xml
b/tests/qemuxml2xmloutdata/cputune-zero-shares.xml
index ce53f17cc9..557f142445 100644
--- a/tests/qemuxml2xmloutdata/cputune-zero-shares.xml
+++ b/tests/qemuxml2xmloutdata/cputune-zero-shares.xml
@@ -39,7 +39,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/cputune.xml b/tests/qemuxml2xmloutdata/cputune.xml
index 2f4ef68679..0c1ac3d50e 100644
--- a/tests/qemuxml2xmloutdata/cputune.xml
+++ b/tests/qemuxml2xmloutdata/cputune.xml
@@ -43,7 +43,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/default-kvm-host-arch.xml
b/tests/qemuxml2xmloutdata/default-kvm-host-arch.xml
index 756d3967cd..c9f09b2231 100644
--- a/tests/qemuxml2xmloutdata/default-kvm-host-arch.xml
+++ b/tests/qemuxml2xmloutdata/default-kvm-host-arch.xml
@@ -22,7 +22,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/default-qemu-host-arch.xml
b/tests/qemuxml2xmloutdata/default-qemu-host-arch.xml
index f392bc40ae..9e3cbab7f8 100644
--- a/tests/qemuxml2xmloutdata/default-qemu-host-arch.xml
+++ b/tests/qemuxml2xmloutdata/default-qemu-host-arch.xml
@@ -22,7 +22,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-active-commit-active.xml
b/tests/qemuxml2xmloutdata/disk-active-commit-active.xml
index 010ab9fce0..c3068c8c93 100644
--- a/tests/qemuxml2xmloutdata/disk-active-commit-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-active-commit-active.xml
@@ -40,7 +40,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
b/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
index 5479e8edfc..e4fcb0c6ce 100644
--- a/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
@@ -36,7 +36,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-aio.xml
b/tests/qemuxml2xmloutdata/disk-aio.xml
index 8d6f8b5263..a7fa648c2a 100644
--- a/tests/qemuxml2xmloutdata/disk-aio.xml
+++ b/tests/qemuxml2xmloutdata/disk-aio.xml
@@ -38,7 +38,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml
b/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml
index ba23787ad0..5901aef3d3 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml
@@ -24,7 +24,7 @@
         <source file='/tmp/missing-backing-store.qcow'/>
       </backingStore>
       <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
@@ -61,7 +61,7 @@
         </backingStore>
       </backingStore>
       <target dev='vdb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -70,7 +70,7 @@
       </source>
       <backingStore/>
       <target dev='vdc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
@@ -88,13 +88,13 @@
         <backingStore/>
       </backingStore>
       <target dev='vdd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </disk>
     <disk type='block' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source dev='/dev/HostVG/QEMUGuest11'/>
       <target dev='vde' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
     </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -104,7 +104,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml
b/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml
index e4a8209bf3..1d9adc85ba 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml
@@ -24,7 +24,7 @@
         <source file='/tmp/missing-backing-store.qcow'/>
       </backingStore>
       <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
@@ -61,7 +61,7 @@
         </backingStore>
       </backingStore>
       <target dev='vdb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -70,7 +70,7 @@
       </source>
       <backingStore/>
       <target dev='vdc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
@@ -88,13 +88,13 @@
         <backingStore/>
       </backingStore>
       <target dev='vdd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </disk>
     <disk type='block' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source dev='/dev/HostVG/QEMUGuest11'/>
       <target dev='vde' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
     </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -104,7 +104,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml
b/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml
index e5d0d73999..c25bb7bb1a 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml
@@ -24,7 +24,7 @@
         <source file='/tmp/missing-backing-store.qcow'/>
       </backingStore>
       <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
@@ -57,7 +57,7 @@
         </backingStore>
       </backingStore>
       <target dev='vdb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -66,7 +66,7 @@
       </source>
       <backingStore/>
       <target dev='vdc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
@@ -84,13 +84,13 @@
         <backingStore/>
       </backingStore>
       <target dev='vdd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </disk>
     <disk type='block' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source dev='/dev/HostVG/QEMUGuest11' index='13'/>
       <target dev='vde' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
@@ -141,7 +141,7 @@
         </backingStore>
       </backingStore>
       <target dev='vdf' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
     </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -151,7 +151,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml
b/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml
index cc02b15991..4e2da45733 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml
@@ -24,7 +24,7 @@
         <source file='/tmp/missing-backing-store.qcow'/>
       </backingStore>
       <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
@@ -57,7 +57,7 @@
         </backingStore>
       </backingStore>
       <target dev='vdb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -66,7 +66,7 @@
       </source>
       <backingStore/>
       <target dev='vdc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
@@ -84,13 +84,13 @@
         <backingStore/>
       </backingStore>
       <target dev='vdd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </disk>
     <disk type='block' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source dev='/dev/HostVG/QEMUGuest11'/>
       <target dev='vde' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
@@ -141,7 +141,7 @@
         </backingStore>
       </backingStore>
       <target dev='vdf' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
     </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -151,7 +151,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml
b/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml
index cc02b15991..4e2da45733 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml
@@ -24,7 +24,7 @@
         <source file='/tmp/missing-backing-store.qcow'/>
       </backingStore>
       <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
@@ -57,7 +57,7 @@
         </backingStore>
       </backingStore>
       <target dev='vdb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -66,7 +66,7 @@
       </source>
       <backingStore/>
       <target dev='vdc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
@@ -84,13 +84,13 @@
         <backingStore/>
       </backingStore>
       <target dev='vdd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </disk>
     <disk type='block' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source dev='/dev/HostVG/QEMUGuest11'/>
       <target dev='vde' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
@@ -141,7 +141,7 @@
         </backingStore>
       </backingStore>
       <target dev='vdf' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
     </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -151,7 +151,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-copy_on_read.xml
b/tests/qemuxml2xmloutdata/disk-copy_on_read.xml
index 074d41b72e..b2581450e9 100644
--- a/tests/qemuxml2xmloutdata/disk-copy_on_read.xml
+++ b/tests/qemuxml2xmloutdata/disk-copy_on_read.xml
@@ -43,13 +43,13 @@
       <mac address='52:54:00:e5:48:58'/>
       <model type='virtio'/>
       <driver name='vhost' txmode='iothread'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-active.xml
b/tests/qemuxml2xmloutdata/disk-mirror-active.xml
index dca166d7f1..5a02198f97 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-active.xml
@@ -43,7 +43,7 @@
         <backingStore/>
       </mirror>
       <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -59,7 +59,7 @@
         </backingStore>
       </mirror>
       <target dev='vdb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -75,7 +75,7 @@
         <backingStore/>
       </mirror>
       <target dev='vdc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -88,7 +88,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
b/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
index ba47bbad1a..5d2caa5fca 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
@@ -34,21 +34,21 @@
       <source file='/tmp/data.img'/>
       <backingStore/>
       <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/tmp/logs.img'/>
       <backingStore/>
       <target dev='vdb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/tmp/data2.img'/>
       <backingStore/>
       <target dev='vdc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -61,7 +61,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
b/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
index 7e54cae592..34ac337537 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
@@ -42,14 +42,14 @@
         <source file='/tmp/copy.img'/>
       </mirror>
       <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/tmp/logs.img'/>
       <backingStore/>
       <target dev='vdb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -62,7 +62,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
index 5aec616002..c957f8b45c 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
@@ -34,14 +34,14 @@
       <source file='/tmp/data.img'/>
       <backingStore/>
       <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/tmp/logs.img'/>
       <backingStore/>
       <target dev='vdb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -54,7 +54,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-network-gluster.xml
b/tests/qemuxml2xmloutdata/disk-network-gluster.xml
index c4763fa78f..7d8b531b96 100644
--- a/tests/qemuxml2xmloutdata/disk-network-gluster.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-gluster.xml
@@ -20,7 +20,7 @@
         <host name='example.org' port='6000'/>
       </source>
       <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -28,7 +28,7 @@
         <host transport='unix' socket='/path/to/sock'/>
       </source>
       <target dev='vdb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
@@ -38,7 +38,7 @@
         <host transport='unix' socket='/path/to/sock'/>
       </source>
       <target dev='vdc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml
b/tests/qemuxml2xmloutdata/disk-network-iscsi.xml
index cbf26754cd..a2fdaac5b0 100644
--- a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-iscsi.xml
@@ -20,7 +20,7 @@
         <host name='example.org' port='6000'/>
       </source>
       <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -28,7 +28,7 @@
         <host name='example.org' port='6000'/>
       </source>
       <target dev='vdb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -39,7 +39,7 @@
         <host name='example.org' port='6000'/>
       </source>
       <target dev='vdc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -50,7 +50,7 @@
         <host name='example.org' port='6000'/>
       </source>
       <target dev='vdd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
     </disk>
     <disk type='network' device='lun'>
       <driver name='qemu' type='raw'/>
@@ -65,7 +65,7 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <controller type='scsi' index='0' model='virtio-scsi'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/disk-network-nbd.xml
b/tests/qemuxml2xmloutdata/disk-network-nbd.xml
index db088e0f85..50e9f0b5bb 100644
--- a/tests/qemuxml2xmloutdata/disk-network-nbd.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-nbd.xml
@@ -20,7 +20,7 @@
         <host name='example.org' port='6000'/>
       </source>
       <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -28,7 +28,7 @@
         <host name='example.org' port='6000'/>
       </source>
       <target dev='vdb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -36,7 +36,7 @@
         <host name='::1' port='6000'/>
       </source>
       <target dev='vdc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -44,7 +44,7 @@
         <host name='::1' port='6000'/>
       </source>
       <target dev='vdd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -52,7 +52,7 @@
         <host transport='unix' socket='/var/run/nbdsock'/>
       </source>
       <target dev='vde' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
     </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd.xml
b/tests/qemuxml2xmloutdata/disk-network-rbd.xml
index 01b1d66ece..1ded5fac79 100644
--- a/tests/qemuxml2xmloutdata/disk-network-rbd.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-rbd.xml
@@ -22,7 +22,7 @@
         <host name='mon3.example.org' port='6322'/>
       </source>
       <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -30,7 +30,7 @@
         <snapshot name='asdf'/>
       </source>
       <target dev='vdb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -41,7 +41,7 @@
         <snapshot name='foo'/>
       </source>
       <target dev='vdc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -50,7 +50,7 @@
         <config file='/blah/test.conf'/>
       </source>
       <target dev='vdd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -63,7 +63,7 @@
         <host name='mon3.example.org' port='6322'/>
       </source>
       <target dev='vde' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -74,7 +74,7 @@
         <host name='2001:db8::ff00:42:8329' port='6322'/>
       </source>
       <target dev='vdf' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
     </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml
b/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml
index c1862e5a54..1beaa36bc2 100644
--- a/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml
@@ -26,7 +26,7 @@
         <host name='example.org' port='6000'/>
       </source>
       <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/disk-network-source-auth.xml
b/tests/qemuxml2xmloutdata/disk-network-source-auth.xml
index 59258733bd..3e829497c2 100644
--- a/tests/qemuxml2xmloutdata/disk-network-source-auth.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-source-auth.xml
@@ -23,7 +23,7 @@
         </auth>
       </source>
       <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -36,7 +36,7 @@
         </auth>
       </source>
       <target dev='vdb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -49,7 +49,7 @@
         </auth>
       </source>
       <target dev='vdc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
b/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
index 41bfcbaaf4..24763b5326 100644
--- a/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
@@ -34,13 +34,13 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <controller type='scsi' index='0' model='lsilogic'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
b/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
index 80fbf927af..2f686d058c 100644
--- a/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
@@ -36,17 +36,17 @@
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
     </controller>
     <controller type='scsi' index='0' model='virtio-scsi'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </controller>
     <controller type='scsi' index='1' model='lsilogic'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml
b/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml
index eb0c192d80..2b62595805 100644
--- a/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml
@@ -27,10 +27,10 @@
       <address type='drive' controller='0' bus='0'
target='1' unit='1'/>
     </disk>
     <controller type='scsi' index='0' model='virtio-scsi'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </controller>
     <controller type='scsi' index='1' model='lsilogic'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </controller>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -40,7 +40,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-serial.xml
b/tests/qemuxml2xmloutdata/disk-serial.xml
index b4092eae24..59fba995cd 100644
--- a/tests/qemuxml2xmloutdata/disk-serial.xml
+++ b/tests/qemuxml2xmloutdata/disk-serial.xml
@@ -44,7 +44,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
b/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
index 046665f713..1183171e54 100644
--- a/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
+++ b/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
@@ -67,7 +67,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-source-pool.xml
b/tests/qemuxml2xmloutdata/disk-source-pool.xml
index 3f5aa73e55..ed00ceb16c 100644
--- a/tests/qemuxml2xmloutdata/disk-source-pool.xml
+++ b/tests/qemuxml2xmloutdata/disk-source-pool.xml
@@ -42,14 +42,14 @@
       <source pool='pool-disk' volume='dir+vol1'/>
       <target dev='vda' bus='virtio'/>
       <readonly/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </disk>
     <disk type='volume' device='disk'>
       <driver name='qemu'/>
       <source pool='pool-disk' volume='dir+vol2'/>
       <target dev='vdb' bus='virtio'/>
       <readonly/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/disk-usb-device.xml
b/tests/qemuxml2xmloutdata/disk-usb-device.xml
index ee19c37d9b..6c6af0457b 100644
--- a/tests/qemuxml2xmloutdata/disk-usb-device.xml
+++ b/tests/qemuxml2xmloutdata/disk-usb-device.xml
@@ -36,7 +36,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-virtio.xml
b/tests/qemuxml2xmloutdata/disk-virtio.xml
index d7abf57e4a..ff72fb5375 100644
--- a/tests/qemuxml2xmloutdata/disk-virtio.xml
+++ b/tests/qemuxml2xmloutdata/disk-virtio.xml
@@ -31,13 +31,13 @@
       <driver name='qemu' type='raw'/>
       <source file='/tmp/data.img'/>
       <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/tmp/logs.img'/>
       <target dev='vdb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/encrypted-disk.xml
b/tests/qemuxml2xmloutdata/encrypted-disk.xml
index 59cae921fc..06f2c5b47c 100644
--- a/tests/qemuxml2xmloutdata/encrypted-disk.xml
+++ b/tests/qemuxml2xmloutdata/encrypted-disk.xml
@@ -31,7 +31,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/eoi-disabled.xml
b/tests/qemuxml2xmloutdata/eoi-disabled.xml
index eedab82972..12db838a06 100644
--- a/tests/qemuxml2xmloutdata/eoi-disabled.xml
+++ b/tests/qemuxml2xmloutdata/eoi-disabled.xml
@@ -27,7 +27,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/eoi-enabled.xml
b/tests/qemuxml2xmloutdata/eoi-enabled.xml
index 3c42a3c1c0..45c1a951bf 100644
--- a/tests/qemuxml2xmloutdata/eoi-enabled.xml
+++ b/tests/qemuxml2xmloutdata/eoi-enabled.xml
@@ -27,7 +27,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/event_idx.xml
b/tests/qemuxml2xmloutdata/event_idx.xml
index a8990cd639..32a5e9ca7e 100644
--- a/tests/qemuxml2xmloutdata/event_idx.xml
+++ b/tests/qemuxml2xmloutdata/event_idx.xml
@@ -43,13 +43,13 @@
       <mac address='52:54:00:e5:48:58'/>
       <model type='virtio'/>
       <driver name='vhost' event_idx='off'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/floppy-drive-fat.xml
b/tests/qemuxml2xmloutdata/floppy-drive-fat.xml
index ff489ade6d..f82570b81a 100644
--- a/tests/qemuxml2xmloutdata/floppy-drive-fat.xml
+++ b/tests/qemuxml2xmloutdata/floppy-drive-fat.xml
@@ -33,7 +33,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
b/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
index 42286eeebf..a3a9a0f348 100644
--- a/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
@@ -28,7 +28,7 @@
       <source>
         <address uuid='53764d0e-85a0-42b4-af5c-2046b460b1dc'/>
       </source>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </hostdev>
     <memballoon model='none'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.xml
b/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.xml
index 136481411e..0725857827 100644
--- a/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.xml
@@ -29,7 +29,7 @@
       <source>
         <address domain='0x0005' bus='0x90' slot='0x01'
function='0x0'/>
       </source>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <driver name='vfio'/>
@@ -43,17 +43,17 @@
       <source>
         <address domain='0x0005' bus='0x90' slot='0x01'
function='0x2'/>
       </source>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <driver name='vfio'/>
       <source>
         <address domain='0x0005' bus='0x90' slot='0x01'
function='0x3'/>
       </source>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </hostdev>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-address.xml
b/tests/qemuxml2xmloutdata/hostdev-pci-address.xml
index 6539069e09..9ba3dfac45 100644
--- a/tests/qemuxml2xmloutdata/hostdev-pci-address.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-pci-address.xml
@@ -34,7 +34,7 @@
       <source>
         <address domain='0x0000' bus='0x06' slot='0x12'
function='0x5'/>
       </source>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </hostdev>
     <memballoon model='none'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.xml
b/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.xml
index 1e5a2ca532..489569b289 100644
--- a/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.xml
@@ -29,52 +29,52 @@
       <source>
         <address domain='0x0005' bus='0x90' slot='0x01'
function='0x0'/>
       </source>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00'
function='0x1'/>
       </source>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <driver name='vfio'/>
       <source>
         <address domain='0x0001' bus='0x01' slot='0x00'
function='0x0'/>
       </source>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <driver name='vfio'/>
       <source>
         <address domain='0x0005' bus='0x90' slot='0x01'
function='0x2'/>
       </source>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <driver name='vfio'/>
       <source>
         <address domain='0x0005' bus='0x90' slot='0x01'
function='0x3'/>
       </source>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x06' slot='0x12'
function='0x1'/>
       </source>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <driver name='vfio'/>
       <source>
         <address domain='0x0000' bus='0x06' slot='0x12'
function='0x2'/>
       </source>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
     </hostdev>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
index 474cc88d32..4948b5e8cb 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
@@ -21,7 +21,7 @@
       <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
     </disk>
     <controller type='scsi' index='0' model='virtio-scsi'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </controller>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -31,7 +31,7 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <controller type='scsi' index='1' model='virtio-scsi'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
@@ -114,7 +114,7 @@
       <address type='drive' controller='1' bus='0'
target='0' unit='2'/>
     </hostdev>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
index 575f9e778a..55d31c80ee 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
@@ -21,7 +21,7 @@
       <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
     </disk>
     <controller type='scsi' index='0' model='virtio-scsi'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </controller>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -41,7 +41,7 @@
       <address type='drive' controller='0' bus='0'
target='4' unit='8'/>
     </hostdev>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
index 640f7ac9c7..ad6cbb07e1 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
@@ -21,7 +21,7 @@
       <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
     </disk>
     <controller type='scsi' index='0' model='lsilogic'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </controller>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -79,7 +79,7 @@
       <address type='drive' controller='0' bus='0'
target='0' unit='2'/>
     </hostdev>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
index d62652a27e..b9f3fc1446 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
@@ -21,7 +21,7 @@
       <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
     </disk>
     <controller type='scsi' index='0' model='virtio-scsi'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </controller>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -41,7 +41,7 @@
       <address type='drive' controller='0' bus='0'
target='4' unit='8'/>
     </hostdev>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
index 32790c8f3b..748d5ac543 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
@@ -21,7 +21,7 @@
       <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
     </disk>
     <controller type='scsi' index='0' model='virtio-scsi'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </controller>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -41,7 +41,7 @@
       <address type='drive' controller='0' bus='0'
target='4' unit='8'/>
     </hostdev>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
index c1bf0bbc98..0e8e8930f9 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
@@ -21,7 +21,7 @@
       <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
     </disk>
     <controller type='scsi' index='0' model='virtio-scsi'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </controller>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -42,7 +42,7 @@
       <address type='drive' controller='0' bus='0'
target='4' unit='8'/>
     </hostdev>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
index 23ec57651e..dbbe51946e 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
@@ -35,7 +35,7 @@
     <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='scsi_host'
managed='no'>
       <source protocol='vhost' wwpn='naa.5123456789abcde0'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </hostdev>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml
index 98c96605fb..f66562e216 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml
@@ -21,13 +21,13 @@
     <controller type='pci' index='0' model='pcie-root'/>
     <controller type='pci' index='1'
model='pcie-root-port'>
       <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0' multifunction='on'/>
+      <target chassis='1' port='0x8'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0' multifunction='on'/>
     </controller>
     <controller type='pci' index='2'
model='pcie-root-port'>
       <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x1'/>
+      <target chassis='2' port='0x9'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
index 95cc6a4b79..97cb504116 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
@@ -21,7 +21,7 @@
       <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
     </disk>
     <controller type='scsi' index='0' model='virtio-scsi'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </controller>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -91,7 +91,7 @@
       <address type='drive' controller='0' bus='0'
target='3' unit='5'/>
     </hostdev>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio.xml
b/tests/qemuxml2xmloutdata/hostdev-vfio.xml
index d04ad74215..7d0433eb12 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio.xml
@@ -35,10 +35,10 @@
       <source>
         <address domain='0x0000' bus='0x06' slot='0x12'
function='0x1'/>
       </source>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </hostdev>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/hugepages-default.xml
b/tests/qemuxml2xmloutdata/hugepages-default.xml
index 18e6d13a84..e14eb577a8 100644
--- a/tests/qemuxml2xmloutdata/hugepages-default.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-default.xml
@@ -28,7 +28,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/hugepages-shared.xml
b/tests/qemuxml2xmloutdata/hugepages-shared.xml
index 01ea3f0545..4dcabe06f8 100644
--- a/tests/qemuxml2xmloutdata/hugepages-shared.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-shared.xml
@@ -49,7 +49,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/hyperv-off.xml
b/tests/qemuxml2xmloutdata/hyperv-off.xml
index 46eea5fe2f..20c7f653af 100644
--- a/tests/qemuxml2xmloutdata/hyperv-off.xml
+++ b/tests/qemuxml2xmloutdata/hyperv-off.xml
@@ -41,7 +41,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/interface-driver.xml
b/tests/qemuxml2xmloutdata/interface-driver.xml
index eb5d672ea4..435489e009 100644
--- a/tests/qemuxml2xmloutdata/interface-driver.xml
+++ b/tests/qemuxml2xmloutdata/interface-driver.xml
@@ -44,7 +44,7 @@
       <model type='virtio'/>
       <driver ioeventfd='on' event_idx='on' queues='5'/>
       <link state='up'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <serial type='pty'>
       <target type='isa-serial' port='0'>
@@ -58,7 +58,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/iothreads-disk.xml
b/tests/qemuxml2xmloutdata/iothreads-disk.xml
index 0aee306cf2..38074b4c62 100644
--- a/tests/qemuxml2xmloutdata/iothreads-disk.xml
+++ b/tests/qemuxml2xmloutdata/iothreads-disk.xml
@@ -31,7 +31,7 @@
       <driver name='qemu' type='raw' iothread='2'/>
       <source file='/var/lib/libvirt/images/iothrtest2.img'/>
       <target dev='vdc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/kvm-features-off.xml
b/tests/qemuxml2xmloutdata/kvm-features-off.xml
index 42afbab369..f2e9407ac9 100644
--- a/tests/qemuxml2xmloutdata/kvm-features-off.xml
+++ b/tests/qemuxml2xmloutdata/kvm-features-off.xml
@@ -30,7 +30,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/lease.xml b/tests/qemuxml2xmloutdata/lease.xml
index 8d6c65e7ac..a8d358d08f 100644
--- a/tests/qemuxml2xmloutdata/lease.xml
+++ b/tests/qemuxml2xmloutdata/lease.xml
@@ -43,7 +43,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/luks-disks-source.xml
b/tests/qemuxml2xmloutdata/luks-disks-source.xml
index fbf01cb52a..5333d4ac6e 100644
--- a/tests/qemuxml2xmloutdata/luks-disks-source.xml
+++ b/tests/qemuxml2xmloutdata/luks-disks-source.xml
@@ -46,7 +46,7 @@
         </encryption>
       </source>
       <target dev='vdc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </disk>
     <disk type='volume' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -56,7 +56,7 @@
         </encryption>
       </source>
       <target dev='vdd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
@@ -69,7 +69,7 @@
         </encryption>
       </source>
       <target dev='vde' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
     </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
index 41399ff0d0..f886ee2228 100644
--- a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
@@ -42,7 +42,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
     <memory model='dimm'>
       <target>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug.xml
b/tests/qemuxml2xmloutdata/memory-hotplug.xml
index 660e45205c..9545378508 100644
--- a/tests/qemuxml2xmloutdata/memory-hotplug.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug.xml
@@ -38,7 +38,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/memorybacking-set.xml
b/tests/qemuxml2xmloutdata/memorybacking-set.xml
index 1924f75779..7c9ddf31dc 100644
--- a/tests/qemuxml2xmloutdata/memorybacking-set.xml
+++ b/tests/qemuxml2xmloutdata/memorybacking-set.xml
@@ -27,7 +27,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/memorybacking-unset.xml
b/tests/qemuxml2xmloutdata/memorybacking-unset.xml
index 19dfa64f64..2f7e8ac1ce 100644
--- a/tests/qemuxml2xmloutdata/memorybacking-unset.xml
+++ b/tests/qemuxml2xmloutdata/memorybacking-unset.xml
@@ -27,7 +27,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/memtune-unlimited.xml
b/tests/qemuxml2xmloutdata/memtune-unlimited.xml
index e65d09eb6c..20eff94533 100644
--- a/tests/qemuxml2xmloutdata/memtune-unlimited.xml
+++ b/tests/qemuxml2xmloutdata/memtune-unlimited.xml
@@ -31,7 +31,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/memtune.xml b/tests/qemuxml2xmloutdata/memtune.xml
index afe9468d8e..53dae40355 100644
--- a/tests/qemuxml2xmloutdata/memtune.xml
+++ b/tests/qemuxml2xmloutdata/memtune.xml
@@ -36,7 +36,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/metadata-duplicate.xml
b/tests/qemuxml2xmloutdata/metadata-duplicate.xml
index bbd77393e7..12c246f355 100644
--- a/tests/qemuxml2xmloutdata/metadata-duplicate.xml
+++ b/tests/qemuxml2xmloutdata/metadata-duplicate.xml
@@ -35,7 +35,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/metadata.xml
b/tests/qemuxml2xmloutdata/metadata.xml
index bbd77393e7..12c246f355 100644
--- a/tests/qemuxml2xmloutdata/metadata.xml
+++ b/tests/qemuxml2xmloutdata/metadata.xml
@@ -35,7 +35,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/minimal.xml b/tests/qemuxml2xmloutdata/minimal.xml
index 86a0656c10..447bfbae2d 100644
--- a/tests/qemuxml2xmloutdata/minimal.xml
+++ b/tests/qemuxml2xmloutdata/minimal.xml
@@ -36,7 +36,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-coalesce.xml
b/tests/qemuxml2xmloutdata/net-coalesce.xml
index 55d08cad1d..9a53b1941a 100644
--- a/tests/qemuxml2xmloutdata/net-coalesce.xml
+++ b/tests/qemuxml2xmloutdata/net-coalesce.xml
@@ -48,19 +48,19 @@
           <frames max='7'/>
         </rx>
       </coalesce>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <interface type='network'>
       <mac address='52:54:00:e5:48:59'/>
       <source network='default'/>
       <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </interface>
     <interface type='network'>
       <mac address='52:54:00:e5:48:60'/>
       <source network='default'/>
       <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </interface>
     <serial type='pty'>
       <target type='isa-serial' port='0'>
@@ -74,7 +74,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-eth-hostip.xml
b/tests/qemuxml2xmloutdata/net-eth-hostip.xml
index a144b5fc91..f860850ab0 100644
--- a/tests/qemuxml2xmloutdata/net-eth-hostip.xml
+++ b/tests/qemuxml2xmloutdata/net-eth-hostip.xml
@@ -35,7 +35,7 @@
       </source>
       <script path='/etc/qemu-ifup'/>
       <model type='rtl8139'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/net-eth-ifname.xml
b/tests/qemuxml2xmloutdata/net-eth-ifname.xml
index 51b1679012..d15eb3d27a 100644
--- a/tests/qemuxml2xmloutdata/net-eth-ifname.xml
+++ b/tests/qemuxml2xmloutdata/net-eth-ifname.xml
@@ -32,7 +32,7 @@
       <script path='/etc/qemu-ifup'/>
       <target dev='nic02'/>
       <model type='rtl8139'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
b/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
index de176f851b..419bfaa0e7 100644
--- a/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
+++ b/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
@@ -31,7 +31,7 @@
       <mac address='fe:11:22:33:44:55'/>
       <target dev='mytap0' managed='no'/>
       <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/net-eth.xml b/tests/qemuxml2xmloutdata/net-eth.xml
index 3703834d14..96ce9fdbf5 100644
--- a/tests/qemuxml2xmloutdata/net-eth.xml
+++ b/tests/qemuxml2xmloutdata/net-eth.xml
@@ -31,7 +31,7 @@
       <mac address='00:11:22:33:44:55'/>
       <script path='/etc/qemu-ifup'/>
       <model type='rtl8139'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
b/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
index 7caf0c050b..f92256d8ca 100644
--- a/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
@@ -33,7 +33,7 @@
         <address type='pci' domain='0x0000' bus='0x03'
slot='0x07' function='0x1'/>
       </source>
       <boot order='1'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
b/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
index 65dd69aae2..0e5e5814ac 100644
--- a/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
@@ -40,13 +40,13 @@
         <parameters managerid='11' typeid='1193047'
typeidversion='2' instanceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/>
       </virtualport>
       <model type='rtl8139'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev.xml
b/tests/qemuxml2xmloutdata/net-hostdev.xml
index 47d35d2d08..a9873e4af5 100644
--- a/tests/qemuxml2xmloutdata/net-hostdev.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev.xml
@@ -39,13 +39,13 @@
         <parameters managerid='11' typeid='1193047'
typeidversion='2' instanceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/>
       </virtualport>
       <model type='rtl8139'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-many-models.xml
b/tests/qemuxml2xmloutdata/net-many-models.xml
index e3c1e96c7d..156ad0f157 100644
--- a/tests/qemuxml2xmloutdata/net-many-models.xml
+++ b/tests/qemuxml2xmloutdata/net-many-models.xml
@@ -19,32 +19,32 @@
     <interface type='user'>
       <mac address='00:11:22:33:44:55'/>
       <model type='idontexist'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='00:11:22:33:44:56'/>
       <model type='vmxnet3'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='00:11:22:33:44:57'/>
       <model type='netfront'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='00:11:22:33:44:58'/>
       <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='00:11:22:33:44:58'/>
       <model type='ne2k_pci'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='00:11:22:33:44:58'/>
       <model type='pcnet'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/net-midonet.xml
b/tests/qemuxml2xmloutdata/net-midonet.xml
index 9410b98f38..17a1239ac1 100644
--- a/tests/qemuxml2xmloutdata/net-midonet.xml
+++ b/tests/qemuxml2xmloutdata/net-midonet.xml
@@ -34,13 +34,13 @@
         <parameters interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/>
       </virtualport>
       <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-mtu.xml b/tests/qemuxml2xmloutdata/net-mtu.xml
index 3fe5da65b4..900548b465 100644
--- a/tests/qemuxml2xmloutdata/net-mtu.xml
+++ b/tests/qemuxml2xmloutdata/net-mtu.xml
@@ -44,14 +44,14 @@
       <source network='default'/>
       <model type='virtio'/>
       <mtu size='1500'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <interface type='network'>
       <mac address='52:54:00:e5:48:59'/>
       <source network='default'/>
       <model type='virtio'/>
       <mtu size='9000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </interface>
     <serial type='pty'>
       <target type='isa-serial' port='0'>
@@ -65,7 +65,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-openvswitch.xml
b/tests/qemuxml2xmloutdata/net-openvswitch.xml
index 0f84b34ce1..d35818435b 100644
--- a/tests/qemuxml2xmloutdata/net-openvswitch.xml
+++ b/tests/qemuxml2xmloutdata/net-openvswitch.xml
@@ -39,13 +39,13 @@
         <parameters interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'
profileid='bob'/>
       </virtualport>
       <model type='rtl8139'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-udp.xml b/tests/qemuxml2xmloutdata/net-udp.xml
index 8a6654831a..ce1eb5460c 100644
--- a/tests/qemuxml2xmloutdata/net-udp.xml
+++ b/tests/qemuxml2xmloutdata/net-udp.xml
@@ -33,13 +33,13 @@
         <local address='192.168.10.1' port='5556'/>
       </source>
       <model type='rtl8139'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-user.xml
b/tests/qemuxml2xmloutdata/net-user.xml
index 0c52ebf2a4..856a4cea48 100644
--- a/tests/qemuxml2xmloutdata/net-user.xml
+++ b/tests/qemuxml2xmloutdata/net-user.xml
@@ -30,7 +30,7 @@
     <interface type='user'>
       <mac address='00:11:22:33:44:55'/>
       <model type='rtl8139'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/net-vdpa.xml
b/tests/qemuxml2xmloutdata/net-vdpa.xml
index c9de151a08..b8e9da0020 100644
--- a/tests/qemuxml2xmloutdata/net-vdpa.xml
+++ b/tests/qemuxml2xmloutdata/net-vdpa.xml
@@ -25,7 +25,7 @@
       <mac address='52:54:00:95:db:c0'/>
       <source dev='/dev/vhost-vdpa-0'/>
       <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/net-vhostuser.xml
b/tests/qemuxml2xmloutdata/net-vhostuser.xml
index 637935b641..e2e2c2a34e 100644
--- a/tests/qemuxml2xmloutdata/net-vhostuser.xml
+++ b/tests/qemuxml2xmloutdata/net-vhostuser.xml
@@ -25,19 +25,19 @@
       <mac address='52:54:00:ee:96:6b'/>
       <source type='unix' path='/tmp/vhost0.sock'
mode='server'/>
       <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <interface type='vhostuser'>
       <mac address='52:54:00:ee:96:6c'/>
       <source type='unix' path='/tmp/vhost1.sock'
mode='client'/>
       <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </interface>
     <interface type='server'>
       <mac address='52:54:00:95:db:c0'/>
       <source port='2015'/>
       <model type='rtl8139'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-device.xml
b/tests/qemuxml2xmloutdata/net-virtio-device.xml
index dd94a8d6d1..9827329be7 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-device.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-device.xml
@@ -31,13 +31,13 @@
       <mac address='00:11:22:33:44:55'/>
       <model type='virtio'/>
       <driver txmode='iothread'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
index 40e57db44a..decf71b86c 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
@@ -34,13 +34,13 @@
         <host csum='off' gso='off' tso4='off'
tso6='off' ecn='off' ufo='off' mrg_rxbuf='off'/>
         <guest csum='off' tso4='off' tso6='off'
ecn='off' ufo='off'/>
       </driver>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
index 334745d8f8..0402ed8aff 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
@@ -37,7 +37,7 @@
         <parameters managerid='11' typeid='1193047'
typeidversion='2' instanceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/>
       </virtualport>
       <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <interface type='network' trustGuestRxFilters='no'>
       <mac address='10:11:22:33:44:55'/>
@@ -46,7 +46,7 @@
         <parameters instanceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'
interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/>
       </virtualport>
       <model type='rtl8139'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </interface>
     <interface type='network'>
       <mac address='22:11:22:33:44:55'/>
@@ -55,13 +55,13 @@
         <parameters profileid='testhis99'/>
       </virtualport>
       <model type='rtl8139'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
index a9dffc0062..b0e5fc37b5 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
@@ -31,13 +31,13 @@
       <mac address='00:11:22:33:44:55'/>
       <model type='virtio'/>
       <driver rx_queue_size='512' tx_queue_size='1024'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml
b/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml
index 72791868e0..6359fd54c7 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml
@@ -33,20 +33,20 @@
       <model type='virtio'/>
       <teaming type='persistent'/>
       <alias name='ua-backup0'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <interface type='network'>
       <mac address='00:11:22:33:44:55'/>
       <source network='myhostdevpool'/>
       <model type='virtio'/>
       <teaming type='transient' persistent='ua-backup0'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-teaming.xml
b/tests/qemuxml2xmloutdata/net-virtio-teaming.xml
index 39dd50ade6..35fd3bc82a 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-teaming.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-teaming.xml
@@ -32,14 +32,14 @@
       <model type='virtio'/>
       <teaming type='persistent'/>
       <alias name='ua-backup0'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='66:44:33:22:11:00'/>
       <model type='virtio'/>
       <teaming type='persistent'/>
       <alias name='ua-backup1'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </interface>
     <interface type='hostdev' managed='yes'>
       <mac address='00:11:22:33:44:55'/>
@@ -47,7 +47,7 @@
         <address type='pci' domain='0x0000' bus='0x03'
slot='0x07' function='0x1'/>
       </source>
       <teaming type='transient' persistent='ua-backup0'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </interface>
     <interface type='hostdev' managed='yes'>
       <mac address='66:44:33:22:11:00'/>
@@ -55,13 +55,13 @@
         <address type='pci' domain='0x0000' bus='0x03'
slot='0x07' function='0x2'/>
       </source>
       <teaming type='transient' persistent='ua-backup1'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-virtio.xml
b/tests/qemuxml2xmloutdata/net-virtio.xml
index 5e3d407cb0..862c5bd927 100644
--- a/tests/qemuxml2xmloutdata/net-virtio.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio.xml
@@ -30,7 +30,7 @@
     <interface type='user'>
       <mac address='00:11:22:33:44:55'/>
       <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
index fc9ef86568..fa81660b34 100644
--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
@@ -37,7 +37,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
index 724112b3a2..19855ba207 100644
--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
@@ -37,7 +37,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
index b054099f0a..114a5ed2db 100644
--- a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
@@ -37,7 +37,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
index d0dfb88682..5fbebbde7f 100644
--- a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
+++ b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
@@ -34,7 +34,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/numatune-auto-prefer.xml
b/tests/qemuxml2xmloutdata/numatune-auto-prefer.xml
index c289664f93..cef9f8c5e6 100644
--- a/tests/qemuxml2xmloutdata/numatune-auto-prefer.xml
+++ b/tests/qemuxml2xmloutdata/numatune-auto-prefer.xml
@@ -30,7 +30,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/numatune-distances.xml
b/tests/qemuxml2xmloutdata/numatune-distances.xml
index ee2d956d7e..4f038931c3 100644
--- a/tests/qemuxml2xmloutdata/numatune-distances.xml
+++ b/tests/qemuxml2xmloutdata/numatune-distances.xml
@@ -91,7 +91,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml
b/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml
index 880d8e2947..78a643ec2d 100644
--- a/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml
+++ b/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml
@@ -31,7 +31,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/numatune-memnode.xml
b/tests/qemuxml2xmloutdata/numatune-memnode.xml
index 297ad6b9c8..104d2e6d4c 100644
--- a/tests/qemuxml2xmloutdata/numatune-memnode.xml
+++ b/tests/qemuxml2xmloutdata/numatune-memnode.xml
@@ -34,7 +34,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/panic-isa.xml
b/tests/qemuxml2xmloutdata/panic-isa.xml
index 2efcc47df8..e71386a886 100644
--- a/tests/qemuxml2xmloutdata/panic-isa.xml
+++ b/tests/qemuxml2xmloutdata/panic-isa.xml
@@ -32,7 +32,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
     <panic model='isa'>
       <address type='isa' iobase='0x505'/>
diff --git a/tests/qemuxml2xmloutdata/panic-no-address.xml
b/tests/qemuxml2xmloutdata/panic-no-address.xml
index 8093ac85f3..b117b6cbeb 100644
--- a/tests/qemuxml2xmloutdata/panic-no-address.xml
+++ b/tests/qemuxml2xmloutdata/panic-no-address.xml
@@ -32,7 +32,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
     <panic model='isa'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/panic.xml b/tests/qemuxml2xmloutdata/panic.xml
index 2efcc47df8..e71386a886 100644
--- a/tests/qemuxml2xmloutdata/panic.xml
+++ b/tests/qemuxml2xmloutdata/panic.xml
@@ -32,7 +32,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
     <panic model='isa'>
       <address type='isa' iobase='0x505'/>
diff --git a/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml
b/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml
index 8e31e4e83b..08969c773d 100644
--- a/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml
+++ b/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml
@@ -26,631 +26,631 @@
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/test.img'/>
       <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-a-a.img'/>
       <target dev='vdaa' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-a-b.img'/>
       <target dev='vdab' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-a-c.img'/>
       <target dev='vdac' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-a-d.img'/>
       <target dev='vdad' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-b-a.img'/>
       <target dev='vdba' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0b' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-b-b.img'/>
       <target dev='vdbb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0c' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0b' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-b-c.img'/>
       <target dev='vdbc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0d' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0c' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-b-d.img'/>
       <target dev='vdbd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0e' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0d' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-c-a.img'/>
       <target dev='vdca' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0f' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0e' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-c-b.img'/>
       <target dev='vdcb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x10' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0f' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-c-c.img'/>
       <target dev='vdcc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x11' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x10' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-c-d.img'/>
       <target dev='vdcd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x12' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x11' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-d-a.img'/>
       <target dev='vdda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x13' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x12' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-d-b.img'/>
       <target dev='vddb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x14' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x13' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-d-c.img'/>
       <target dev='vddc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x15' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x14' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-d-d.img'/>
       <target dev='vddd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x16' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x15' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-e-a.img'/>
       <target dev='vdea' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x17' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x16' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-e-b.img'/>
       <target dev='vdeb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x18' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x17' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-e-c.img'/>
       <target dev='vdec' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x19' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x18' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-e-d.img'/>
       <target dev='vded' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1a' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x19' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-f-a.img'/>
       <target dev='vdfa' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1b' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1a' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-f-b.img'/>
       <target dev='vdfb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1c' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1b' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-f-c.img'/>
       <target dev='vdfc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1d' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1c' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-f-d.img'/>
       <target dev='vdfd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1e' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1d' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-g-a.img'/>
       <target dev='vdga' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1e' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-g-b.img'/>
       <target dev='vdgb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x01' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-g-c.img'/>
       <target dev='vdgc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x02' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x01' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-g-d.img'/>
       <target dev='vdgd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x02' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-h-a.img'/>
       <target dev='vdha' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x03' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-h-b.img'/>
       <target dev='vdhb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x04' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-h-c.img'/>
       <target dev='vdhc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x05' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-h-d.img'/>
       <target dev='vdhd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x06' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-i-a.img'/>
       <target dev='vdia' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x08' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x07' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-i-b.img'/>
       <target dev='vdib' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x09' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x08' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-i-c.img'/>
       <target dev='vdic' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x0a' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x09' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-i-d.img'/>
       <target dev='vdid' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x0b' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x0a' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-j-a.img'/>
       <target dev='vdja' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x0c' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x0b' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-j-b.img'/>
       <target dev='vdjb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x0d' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x0c' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-j-c.img'/>
       <target dev='vdjc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x0e' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x0d' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-j-d.img'/>
       <target dev='vdjd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x0f' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x0e' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-k-a.img'/>
       <target dev='vdka' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x10' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x0f' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-k-b.img'/>
       <target dev='vdkb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x11' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x10' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-k-c.img'/>
       <target dev='vdkc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x12' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x11' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-k-d.img'/>
       <target dev='vdkd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x13' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x12' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-l-a.img'/>
       <target dev='vdla' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x14' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x13' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-l-b.img'/>
       <target dev='vdlb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x15' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x14' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-l-c.img'/>
       <target dev='vdlc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x16' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x15' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-l-d.img'/>
       <target dev='vdld' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x17' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x16' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-m-a.img'/>
       <target dev='vdma' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x18' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x17' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-m-b.img'/>
       <target dev='vdmb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x19' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x18' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-m-c.img'/>
       <target dev='vdmc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x1a' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x19' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-m-d.img'/>
       <target dev='vdmd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x1b' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x1a' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-n-a.img'/>
       <target dev='vdna' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x1c' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x1b' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-n-b.img'/>
       <target dev='vdnb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x1d' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x1c' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-n-c.img'/>
       <target dev='vdnc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x1e' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x1d' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-n-d.img'/>
       <target dev='vdnd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x1f' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x1e' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-o-a.img'/>
       <target dev='vdoa' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x01' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x1f' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-o-b.img'/>
       <target dev='vdob' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x02' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x01' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-o-c.img'/>
       <target dev='vdoc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x02' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-o-d.img'/>
       <target dev='vdod' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x03' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-p-a.img'/>
       <target dev='vdpa' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x04' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-p-b.img'/>
       <target dev='vdpb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x05' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-p-c.img'/>
       <target dev='vdpc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x06' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-p-d.img'/>
       <target dev='vdpd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x08' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x07' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-q-a.img'/>
       <target dev='vdqa' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x09' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x08' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-q-b.img'/>
       <target dev='vdqb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x0a' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x09' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-q-c.img'/>
       <target dev='vdqc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x0b' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x0a' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-q-d.img'/>
       <target dev='vdqd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x0c' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x0b' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-r-a.img'/>
       <target dev='vdra' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x0d' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x0c' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-r-b.img'/>
       <target dev='vdrb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x0e' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x0d' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-r-c.img'/>
       <target dev='vdrc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x0f' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x0e' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-r-d.img'/>
       <target dev='vdrd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x10' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x0f' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-s-a.img'/>
       <target dev='vdsa' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x11' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x10' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-s-b.img'/>
       <target dev='vdsb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x12' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x11' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-s-c.img'/>
       <target dev='vdsc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x13' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x12' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-s-d.img'/>
       <target dev='vdsd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x14' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x13' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-t-a.img'/>
       <target dev='vdta' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x15' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x14' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-t-b.img'/>
       <target dev='vdtb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x16' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x15' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-t-c.img'/>
       <target dev='vdtc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x17' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x16' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-t-d.img'/>
       <target dev='vdtd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x18' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x17' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-u-a.img'/>
       <target dev='vdua' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x19' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x18' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-u-b.img'/>
       <target dev='vdub' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x1a' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x19' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-u-c.img'/>
       <target dev='vduc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x1b' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x1a' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-u-d.img'/>
       <target dev='vdud' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x1c' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x1b' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-v-a.img'/>
       <target dev='vdva' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x1d' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x1c' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-v-b.img'/>
       <target dev='vdvb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x1e' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x1d' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-v-c.img'/>
       <target dev='vdvc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x02'
slot='0x1f' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x1e' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-v-d.img'/>
       <target dev='vdvd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x03'
slot='0x01' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x02'
slot='0x1f' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-w-a.img'/>
       <target dev='vdwa' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x03'
slot='0x02' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x03'
slot='0x01' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-w-b.img'/>
       <target dev='vdwb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x03'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x03'
slot='0x02' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-w-c.img'/>
       <target dev='vdwc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x03'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x03'
slot='0x03' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-w-d.img'/>
       <target dev='vdwd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x03'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x03'
slot='0x04' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-x-a.img'/>
       <target dev='vdxa' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x03'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x03'
slot='0x05' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-x-b.img'/>
       <target dev='vdxb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x03'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x03'
slot='0x06' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-x-c.img'/>
       <target dev='vdxc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x03'
slot='0x08' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x03'
slot='0x07' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-x-d.img'/>
       <target dev='vdxd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x03'
slot='0x09' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x03'
slot='0x08' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-y-a.img'/>
       <target dev='vdya' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x03'
slot='0x0a' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x03'
slot='0x09' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-y-b.img'/>
       <target dev='vdyb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x03'
slot='0x0b' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x03'
slot='0x0a' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-y-c.img'/>
       <target dev='vdyc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x03'
slot='0x0c' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x03'
slot='0x0b' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-y-d.img'/>
       <target dev='vdyd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x03'
slot='0x0d' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x03'
slot='0x0c' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-z-a.img'/>
       <target dev='vdza' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x03'
slot='0x0e' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x03'
slot='0x0d' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-z-b.img'/>
       <target dev='vdzb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x03'
slot='0x0f' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x03'
slot='0x0e' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-z-c.img'/>
       <target dev='vdzc' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x03'
slot='0x10' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x03'
slot='0x0f' function='0x0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
       <source file='/var/lib/libvirt/images/disk-z-d.img'/>
       <target dev='vdzd' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x03'
slot='0x11' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x03'
slot='0x10' function='0x0'/>
     </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
@@ -659,17 +659,17 @@
     <controller type='pci' index='1' model='pci-bridge'>
       <model name='pci-bridge'/>
       <target chassisNr='1'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </controller>
     <controller type='pci' index='2' model='pci-bridge'>
       <model name='pci-bridge'/>
       <target chassisNr='2'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </controller>
     <controller type='pci' index='3' model='pci-bridge'>
       <model name='pci-bridge'/>
       <target chassisNr='3'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/pci-expander-bus.xml
b/tests/qemuxml2xmloutdata/pci-expander-bus.xml
index 80dc73edc2..dbabf55f74 100644
--- a/tests/qemuxml2xmloutdata/pci-expander-bus.xml
+++ b/tests/qemuxml2xmloutdata/pci-expander-bus.xml
@@ -31,172 +31,172 @@
       <target busNr='254'>
         <node>1</node>
       </target>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </controller>
     <controller type='pci' index='2'
model='pci-expander-bus'>
       <model name='pxb'/>
       <target busNr='252'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </controller>
     <interface type='user'>
       <mac address='52:54:00:f1:95:51'/>
       <model type='rtl8139'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:5c:c6:1a'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:39:97:ac'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:45:28:cb'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:ee:b9:a8'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:a9:f7:17'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0b' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:df:2b:f3'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0c' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0b' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:78:94:b4'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0d' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0c' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:6b:9b:06'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0e' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0d' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:17:df:bc'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0f' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0e' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:3b:d0:51'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x10' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0f' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:8d:2d:17'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x11' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x10' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:a7:66:af'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x12' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x11' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:54:ab:d7'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x13' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x12' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:1f:99:90'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x14' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x13' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:c8:43:87'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x15' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x14' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:df:22:b2'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x16' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x15' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:d2:9a:47'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x17' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x16' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:86:05:e2'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x18' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x17' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:8c:1c:c2'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x19' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x18' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:48:58:92'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1a' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x19' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:99:e5:bf'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1b' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1a' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:b1:8c:25'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1c' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1b' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:60:e0:d0'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1d' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1c' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:37:00:6a'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1e' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1d' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:c7:c8:ad'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1e' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:4e:a7:cf'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x00' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:00:79:69'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x01' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x00' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:47:00:6f'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x02' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x01' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:2a:8c:8b'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x02' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:ec:d5:e3'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x03' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:7e:6e:c8'/>
       <model type='e1000'/>
-      <address type='pci' domain='0x0000' bus='0x01'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x01'
slot='0x04' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.xml
b/tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.xml
index b26016ecb6..a59d837cc6 100644
--- a/tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.xml
+++ b/tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.xml
@@ -20,7 +20,7 @@
       <mac address='52:54:00:24:a5:9f'/>
       <model type='virtio'/>
       <rom file=''/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/pci-rom-disabled.xml
b/tests/qemuxml2xmloutdata/pci-rom-disabled.xml
index cba9199f3f..e693145163 100644
--- a/tests/qemuxml2xmloutdata/pci-rom-disabled.xml
+++ b/tests/qemuxml2xmloutdata/pci-rom-disabled.xml
@@ -20,7 +20,7 @@
       <mac address='52:54:00:24:a5:9f'/>
       <model type='virtio'/>
       <rom enabled='no'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/pci-rom.xml b/tests/qemuxml2xmloutdata/pci-rom.xml
index 198c2e6ce0..3056c2827f 100644
--- a/tests/qemuxml2xmloutdata/pci-rom.xml
+++ b/tests/qemuxml2xmloutdata/pci-rom.xml
@@ -31,13 +31,13 @@
       <mac address='52:54:00:24:a5:9f'/>
       <model type='virtio'/>
       <rom bar='on'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:24:a5:9e'/>
       <model type='virtio'/>
       <rom file='/etc/fake/bootrom.bin'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
@@ -47,17 +47,17 @@
         <address domain='0x0000' bus='0x06' slot='0x12'
function='0x5'/>
       </source>
       <rom bar='off'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <source>
         <address domain='0x0000' bus='0x06' slot='0x12'
function='0x6'/>
       </source>
       <rom bar='on' file='/etc/fake/bootrom.bin'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </hostdev>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
b/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
index 1a1b4f2b70..65d8f8d000 100644
--- a/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
+++ b/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
@@ -43,7 +43,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml
b/tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml
index 6560d6a84f..1e787378d1 100644
--- a/tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml
+++ b/tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml
@@ -17,18 +17,18 @@
     <controller type='pci' index='0' model='pcie-root'/>
     <controller type='pci' index='1'
model='pcie-root-port'>
       <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0' multifunction='on'/>
+      <target chassis='1' port='0x8'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0' multifunction='on'/>
     </controller>
     <controller type='pci' index='2'
model='pcie-root-port'>
       <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x1'/>
+      <target chassis='2' port='0x9'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
     </controller>
     <controller type='pci' index='3'
model='pcie-root-port'>
       <model name='ioh3420'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x2'/>
+      <target chassis='3' port='0xa'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
     </controller>
     <controller type='sata' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml
b/tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml
index 303107514f..9382155e71 100644
--- a/tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml
+++ b/tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml
@@ -17,13 +17,13 @@
     <controller type='pci' index='0' model='pcie-root'/>
     <controller type='pci' index='1'
model='pcie-root-port'>
       <model name='ioh3420'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0' multifunction='on'/>
+      <target chassis='1' port='0x8'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0' multifunction='on'/>
     </controller>
     <controller type='pci' index='2'
model='pcie-root-port'>
       <model name='ioh3420'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x1'/>
+      <target chassis='2' port='0x9'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
     </controller>
     <controller type='sata' index='0'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x1f' function='0x2'/>
diff --git a/tests/qemuxml2xmloutdata/pcihole64-gib.xml
b/tests/qemuxml2xmloutdata/pcihole64-gib.xml
index 239e9e693f..d9b821bfe2 100644
--- a/tests/qemuxml2xmloutdata/pcihole64-gib.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64-gib.xml
@@ -24,7 +24,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pcihole64-none.xml
b/tests/qemuxml2xmloutdata/pcihole64-none.xml
index 62b6ef9040..f4941bc67b 100644
--- a/tests/qemuxml2xmloutdata/pcihole64-none.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64-none.xml
@@ -24,7 +24,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pcihole64.xml
b/tests/qemuxml2xmloutdata/pcihole64.xml
index be70336738..52d61603aa 100644
--- a/tests/qemuxml2xmloutdata/pcihole64.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64.xml
@@ -24,7 +24,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
b/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
index a95825e57c..9a40b0b0b4 100644
--- a/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
+++ b/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
@@ -27,7 +27,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
b/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
index 02e4bf2ccb..df14a1e1b0 100644
--- a/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
+++ b/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
@@ -27,7 +27,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/q35-pci-force-address.xml
b/tests/qemuxml2xmloutdata/q35-pci-force-address.xml
index 425c7dfedd..45df55365e 100644
--- a/tests/qemuxml2xmloutdata/q35-pci-force-address.xml
+++ b/tests/qemuxml2xmloutdata/q35-pci-force-address.xml
@@ -26,8 +26,8 @@
     </controller>
     <controller type='pci' index='3'
model='pcie-root-port'>
       <model name='ioh3420'/>
-      <target chassis='3' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+      <target chassis='3' port='0x8'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0'/>
     </controller>
     <controller type='usb' index='0' model='none'/>
     <controller type='sata' index='0'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
b/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
index 1e19106341..7fc1c0f027 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
@@ -31,7 +31,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
   <seclabel type='none' model='dac'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
b/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
index 81413fe58f..63a5e1f9d8 100644
--- a/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
@@ -36,7 +36,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml
b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml
index 23e59182f6..892438f4c9 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml
@@ -31,7 +31,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
   <seclabel type='dynamic' model='selinux' relabel='yes'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml
b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml
index 23e59182f6..892438f4c9 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml
@@ -31,7 +31,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
   <seclabel type='dynamic' model='selinux' relabel='yes'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
index b1e477ebe5..2e97312d91 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
@@ -31,7 +31,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
   <seclabel type='none' model='none'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml
b/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml
index b074e4f6ca..11e5fbe489 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml
@@ -43,7 +43,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
   <seclabel type='dynamic' model='selinux' relabel='yes'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml
b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml
index b1e477ebe5..2e97312d91 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml
@@ -31,7 +31,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
   <seclabel type='none' model='none'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-none.xml
b/tests/qemuxml2xmloutdata/seclabel-none.xml
index b1e477ebe5..2e97312d91 100644
--- a/tests/qemuxml2xmloutdata/seclabel-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-none.xml
@@ -31,7 +31,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
   <seclabel type='none' model='none'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
index 853ec24ba9..4773d23725 100644
--- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
@@ -34,7 +34,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
   <seclabel type='static' model='selinux' relabel='yes'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
index fb17c41c1d..cdf0461180 100644
--- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
@@ -32,7 +32,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
   <seclabel type='static' model='selinux' relabel='yes'>
diff --git a/tests/qemuxml2xmloutdata/seclabel-static.xml
b/tests/qemuxml2xmloutdata/seclabel-static.xml
index a9af42aa3b..415f28e6fe 100644
--- a/tests/qemuxml2xmloutdata/seclabel-static.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static.xml
@@ -31,7 +31,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
   <seclabel type='static' model='selinux' relabel='no'>
diff --git a/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
b/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
index 76a40b7fa7..bee743c23a 100644
--- a/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
+++ b/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
@@ -41,7 +41,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
b/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
index 5cd283838a..937fcfe6f5 100644
--- a/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
+++ b/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
@@ -49,7 +49,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
index 97e793382f..7fde19f283 100644
--- a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
+++ b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
@@ -50,7 +50,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
b/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
index f244533f4d..c3b3e1bd8f 100644
--- a/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
+++ b/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
@@ -25,12 +25,12 @@
     <shmem name='shmem0'>
       <model type='ivshmem-plain'/>
       <size unit='M'>4</size>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </shmem>
     <shmem name='shmem1' role='peer'>
       <model type='ivshmem-plain'/>
       <size unit='M'>128</size>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </shmem>
     <shmem name='shmem2' role='master'>
       <model type='ivshmem-plain'/>
@@ -41,31 +41,31 @@
       <model type='ivshmem-doorbell'/>
       <server/>
       <msi ioeventfd='on'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </shmem>
     <shmem name='shmem4'>
       <model type='ivshmem-doorbell'/>
       <server path='/tmp/shmem4-sock'/>
       <msi ioeventfd='on'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
     </shmem>
     <shmem name='shmem5'>
       <model type='ivshmem-doorbell'/>
       <server path='/tmp/shmem5-sock'/>
       <msi ioeventfd='off'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
     </shmem>
     <shmem name='shmem6'>
       <model type='ivshmem-doorbell'/>
       <server path='/tmp/shmem6-sock'/>
       <msi vectors='16' ioeventfd='on'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
     </shmem>
     <shmem name='shmem7'>
       <model type='ivshmem-doorbell'/>
       <server path='/tmp/shmem7-sock'/>
       <msi vectors='32' ioeventfd='on'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
     </shmem>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/shmem.xml b/tests/qemuxml2xmloutdata/shmem.xml
index d7b02ffa4d..b4bcc666d2 100644
--- a/tests/qemuxml2xmloutdata/shmem.xml
+++ b/tests/qemuxml2xmloutdata/shmem.xml
@@ -25,12 +25,12 @@
     <shmem name='shmem0'>
       <model type='ivshmem'/>
       <size unit='M'>4</size>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </shmem>
     <shmem name='shmem1'>
       <model type='ivshmem'/>
       <size unit='M'>128</size>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </shmem>
     <shmem name='shmem2'>
       <model type='ivshmem'/>
@@ -41,34 +41,34 @@
       <model type='ivshmem'/>
       <size unit='M'>512</size>
       <server/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </shmem>
     <shmem name='shmem4'>
       <model type='ivshmem'/>
       <size unit='M'>1024</size>
       <server path='/tmp/shmem4-sock'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
     </shmem>
     <shmem name='shmem5'>
       <model type='ivshmem'/>
       <size unit='M'>2048</size>
       <server path='/tmp/shmem5-sock'/>
       <msi ioeventfd='off'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
     </shmem>
     <shmem name='shmem6'>
       <model type='ivshmem'/>
       <size unit='M'>4096</size>
       <server path='/tmp/shmem6-sock'/>
       <msi vectors='16'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
     </shmem>
     <shmem name='shmem7'>
       <model type='ivshmem'/>
       <size unit='M'>8192</size>
       <server path='/tmp/shmem7-sock'/>
       <msi vectors='32' ioeventfd='on'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
     </shmem>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/smartcard-controller.xml
b/tests/qemuxml2xmloutdata/smartcard-controller.xml
index 2094f3ea7a..55c4751853 100644
--- a/tests/qemuxml2xmloutdata/smartcard-controller.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-controller.xml
@@ -26,7 +26,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml
b/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml
index c798a3e6a1..f14f64bfa0 100644
--- a/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml
@@ -30,7 +30,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
b/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
index 3e7bc87d5d..47e7302a1b 100644
--- a/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
@@ -29,7 +29,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/smartcard-host.xml
b/tests/qemuxml2xmloutdata/smartcard-host.xml
index 088aa4c07b..f8ce1a0185 100644
--- a/tests/qemuxml2xmloutdata/smartcard-host.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-host.xml
@@ -26,7 +26,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
b/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
index 73cf4733ee..9263d1741b 100644
--- a/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
@@ -26,7 +26,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
b/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
index d6f07fafdb..ecd671c9cc 100644
--- a/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
@@ -28,7 +28,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
b/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
index 2ddc55eced..b1daa12c44 100644
--- a/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
+++ b/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
@@ -62,7 +62,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/smbios.xml b/tests/qemuxml2xmloutdata/smbios.xml
index 9e50b5a70e..786bcb02a5 100644
--- a/tests/qemuxml2xmloutdata/smbios.xml
+++ b/tests/qemuxml2xmloutdata/smbios.xml
@@ -67,7 +67,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/sound-device.xml
b/tests/qemuxml2xmloutdata/sound-device.xml
index 598c7711ba..87d9a5524c 100644
--- a/tests/qemuxml2xmloutdata/sound-device.xml
+++ b/tests/qemuxml2xmloutdata/sound-device.xml
@@ -31,34 +31,34 @@
     <input type='keyboard' bus='ps2'/>
     <sound model='pcspk'/>
     <sound model='es1370'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </sound>
     <sound model='sb16'/>
     <sound model='ac97'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </sound>
     <sound model='ich6'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </sound>
     <sound model='ich6'>
       <codec type='micro'/>
       <codec type='duplex'/>
       <codec type='output'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </sound>
     <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
     </sound>
     <sound model='ich9'>
       <codec type='micro'/>
       <codec type='duplex'/>
       <codec type='output'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
     </sound>
     <sound model='usb'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x09' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x08' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/sound.xml b/tests/qemuxml2xmloutdata/sound.xml
index 3f20a0fd24..1ffa7412d6 100644
--- a/tests/qemuxml2xmloutdata/sound.xml
+++ b/tests/qemuxml2xmloutdata/sound.xml
@@ -31,11 +31,11 @@
     <input type='keyboard' bus='ps2'/>
     <sound model='pcspk'/>
     <sound model='es1370'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </sound>
     <sound model='sb16'/>
     <sound model='ac97'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </sound>
     <audio id='1' type='none'/>
     <memballoon model='none'/>
diff --git a/tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
b/tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
index 76289dfb74..1235588810 100644
--- a/tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
+++ b/tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
@@ -31,7 +31,7 @@
       <source network='default'/>
       <model type='e1000'/>
       <backend tap='/dev/null'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <interface type='network'>
       <mac address='52:54:00:e5:48:59'/>
@@ -39,7 +39,7 @@
       <model type='virtio'/>
       <driver name='vhost'/>
       <backend tap='/dev/null' vhost='/dev/zero'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </interface>
     <serial type='pty'>
       <target type='isa-serial' port='0'>
@@ -53,7 +53,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/tap-vhost.xml
b/tests/qemuxml2xmloutdata/tap-vhost.xml
index 6746736443..7f5b192f86 100644
--- a/tests/qemuxml2xmloutdata/tap-vhost.xml
+++ b/tests/qemuxml2xmloutdata/tap-vhost.xml
@@ -45,7 +45,7 @@
       <model type='virtio'/>
       <driver name='vhost' queues='5'/>
       <backend tap='/dev/null' vhost='/dev/zero'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <serial type='pty'>
       <target type='isa-serial' port='0'>
@@ -59,7 +59,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/tseg-explicit-size.xml
b/tests/qemuxml2xmloutdata/tseg-explicit-size.xml
index 6c6abcd33b..791b34f864 100644
--- a/tests/qemuxml2xmloutdata/tseg-explicit-size.xml
+++ b/tests/qemuxml2xmloutdata/tseg-explicit-size.xml
@@ -34,8 +34,8 @@
     </controller>
     <controller type='pci' index='3'
model='pcie-root-port'>
       <model name='ioh3420'/>
-      <target chassis='3' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+      <target chassis='3' port='0x8'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x0'/>
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/usb-controller.xml
b/tests/qemuxml2xmloutdata/usb-controller.xml
index 192d885210..b088bd16d7 100644
--- a/tests/qemuxml2xmloutdata/usb-controller.xml
+++ b/tests/qemuxml2xmloutdata/usb-controller.xml
@@ -22,7 +22,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
b/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
index 6ce966f1d4..26b341b058 100644
--- a/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
+++ b/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
@@ -15,56 +15,56 @@
   <devices>
     <emulator>/usr/bin/qemu-system-i386</emulator>
     <controller type='usb' index='0' model='ich9-ehci1'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x7'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x7'/>
     </controller>
     <controller type='usb' index='0' model='ich9-uhci1'>
       <master startport='0'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0' multifunction='on'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0' multifunction='on'/>
     </controller>
     <controller type='usb' index='0' model='ich9-uhci3'>
       <master startport='4'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x2'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x2'/>
     </controller>
     <controller type='usb' index='0' model='ich9-uhci2'>
       <master startport='2'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x1'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x1'/>
     </controller>
     <controller type='usb' index='1' model='ich9-ehci1'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x7'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x7'/>
     </controller>
     <controller type='usb' index='1' model='ich9-uhci1'>
       <master startport='0'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0' multifunction='on'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0' multifunction='on'/>
     </controller>
     <controller type='usb' index='1' model='ich9-uhci3'>
       <master startport='4'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x2'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x2'/>
     </controller>
     <controller type='usb' index='1' model='ich9-uhci2'>
       <master startport='2'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x1'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x1'/>
     </controller>
     <controller type='usb' index='2' model='ich9-ehci1'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x7'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x7'/>
     </controller>
     <controller type='usb' index='2' model='ich9-uhci1'>
       <master startport='0'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0' multifunction='on'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0' multifunction='on'/>
     </controller>
     <controller type='usb' index='2' model='ich9-uhci3'>
       <master startport='4'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x2'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x2'/>
     </controller>
     <controller type='usb' index='2' model='ich9-uhci2'>
       <master startport='2'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x1'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x1'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/usb-none.xml
b/tests/qemuxml2xmloutdata/usb-none.xml
index c3a985cb46..9ec7d39b87 100644
--- a/tests/qemuxml2xmloutdata/usb-none.xml
+++ b/tests/qemuxml2xmloutdata/usb-none.xml
@@ -20,7 +20,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/usb-piix3-controller.xml
b/tests/qemuxml2xmloutdata/usb-piix3-controller.xml
index 8ae380770f..a13c7346cd 100644
--- a/tests/qemuxml2xmloutdata/usb-piix3-controller.xml
+++ b/tests/qemuxml2xmloutdata/usb-piix3-controller.xml
@@ -22,7 +22,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/usb-port-missing.xml
b/tests/qemuxml2xmloutdata/usb-port-missing.xml
index 1621779c03..ce6b0b394e 100644
--- a/tests/qemuxml2xmloutdata/usb-port-missing.xml
+++ b/tests/qemuxml2xmloutdata/usb-port-missing.xml
@@ -31,7 +31,7 @@
       <address type='usb' bus='0'/>
     </hub>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
b/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
index e0a424d3be..19561a1c02 100644
--- a/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
+++ b/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
@@ -33,7 +33,7 @@
       <usbdev allow='no'/>
     </redirfilter>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/usb-redir-filter.xml
b/tests/qemuxml2xmloutdata/usb-redir-filter.xml
index 37a192ded0..ac5a1c5091 100644
--- a/tests/qemuxml2xmloutdata/usb-redir-filter.xml
+++ b/tests/qemuxml2xmloutdata/usb-redir-filter.xml
@@ -44,7 +44,7 @@
       <usbdev allow='no'/>
     </redirfilter>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/usb-redir.xml
b/tests/qemuxml2xmloutdata/usb-redir.xml
index e40969cb58..c57ccc8d47 100644
--- a/tests/qemuxml2xmloutdata/usb-redir.xml
+++ b/tests/qemuxml2xmloutdata/usb-redir.xml
@@ -41,7 +41,7 @@
       <address type='usb' bus='0' port='4'/>
     </redirdev>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-auto.xml
b/tests/qemuxml2xmloutdata/vhost-vsock-auto.xml
index bd0602b7fa..c1b787cdc4 100644
--- a/tests/qemuxml2xmloutdata/vhost-vsock-auto.xml
+++ b/tests/qemuxml2xmloutdata/vhost-vsock-auto.xml
@@ -31,7 +31,7 @@
     <memballoon model='none'/>
     <vsock model='virtio'>
       <cid auto='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </vsock>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/vhost_queues.xml
b/tests/qemuxml2xmloutdata/vhost_queues.xml
index b940f05dee..46428b59e2 100644
--- a/tests/qemuxml2xmloutdata/vhost_queues.xml
+++ b/tests/qemuxml2xmloutdata/vhost_queues.xml
@@ -43,7 +43,7 @@
       <mac address='52:54:00:e5:48:58'/>
       <model type='virtio'/>
       <driver name='vhost' queues='5'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <serial type='pty'>
       <target type='isa-serial' port='0'>
@@ -57,7 +57,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
b/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
index b94b0c8aac..2ff6af9832 100644
--- a/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
+++ b/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
@@ -20,13 +20,13 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='passthrough' bus='virtio'>
       <source evdev='/dev/input/event1234'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </input>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-input.xml
b/tests/qemuxml2xmloutdata/virtio-input.xml
index 9d8db57981..313920e911 100644
--- a/tests/qemuxml2xmloutdata/virtio-input.xml
+++ b/tests/qemuxml2xmloutdata/virtio-input.xml
@@ -19,19 +19,19 @@
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </input>
     <input type='keyboard' bus='virtio'>
       <address type='pci' domain='0x0000' bus='0x00'
slot='0x0a' function='0x0'/>
     </input>
     <input type='tablet' bus='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
     </input>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-lun.xml
b/tests/qemuxml2xmloutdata/virtio-lun.xml
index e1e28c33b9..cdb804e9a0 100644
--- a/tests/qemuxml2xmloutdata/virtio-lun.xml
+++ b/tests/qemuxml2xmloutdata/virtio-lun.xml
@@ -42,13 +42,13 @@
       <mac address='52:54:00:e5:48:58'/>
       <model type='virtio'/>
       <driver name='vhost' event_idx='off'/>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-egd.xml
b/tests/qemuxml2xmloutdata/virtio-rng-egd.xml
index 2658bf8ecc..a903ada842 100644
--- a/tests/qemuxml2xmloutdata/virtio-rng-egd.xml
+++ b/tests/qemuxml2xmloutdata/virtio-rng-egd.xml
@@ -22,14 +22,14 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
     <rng model='virtio'>
       <backend model='egd' type='tcp'>
         <source mode='connect' host='1.2.3.4'
service='1234'/>
         <protocol type='raw'/>
       </backend>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </rng>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-random.xml
b/tests/qemuxml2xmloutdata/virtio-rng-random.xml
index 4ba8aa522f..f7faa2fc4e 100644
--- a/tests/qemuxml2xmloutdata/virtio-rng-random.xml
+++ b/tests/qemuxml2xmloutdata/virtio-rng-random.xml
@@ -22,12 +22,12 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
     <rng model='virtio'>
       <rate bytes='123' period='1234'/>
       <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
     </rng>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/vmcoreinfo.xml
b/tests/qemuxml2xmloutdata/vmcoreinfo.xml
index 6be4d36325..fa60ede67e 100644
--- a/tests/qemuxml2xmloutdata/vmcoreinfo.xml
+++ b/tests/qemuxml2xmloutdata/vmcoreinfo.xml
@@ -34,7 +34,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>
-- 
2.30.2


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

[RFC PATCH 29/43] [fixup] Fix test fallout in tests/qemuxml2xmloutdata