qemu: capabilities: Move setting QEMU_CAPS_DEVICE_VIDEO_PRIMARY to virQEMUCapsInitQMP...

Until we clean up and remove all capabilities which no longer make sense
to have separately, we should use virQEMUCapsInitQMPBasicArch to set the
defaults as it's used by qemuxml2argvtest when testing with fake
capabilities.

This allows us to prevent testing dead code paths with the fake
capability tests.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index d582c76574fb1dafd4bd30e55a443e2e86d9f037..a9f662e635ba69ed99a609cb900f4fb090e4c972 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5045,11 +5045,15 @@ virQEMUCapsInitQMPArch(virQEMUCaps *qemuCaps,
  * virQEMUCapsInitQMPBasicArch:
  * @qemuCaps: QEMU capabilities
  *
- * Initialize @qemuCaps with basic architecture-dependent capabilities.
+ * Initialize @qemuCaps with basic always present and architecture-dependent
+ * capabilities.
  */
 void
 virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps)
 {
+    /* Following caps were asserted by a version check for pre 2.11 qemus */
+    virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+
     switch (qemuCaps->arch) {
     case VIR_ARCH_I686:
     case VIR_ARCH_X86_64:
@@ -5126,7 +5130,6 @@ static void
 virQEMUCapsInitQMPVersionCaps(virQEMUCaps *qemuCaps)
 {
     /* Following caps were asserted by a version check for pre 2.11 qemus */
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_VMPORT_OPT);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_SMM_OPT);

diff --git a/tests/qemuxml2argvdata/audio-default-sdl.args b/tests/qemuxml2argvdata/audio-default-sdl.args
index b3b700e771c91e874afcc3a4d9e7ca34290cf538..459b88c9de09a35f57efb5de1c2871ebbd2c486e 100644 (file)
--- a/tests/qemuxml2argvdata/audio-default-sdl.args
+++ b/tests/qemuxml2argvdata/audio-default-sdl.args
@@ -27,4 +27,4 @@ SDL_AUDIODRIVER=esd \
 -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
 -display sdl \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/audio-default-spice.args b/tests/qemuxml2argvdata/audio-default-spice.args
index e6599bdb7bbe7cc9f1fb5144d26915f833b6e972..ca81df013b24216eaee5cead593183a674e1871f 100644 (file)
--- a/tests/qemuxml2argvdata/audio-default-spice.args
+++ b/tests/qemuxml2argvdata/audio-default-spice.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=spice \
 -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
 -spice port=0,seamless-migration=on \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/audio-default-vnc.args b/tests/qemuxml2argvdata/audio-default-vnc.args
index 7218aa2f99d98d49bdb0fb32805114c9f87f864b..28709a5c5d8ed96c1fb3baa79ae74e1904f8accf 100644 (file)
--- a/tests/qemuxml2argvdata/audio-default-vnc.args
+++ b/tests/qemuxml2argvdata/audio-default-vnc.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=alsa \
 -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
 -vnc 127.0.0.1:0 \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/autoindex.args b/tests/qemuxml2argvdata/autoindex.args
index 2f0c6041b05e1ce9dc17c6a837b5750633c5cca6..bf128bd0ad0da5e3cced7cd63d48e5f4c0a15991 100644 (file)
--- a/tests/qemuxml2argvdata/autoindex.args
+++ b/tests/qemuxml2argvdata/autoindex.args
@@ -25,7 +25,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
--device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
+-device ioh3420,port=0x8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
 -device x3130-upstream,id=pci.4,bus=pci.3,addr=0x0 \
 -device xio3130-downstream,port=0x0,chassis=5,id=pci.5,bus=pci.4,addr=0x0 \
 -device xio3130-downstream,port=0x1,chassis=6,id=pci.6,bus=pci.4,addr=0x1 \

diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args b/tests/qemuxml2argvdata/balloon-device-auto.args
index 5770ba928af271685820273f89b3f64c159a446c..699ed70abcd8963b033de8e0c395ff5117a5f225 100644 (file)
--- a/tests/qemuxml2argvdata/balloon-device-auto.args
+++ b/tests/qemuxml2argvdata/balloon-device-auto.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.args b/tests/qemuxml2argvdata/bios-nvram-secure.args
index 5132b976001766680372ec937e71fe575efe0f6c..f721524d0a6abf8eaaee82a2dfd1f3f7bd7cdfe6 100644 (file)
--- a/tests/qemuxml2argvdata/bios-nvram-secure.args
+++ b/tests/qemuxml2argvdata/bios-nvram-secure.args
@@ -28,7 +28,7 @@ QEMU_AUDIO_DRV=none \
 -boot menu=on \
 -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
--device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
+-device ioh3420,port=0x8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
 -device virtio-scsi-pci,id=scsi0,bus=pci.2,addr=0x1 \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-0-0 \
 -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 \

diff --git a/tests/qemuxml2argvdata/bios-nvram.args b/tests/qemuxml2argvdata/bios-nvram.args
index 464db3a04760d636469ff5d55631ccdeaec5fe2d..c692a5a03540c5d6bbc6b5892fcbb3c121f91485 100644 (file)
--- a/tests/qemuxml2argvdata/bios-nvram.args
+++ b/tests/qemuxml2argvdata/bios-nvram.args
@@ -29,4 +29,4 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -device usb-tablet,id=input0,bus=usb.0,port=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/bios.args b/tests/qemuxml2argvdata/bios.args
index 437117913283113b1540fbd2b765ec580179a0d8..5374996b154212c504da10af2db36cac7834ad45 100644 (file)
--- a/tests/qemuxml2argvdata/bios.args
+++ b/tests/qemuxml2argvdata/bios.args
@@ -32,4 +32,4 @@ QEMU_AUDIO_DRV=none \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0 \
 -device usb-tablet,id=input0,bus=usb.0,port=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2argvdata/blkiotune-device.args
index 5770ba928af271685820273f89b3f64c159a446c..699ed70abcd8963b033de8e0c395ff5117a5f225 100644 (file)
--- a/tests/qemuxml2argvdata/blkiotune-device.args
+++ b/tests/qemuxml2argvdata/blkiotune-device.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/blkiotune.args b/tests/qemuxml2argvdata/blkiotune.args
index 5770ba928af271685820273f89b3f64c159a446c..699ed70abcd8963b033de8e0c395ff5117a5f225 100644 (file)
--- a/tests/qemuxml2argvdata/blkiotune.args
+++ b/tests/qemuxml2argvdata/blkiotune.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/boot-complex.args b/tests/qemuxml2argvdata/boot-complex.args
index 87f821ab89ed2e90198bc6cc81c3e73d28f37210..ce418a182aa23c52de4a8c5f72e060a0615780e8 100644 (file)
--- a/tests/qemuxml2argvdata/boot-complex.args
+++ b/tests/qemuxml2argvdata/boot-complex.args
@@ -25,9 +25,9 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -usb \
 -drive file=/tmp/vda.img,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=3 \
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=3 \
 -drive file=/tmp/vdb.img,format=raw,if=none,id=drive-virtio-disk1 \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,id=virtio-disk1 \
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
 -drive file=/dev/HostVG/hda,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -drive file=/dev/HostVG/hdb,format=raw,if=none,id=drive-ide0-0-1 \
@@ -40,6 +40,6 @@ QEMU_AUDIO_DRV=none \
 -global isa-fdc.bootindexA=4 \
 -global isa-fdc.driveB=drive-fdc0-0-1 \
 -netdev user,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x3,bootindex=2 \
+-device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x2,bootindex=2 \
 -netdev user,id=hostnet1 \
--device virtio-net-pci,netdev=hostnet1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,addr=0x4
+-device virtio-net-pci,netdev=hostnet1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.args b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
index 171dde0489eb311600ff64e8ff24c26296763e2a..62272d8a7dabbbda47ca747a6aa7753bf683c667 100644 (file)
--- a/tests/qemuxml2argvdata/boot-menu-disable-drive.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/boot-menu-disable.args b/tests/qemuxml2argvdata/boot-menu-disable.args
index 171dde0489eb311600ff64e8ff24c26296763e2a..62272d8a7dabbbda47ca747a6aa7753bf683c667 100644 (file)
--- a/tests/qemuxml2argvdata/boot-menu-disable.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
index b888fc41543ee2eeac5416e020f88977866c7dc7..b7ad9c3ebce9d936ef79540637704ed99d512064 100644 (file)
--- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/boot-menu-enable.args b/tests/qemuxml2argvdata/boot-menu-enable.args
index dd1f97f48ee3f7894053c59a068b42f8a19b1e8c..c3249b7db7aec4ac163f18620630a2bbf78cbda2 100644 (file)
--- a/tests/qemuxml2argvdata/boot-menu-enable.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/boot-multi.args b/tests/qemuxml2argvdata/boot-multi.args
index dd1f97f48ee3f7894053c59a068b42f8a19b1e8c..c3249b7db7aec4ac163f18620630a2bbf78cbda2 100644 (file)
--- a/tests/qemuxml2argvdata/boot-multi.args
+++ b/tests/qemuxml2argvdata/boot-multi.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/boot-order.args b/tests/qemuxml2argvdata/boot-order.args
index fc2d3135f964ffb2e176b0e6876ddcab87ebe6de..c42ccba80348930bc696578a4f336a42f2644245 100644 (file)
--- a/tests/qemuxml2argvdata/boot-order.args
+++ b/tests/qemuxml2argvdata/boot-order.args
@@ -29,10 +29,10 @@ QEMU_AUDIO_DRV=none \
 -drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
 -drive file=sheepdog:example.org:6000:image,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=3 \
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=3 \
 -drive file=/dev/null,format=raw,if=none,id=drive-fdc0-0-1 \
 -global isa-fdc.driveB=drive-fdc0-0-1 \
 -global isa-fdc.bootindexB=4 \
 -netdev user,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3,bootindex=2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2,bootindex=2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/boot-strict.args b/tests/qemuxml2argvdata/boot-strict.args
index bb8b3e2b219de551b490c2a681a67d4a303b5ee6..6f289c2e8774cf39b254432a6d61557c98197ecf 100644 (file)
--- a/tests/qemuxml2argvdata/boot-strict.args
+++ b/tests/qemuxml2argvdata/boot-strict.args
@@ -26,9 +26,9 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -usb \
 -drive file=/tmp/vda.img,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=3 \
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=3 \
 -drive file=/tmp/vdb.img,format=raw,if=none,id=drive-virtio-disk1 \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,id=virtio-disk1 \
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
 -drive file=/dev/HostVG/hda,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -drive file=/dev/HostVG/hdb,format=raw,if=none,id=drive-ide0-0-1 \
@@ -41,6 +41,6 @@ QEMU_AUDIO_DRV=none \
 -global isa-fdc.bootindexA=4 \
 -global isa-fdc.driveB=drive-fdc0-0-1 \
 -netdev user,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x3,bootindex=2 \
+-device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x2,bootindex=2 \
 -netdev user,id=hostnet1 \
--device virtio-net-pci,netdev=hostnet1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,addr=0x4
+-device virtio-net-pci,netdev=hostnet1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2argvdata/channel-guestfwd.args
index 5bd2ae68813c24b4b60480c340ceae5df8b79fbf..6b354e032dcfa559c29512fc080459e7cd22fcf4 100644 (file)
--- a/tests/qemuxml2argvdata/channel-guestfwd.args
+++ b/tests/qemuxml2argvdata/channel-guestfwd.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev pipe,id=charchannel0,path=/tmp/guestfwd \
 -netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=channel0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2argvdata/channel-spicevmc.args
index 66b769d741c234c6d2f2a2adbbd1bfb5b7bf9b8e..f0e5cf0333082d84f6dba11cc04e547513fbcc86 100644 (file)
--- a/tests/qemuxml2argvdata/channel-spicevmc.args
+++ b/tests/qemuxml2argvdata/channel-spicevmc.args
@@ -29,5 +29,5 @@ QEMU_AUDIO_DRV=spice \
 -chardev spicevmc,id=charchannel0,name=vdagent \
 -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=com.redhat.spice.0 \
 -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,seamless-migration=on \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxml2argvdata/channel-virtio-auto.args
index bf4be0586d570fb312f02377b6d364b03d77bd82..50fba54f4a7c1d7d22f1fe2f6c5f36bd72494c8d 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-auto.args
+++ b/tests/qemuxml2argvdata/channel-virtio-auto.args
@@ -23,9 +23,9 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
--device virtio-serial-pci,id=virtio-serial0,max_ports=16,vectors=4,bus=pci.0,addr=0x3 \
+-device virtio-serial-pci,id=virtio-serial0,max_ports=16,vectors=4,bus=pci.0,addr=0x2 \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
--device virtio-serial-pci,id=virtio-serial2,bus=pci.0,addr=0x4 \
+-device virtio-serial-pci,id=virtio-serial2,bus=pci.0,addr=0x3 \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
@@ -41,4 +41,4 @@ QEMU_AUDIO_DRV=none \
 -device virtserialport,bus=virtio-serial1.0,nr=2,chardev=charchannel4,id=channel4,name=org.linux-kvm.port.ooh \
 -chardev pty,id=charchannel5 \
 -device virtserialport,bus=virtio-serial2.0,nr=1,chardev=charchannel5,id=channel5,name=org.linux-kvm.port.lla \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
index f210a109d7f93e1b02c0db3212ad201cd4abe89d..07c25b86c7226771a5f268ef2ac4be6fa3e7335c 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
@@ -23,8 +23,8 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
--device virtio-serial-pci,id=virtio-serial0,max_ports=4,vectors=4,bus=pci.0,addr=0x3 \
--device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0x4 \
+-device virtio-serial-pci,id=virtio-serial0,max_ports=4,vectors=4,bus=pci.0,addr=0x2 \
+-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0x3 \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
@@ -40,4 +40,4 @@ QEMU_AUDIO_DRV=none \
 -device virtserialport,bus=virtio-serial1.0,nr=2,chardev=charchannel4,id=channel4,name=org.linux-kvm.port.ooh \
 -chardev pty,id=charchannel5 \
 -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel5,id=channel5,name=org.linux-kvm.port.lla \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
index cde003b76be9a16c29558eeaf258a67d53231061..305d0d9660cd6f05d3e2f5a4f477b86d89e2a099 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
--device virtio-serial-pci,id=virtio-serial0,max_ports=4,vectors=4,bus=pci.0,addr=0x3 \
+-device virtio-serial-pci,id=virtio-serial0,max_ports=4,vectors=4,bus=pci.0,addr=0x2 \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
@@ -40,4 +40,4 @@ QEMU_AUDIO_DRV=none \
 -device virtserialport,bus=virtio-serial1.0,nr=2,chardev=charchannel4,id=channel4,name=org.linux-kvm.port.ooh \
 -chardev pty,id=charchannel5 \
 -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel5,id=channel5,name=org.linux-kvm.port.lla \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args b/tests/qemuxml2argvdata/channel-virtio-default.args
index 9d8e11c9571fe59eaaa802ec4070d2552be40e04..90ea43a339a99ad51edaa918f5d7181f2b82052d 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-default.args
+++ b/tests/qemuxml2argvdata/channel-virtio-default.args
@@ -24,7 +24,7 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
+-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
@@ -32,4 +32,4 @@ QEMU_AUDIO_DRV=none \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0 \
 -chardev spicevmc,id=charchannel1,name=vdagent \
 -device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,name=com.redhat.spice.0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args b/tests/qemuxml2argvdata/channel-virtio-state.args
index ac0e63deefd5f68f98d3d0b498a1572b55dcde2f..88e26d1c96d86e4ab49e94e17a6f875100f0f883 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-state.args
+++ b/tests/qemuxml2argvdata/channel-virtio-state.args
@@ -33,4 +33,4 @@ QEMU_AUDIO_DRV=none \
 -device virtserialport,bus=virtio-serial1.0,nr=4,chardev=charchannel1,id=channel1,name=org.linux-kvm.port.foo1 \
 -chardev pty,id=charchannel2 \
 -device virtserialport,bus=virtio-serial1.0,nr=5,chardev=charchannel2,id=channel2,name=org.linux-kvm.port.foo2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args b/tests/qemuxml2argvdata/channel-virtio-unix.args
index 034383fc6d1e26992236a69c953341b76d61ae1d..b1a5409fc1db07063ed1d7f7c548b4c8dda2d8c2 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-unix.args
+++ b/tests/qemuxml2argvdata/channel-virtio-unix.args
@@ -24,7 +24,7 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
+-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \

diff --git a/tests/qemuxml2argvdata/channel-virtio.args b/tests/qemuxml2argvdata/channel-virtio.args
index 29b470abf61c4a8a83d4181601f0aef628b64486..7d78a04567801520b04d7185aee2a072f9f306a0 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio.args
+++ b/tests/qemuxml2argvdata/channel-virtio.args
@@ -29,4 +29,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charchannel0 \
 -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=org.linux-kvm.port.foo \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args b/tests/qemuxml2argvdata/chardev-reconnect.args
index 25d5fa16a3205b0df277ea9dad5b0956526fa6e5..00d89a9a826fece6504e85e94c41f5f0cfdc5eb3 100644 (file)
--- a/tests/qemuxml2argvdata/chardev-reconnect.args
+++ b/tests/qemuxml2argvdata/chardev-reconnect.args
@@ -24,7 +24,7 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
+-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
 -usb \
 -device usb-ccid,id=ccid0,bus=usb.0,port=1 \
 -chardev socket,id=charsmartcard0,path=/tmp/channel/asdf,reconnect=20 \
@@ -37,4 +37,4 @@ QEMU_AUDIO_DRV=none \
 -device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=2 \
 -chardev socket,id=charrng0,host=localhost,port=2345,reconnect=5 \
 -object rng-egd,id=objrng0,chardev=charrng0 \
--device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x4
+-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/clock-catchup.args b/tests/qemuxml2argvdata/clock-catchup.args
index 20c37e7c20ac8c35e685594815cad434748fbcbe..b5c6717c3f512ff037f29b7c912315ef9d643c7c 100644 (file)
--- a/tests/qemuxml2argvdata/clock-catchup.args
+++ b/tests/qemuxml2argvdata/clock-catchup.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvdata/clock-france.args
index 3d51fcfcf7081f0edf5894840683fc2e12d66075..a5da02742c3c424e942e7471f9441f6296af0385 100644 (file)
--- a/tests/qemuxml2argvdata/clock-france.args
+++ b/tests/qemuxml2argvdata/clock-france.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2argvdata/clock-hpet-off.args
index e09b19123d8138206ade8bc3d6e6378c7256ff35..734eb5489f52794c322c09d2d4366a530117446d 100644 (file)
--- a/tests/qemuxml2argvdata/clock-hpet-off.args
+++ b/tests/qemuxml2argvdata/clock-hpet-off.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
index 6fb13564d4a51adb884bf2adc8474ee66e7d14ed..015750213e7723388bd6cd0912a96597cb08aab1 100644 (file)
--- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
index 4e7efb59c36452755fc178183b41d459dbd1620e..dfa15f0a58b62ebde867bbb73a3c808e53094c22 100644 (file)
--- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
+++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/clock-variable.args b/tests/qemuxml2argvdata/clock-variable.args
index af6627e6aa3088340aaed895406510b00cbf74a2..50520cd6f029feb53b09245c58bc6fecfd79e723 100644 (file)
--- a/tests/qemuxml2argvdata/clock-variable.args
+++ b/tests/qemuxml2argvdata/clock-variable.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/console-compat-auto.args b/tests/qemuxml2argvdata/console-compat-auto.args
index e46ad1044267f8c0c288b60294e4571ecb9eff80..10370f64830808709862b74d65e5dfc4b70a366e 100644 (file)
--- a/tests/qemuxml2argvdata/console-compat-auto.args
+++ b/tests/qemuxml2argvdata/console-compat-auto.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args b/tests/qemuxml2argvdata/console-compat-chardev.args
index e46ad1044267f8c0c288b60294e4571ecb9eff80..10370f64830808709862b74d65e5dfc4b70a366e 100644 (file)
--- a/tests/qemuxml2argvdata/console-compat-chardev.args
+++ b/tests/qemuxml2argvdata/console-compat-chardev.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxml2argvdata/console-virtio-many.args
index 53e0ebc37e3d8e7b034ffbd6fce1315413bc7f08..8fac458a33eea1cf774110e8c3863cadc2005487 100644 (file)
--- a/tests/qemuxml2argvdata/console-virtio-many.args
+++ b/tests/qemuxml2argvdata/console-virtio-many.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
+-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
@@ -35,4 +35,4 @@ QEMU_AUDIO_DRV=none \
 -device virtconsole,chardev=charconsole2,id=console2 \
 -chardev pty,id=charconsole3 \
 -device virtconsole,chardev=charconsole3,id=console3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2argvdata/console-virtio.args
index 1d3979b9eae706e9a44be0252d684fdac40dc0b3..9657c02717d9dc285f93d214aa74d48f23abd8fc 100644 (file)
--- a/tests/qemuxml2argvdata/console-virtio.args
+++ b/tests/qemuxml2argvdata/console-virtio.args
@@ -23,10 +23,10 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
+-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charconsole0 \
 -device virtconsole,chardev=charconsole0,id=console0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2argvdata/controller-order.args
index 2a372acd9f76d9cae7254924c28bb5601ee3d0de..721c31691aba77c5d4ab24fea637deba2d85781b 100644 (file)
--- a/tests/qemuxml2argvdata/controller-order.args
+++ b/tests/qemuxml2argvdata/controller-order.args
@@ -40,7 +40,7 @@ QEMU_AUDIO_DRV=spice \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=com.redhat.spice.0 \
 -device usb-tablet,id=input0,bus=usb.0,port=1.2 \
 -spice port=5901,tls-port=5902,addr=0.0.0.0,x509-dir=/etc/pki/libvirt-spice,seamless-migration=on \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device intel-hda,id=sound0,bus=pci.0,addr=0x4 \
 -device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 \
 -device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=usb.0,port=2 \

diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
index 1b0f358162d0f452fef83dcac2936cdee791c437..896da5d044fd64e7dd3662c1e74b845732f45563 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args b/tests/qemuxml2argvdata/cpu-Haswell.args
index 276213437bb317cc3b80802f4b0ee5b2e621d8c8..8bbd6277fd02022f4d796d49e9da35cd6dfc62c0 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-Haswell.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args b/tests/qemuxml2argvdata/cpu-Haswell2.args
index ece79d1c68f476fb5b480548e99b602665c80944..703500be198c420a835e19fd8ee954378b43b10e 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-Haswell2.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell2.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args b/tests/qemuxml2argvdata/cpu-Haswell3.args
index dd2eddaed6026c1662f04945c5d40dfa34589b3a..55b66b343d705bb10043534e54e6a845356e55ea 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-Haswell3.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell3.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args b/tests/qemuxml2argvdata/cpu-cache-disable.args
index 7dab2091a1f8739d0025344ccff2a10a48f08df2..3aaaa97174c4e1941908c2362e9ac5a11f3d8595 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-cache-disable.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-cache-disable2.args b/tests/qemuxml2argvdata/cpu-cache-disable2.args
index 022bd7df744bf274faef364128a785166095a9a1..26b4317973c6db3cd45879796c52c4a9885b115d 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-cache-disable2.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable2.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.args b/tests/qemuxml2argvdata/cpu-cache-disable3.args
index 567e7420e8e4370c13cacde8fe3678de3e0caa25..faa52fe863531dde48fcdd8b9785f95244c4eb0b 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-cache-disable3.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable3.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
index a3ebf04bd3d1565bcc2664726d52e3cdc6ef84d6..c16f4188c6c421845bac2bb003d35c9e4c9120c3 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
+++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
index 44b0105f3ca650363938f33ddf5ab849fcff89ae..6f23b006986addbb0dfa063a10c38cc4f5e8ce14 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
index bd35198e0cfc6e6aecc9d977d501a98d040e0c7f..c44db77acff761de0edb371bf11cc60a86c7f0d4 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args b/tests/qemuxml2argvdata/cpu-check-default-none.args
index ebc03846499e413c5ceb6b54f2321415ed636a79..a73f4d8d49ec5d10188959de4e8298233efcd08e 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-check-default-none.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-none.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.args b/tests/qemuxml2argvdata/cpu-check-default-none2.args
index 05d176667b835091da2eb16951a3d6c8006e9ac7..b3a334be1c1e301fb671bd58e186d78352d37929 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-check-default-none2.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-none2.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.args b/tests/qemuxml2argvdata/cpu-check-default-partial.args
index 34ccfc6331fe394561d7c7702232c3767c2f6c3f..d33e7827eb688f79d8c9c4545f19b1f650eec0ec 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-check-default-partial.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-partial.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.args b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
index b454b74e14b3ecaba8cb03e1a7658bfa2bd36dbc..3ac1c1ce81bb502409e53e7444802b8eaafe5dd6 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-check-default-partial2.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-check-none.args b/tests/qemuxml2argvdata/cpu-check-none.args
index b454b74e14b3ecaba8cb03e1a7658bfa2bd36dbc..3ac1c1ce81bb502409e53e7444802b8eaafe5dd6 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-check-none.args
+++ b/tests/qemuxml2argvdata/cpu-check-none.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.args b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
index a911365399a40806b242449e85cc4ca022a4f739..5e6be6f32e1dd9ac6fae68e2f21b1aff93bfdce7 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-eoi-disabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.args b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
index 735839eaccb76c36156f9fe8c80c988bc754d5c4..42df00a03cef02e3b8c5d996dde3f4bb11857032 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-eoi-enabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-exact1.args b/tests/qemuxml2argvdata/cpu-exact1.args
index 5f40013a8106472e6cdd8e4c72fc8d70b8b9d657..261f7e19079a4bdd0259b36924a3af95f0aa14bf 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-exact1.args
+++ b/tests/qemuxml2argvdata/cpu-exact1.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
index 2f60af337ac92a0eb6dc20a16ea74d5ca4c586e4..517cf8920889448b4079f412ea1c8166c66caecc 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
+++ b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-exact2.args b/tests/qemuxml2argvdata/cpu-exact2.args
index 2f60af337ac92a0eb6dc20a16ea74d5ca4c586e4..517cf8920889448b4079f412ea1c8166c66caecc 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-exact2.args
+++ b/tests/qemuxml2argvdata/cpu-exact2.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-fallback.args b/tests/qemuxml2argvdata/cpu-fallback.args
index 4032e6ef83979c619faa6cedc26947d5113a2726..f30a288c0d3afa8880ce3be94bd4a1eb8b72be5c 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-fallback.args
+++ b/tests/qemuxml2argvdata/cpu-fallback.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
index 09479624755378bef84dbd605b0c04efcb5aab41..51bf5781902f605b44897e7179ca618ff2edfb4f 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
index 653b81c4fa4df8a8031f2703150b83677cf3a069..e21a889bee5c3238d7494f68334305467c18c816 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.args b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
index e8203967775bee8d6f1fd5470c31498ce1315bfd..0b0abd63a903c2eacfc3e5e5da215b2647d7e24b 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-host-model-fallback.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.args b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
index 1e154840b2e14b3b5a7ddbde733f85e3162d4a79..597ce529156860fc28dc142b93b0ce9618671f96 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-host-model.args b/tests/qemuxml2argvdata/cpu-host-model.args
index 8c0b68287647bb129d7b5e96af8361f9e692424d..dc53789aa90b889cf06b2f31afdd3932f6132771 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-host-model.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
index 1ea610891379409fa71eab0460dbe90f3f30bcdb..4cff096f78d66959116b59b4948f8d01957d60dd 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args b/tests/qemuxml2argvdata/cpu-host-passthrough.args
index ebc03846499e413c5ceb6b54f2321415ed636a79..a73f4d8d49ec5d10188959de4e8298233efcd08e 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-host-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-hotplug-startup.args b/tests/qemuxml2argvdata/cpu-hotplug-startup.args
index f5ba314b2fdbeabf33f783b06a4cfd2a0e14d299..46e0bf2c844de3cc611bbcd5e52d6c2a6bef023d 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-hotplug-startup.args
+++ b/tests/qemuxml2argvdata/cpu-hotplug-startup.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args b/tests/qemuxml2argvdata/cpu-kvmclock.args
index 111ad819d5edaa1cb1403816ec126bcd0530a018..6b954e75c8eb25e1851d4b5ac67d16473d80a3ea 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-kvmclock.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args b/tests/qemuxml2argvdata/cpu-minimum1.args
index c53076953b866644cca3ad8a0a4587c15078e34c..360a1755240d73d76f0e2e1852c50f282b925020 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-minimum1.args
+++ b/tests/qemuxml2argvdata/cpu-minimum1.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-minimum2.args b/tests/qemuxml2argvdata/cpu-minimum2.args
index d1474367a5432193ed037acf8004923f89fbf10e..e0c73e5af5bee0ba4ab2e2f77ec518b1a36545bb 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-minimum2.args
+++ b/tests/qemuxml2argvdata/cpu-minimum2.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.args b/tests/qemuxml2argvdata/cpu-no-removed-features.args
index b454b74e14b3ecaba8cb03e1a7658bfa2bd36dbc..3ac1c1ce81bb502409e53e7444802b8eaafe5dd6 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-no-removed-features.args
+++ b/tests/qemuxml2argvdata/cpu-no-removed-features.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
index a267cf5696d5bee985573f051b09decbc573d0d3..121a4b3f3656b460651b1c0e23e0931d86c996da 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args
+++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args b/tests/qemuxml2argvdata/cpu-numa-memshared.args
index 8568d7fea23bbd797f9b3af5d60c6448a2ef80d3..970900be7feac770de3495692554da61568f5cfe 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-numa-memshared.args
+++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
index 8eb3676ab16d11365b4057dbc61864c7faac2f56..e5ced8e924a6e7af38ba47c6cb745c83e417b70f 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
+++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-numa1.args b/tests/qemuxml2argvdata/cpu-numa1.args
index 8eb3676ab16d11365b4057dbc61864c7faac2f56..e5ced8e924a6e7af38ba47c6cb745c83e417b70f 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-numa1.args
+++ b/tests/qemuxml2argvdata/cpu-numa1.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-numa2.args b/tests/qemuxml2argvdata/cpu-numa2.args
index 8eb3676ab16d11365b4057dbc61864c7faac2f56..e5ced8e924a6e7af38ba47c6cb745c83e417b70f 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-numa2.args
+++ b/tests/qemuxml2argvdata/cpu-numa2.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-strict1.args b/tests/qemuxml2argvdata/cpu-strict1.args
index 49f711fc1eef211577497be0a07c66e3344eb41b..319a28cc8dc2a39b109de192d222dd2cf7d0f19d 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-strict1.args
+++ b/tests/qemuxml2argvdata/cpu-strict1.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-topology1.args b/tests/qemuxml2argvdata/cpu-topology1.args
index a269ebb53244dde35b78f6c552c625599d4feab8..e51fd4de900cba241144fc3ec367ddd2e9dc221a 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-topology1.args
+++ b/tests/qemuxml2argvdata/cpu-topology1.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-topology2.args b/tests/qemuxml2argvdata/cpu-topology2.args
index b875bafff6fee23a1357f7215d1b25ce4d0fe886..56783ad2b31ff1de0bef761d91c743a9009a2817 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-topology2.args
+++ b/tests/qemuxml2argvdata/cpu-topology2.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-topology3.args b/tests/qemuxml2argvdata/cpu-topology3.args
index a269ebb53244dde35b78f6c552c625599d4feab8..e51fd4de900cba241144fc3ec367ddd2e9dc221a 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-topology3.args
+++ b/tests/qemuxml2argvdata/cpu-topology3.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
index e36f58e2b3165ee22337a27242763aba80aeeac3..0f6f79653ebef43ec466572e2f50c4cadbdc58d6 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args
+++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.args b/tests/qemuxml2argvdata/cputune-zero-shares.args
index 91290fbe0e107fc07d7ae276f79e623072e3998c..e66bd7deb010e2a38ad8fe08fc6b255c1944a343 100644 (file)
--- a/tests/qemuxml2argvdata/cputune-zero-shares.args
+++ b/tests/qemuxml2argvdata/cputune-zero-shares.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/cputune.args b/tests/qemuxml2argvdata/cputune.args
index 91290fbe0e107fc07d7ae276f79e623072e3998c..e66bd7deb010e2a38ad8fe08fc6b255c1944a343 100644 (file)
--- a/tests/qemuxml2argvdata/cputune.args
+++ b/tests/qemuxml2argvdata/cputune.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/debug-threads.args b/tests/qemuxml2argvdata/debug-threads.args
index 65c389c9dfc9e3578e2a1aa9e13ce6b96eeeea61..9b7e24adbf7ff89181e789c29b11620908b6aa11 100644 (file)
--- a/tests/qemuxml2argvdata/debug-threads.args
+++ b/tests/qemuxml2argvdata/debug-threads.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.args b/tests/qemuxml2argvdata/default-kvm-host-arch.args
index 38b4ee0b56e24035ee62e1dbac630ff5e13a233f..e3926241026f3c19f8b93ae954f4ea5e61ab8123 100644 (file)
--- a/tests/qemuxml2argvdata/default-kvm-host-arch.args
+++ b/tests/qemuxml2argvdata/default-kvm-host-arch.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.args b/tests/qemuxml2argvdata/default-qemu-host-arch.args
index 24660946f9470a5a018718580e9bf47a72630856..85e6b20124fe59d993df4f4bd6bcca49c22e80f4 100644 (file)
--- a/tests/qemuxml2argvdata/default-qemu-host-arch.args
+++ b/tests/qemuxml2argvdata/default-qemu-host-arch.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/disk-aio.args b/tests/qemuxml2argvdata/disk-aio.args
index 965ac39b64c6198bc27b32b6ed00f15556bc1e5e..e2f52f055827105e098cb1f6507d14c9cc5d8eb7 100644 (file)
--- a/tests/qemuxml2argvdata/disk-aio.args
+++ b/tests/qemuxml2argvdata/disk-aio.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,readonly=on,aio=threads \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/disk-blockio.args b/tests/qemuxml2argvdata/disk-blockio.args
index cb52e527f12c92aa56bfe55b28e2d9e6cee0f97a..99ecabd724697ad452dc0637f6cf3ebdb63cf050 100644 (file)
--- a/tests/qemuxml2argvdata/disk-blockio.args
+++ b/tests/qemuxml2argvdata/disk-blockio.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
 -drive file=/tmp/idedisk.img,format=raw,if=none,id=drive-ide0-0-2 \
 -device ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,bootindex=1,logical_block_size=512,physical_block_size=512 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.args b/tests/qemuxml2argvdata/disk-cdrom-network.args
index 91228511cfd99207067bc9f3f0ec23151532faca..f34ede7c8b77c19068634cbdcdf49c8c528278dd 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cdrom-network.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-network.args
@@ -29,4 +29,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
 -drive 'file=https://host.name:443/url/path/file.iso?test=val,format=raw,if=none,id=drive-ide0-1-0,readonly=on' \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.args b/tests/qemuxml2argvdata/disk-cdrom-tray.args
index c425d9d87529353d3f8bf7d929d100c98ee49461..3a6a14a90a4daeea8873c9ac2569c9ebb58ead33 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cdrom-tray.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-tray.args
@@ -31,4 +31,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
 -drive if=none,id=drive-ide0-1-1,readonly=on \
 -device ide-cd,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.args b/tests/qemuxml2argvdata/disk-copy_on_read.args
index ace793b872987d9231d0f46ad2a3c24235ce7b88..059bc11257c35433ec7fc04acbab5751da53c363 100644 (file)
--- a/tests/qemuxml2argvdata/disk-copy_on_read.args
+++ b/tests/qemuxml2argvdata/disk-copy_on_read.args
@@ -31,5 +31,5 @@ QEMU_AUDIO_DRV=none \
 -drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
 -netdev user,id=hostnet0 \
--device virtio-net-pci,tx=bh,netdev=hostnet0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device virtio-net-pci,tx=bh,netdev=hostnet0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.args b/tests/qemuxml2argvdata/disk-floppy-tray.args
index 06a2548ee76ced0420beefd9603289b380657d1f..aabc225cf1f6ea2755051b095ec1591d1d64b4c0 100644 (file)
--- a/tests/qemuxml2argvdata/disk-floppy-tray.args
+++ b/tests/qemuxml2argvdata/disk-floppy-tray.args
@@ -30,4 +30,4 @@ QEMU_AUDIO_DRV=none \
 -drive if=none,id=drive-fdc0-0-1 \
 -global isa-fdc.driveA=drive-fdc0-0-0 \
 -global isa-fdc.driveB=drive-fdc0-0-1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/disk-geometry.args b/tests/qemuxml2argvdata/disk-geometry.args
index 132aab4c11e5724a8caffaae3b28615a90d2b01f..7197829db80b09812b2e532d71b7797a24ed850c 100644 (file)
--- a/tests/qemuxml2argvdata/disk-geometry.args
+++ b/tests/qemuxml2argvdata/disk-geometry.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1,cyls=16383,heads=16,secs=63,bios-chs-trans=lba \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/disk-ide-split.args b/tests/qemuxml2argvdata/disk-ide-split.args
index 2404f77cde5e868d4b778856cff1fc520ef9cc76..4e1f9ee8a96272e0839e1bb8d4e58222d39ef37d 100644 (file)
--- a/tests/qemuxml2argvdata/disk-ide-split.args
+++ b/tests/qemuxml2argvdata/disk-ide-split.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
 -drive file=/tmp/idedisk.img,format=raw,if=none,id=drive-ide0-0-2 \
 -device ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.args b/tests/qemuxml2argvdata/disk-ide-wwn.args
index 1412337add2ae76ddd12227c22ee41ce8caf5068..ab657d59bebe04ea425ad36551e4f9ba76f65868 100644 (file)
--- a/tests/qemuxml2argvdata/disk-ide-wwn.args
+++ b/tests/qemuxml2argvdata/disk-ide-wwn.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1 \
 -device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,bootindex=1,wwn=0x5000c50015ea71ad,serial=WD-WMAP9A966149 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/disk-ioeventfd.args b/tests/qemuxml2argvdata/disk-ioeventfd.args
index 0c2dbe069832184c9914fc3849950ef92b0eeca4..d2f491b8afb83569f58c9c51efe9f1a6e48e53ca 100644 (file)
--- a/tests/qemuxml2argvdata/disk-ioeventfd.args
+++ b/tests/qemuxml2argvdata/disk-ioeventfd.args
@@ -31,5 +31,5 @@ QEMU_AUDIO_DRV=none \
 -drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
 -netdev user,id=hostnet0 \
--device virtio-net-pci,tx=bh,ioeventfd=off,netdev=hostnet0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device virtio-net-pci,tx=bh,ioeventfd=off,netdev=hostnet0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/disk-network-gluster.args b/tests/qemuxml2argvdata/disk-network-gluster.args
index 99273286ece4d40cfd36d0618bf7556f74539c07..2dab1b8896036552f453a8cab1362971b81a30ec 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-gluster.args
+++ b/tests/qemuxml2argvdata/disk-network-gluster.args
@@ -25,8 +25,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -usb \
 -drive file=gluster://example.org:6000/Volume1/Image,file.debug=4,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
 -drive 'file=gluster+unix:///Volume2/Image?socket=/path/to/sock,file.debug=4,format=raw,if=none,id=drive-virtio-disk1' \
--device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,id=virtio-disk1 \
 -drive file.driver=gluster,file.volume=Volume3,file.path=Image.qcow2,file.server.0.type=tcp,file.server.0.host=example.org,file.server.0.port=6000,file.server.1.type=tcp,file.server.1.host=example.org,file.server.1.port=24007,file.server.2.type=unix,file.server.2.socket=/path/to/sock,file.debug=4,format=qcow2,if=none,id=drive-virtio-disk2 \
--device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,id=virtio-disk2
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk2,id=virtio-disk2

diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
index e9eb41db6831344e244d134441d8fcfacf50a525..738101b3a7c6cb423d26cc8177b5a00f61fd0e9c 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
@@ -23,16 +23,16 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
--device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
+-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
 -usb \
 -drive file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example,file.lun=0,file.transport=tcp,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
 -drive file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example,file.lun=1,file.transport=tcp,format=raw,if=none,id=drive-virtio-disk1 \
--device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
 -drive file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example:storage,file.lun=1,file.transport=tcp,file.user=myname,file.password-secret=AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A,format=raw,if=none,id=drive-virtio-disk2 \
--device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,id=virtio-disk2 \
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,id=virtio-disk2 \
 -drive file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example:storage,file.lun=2,file.transport=tcp,file.user=myname,file.password-secret=AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A,format=raw,if=none,id=drive-virtio-disk3 \
--device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk3,id=virtio-disk3 \
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,id=virtio-disk3 \
 -drive file.driver=iscsi,file.portal=example.org:3260,file.target=iqn.1992-01.com.example,file.lun=0,file.transport=tcp,format=raw,if=none,id=drive-scsi0-0-0-0 \
 -device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 \
 -drive file.driver=iscsi,file.portal=example.org:3260,file.target=iqn.1992-01.com.example:server,file.lun=0,file.transport=tcp,file.initiator-name=iqn.1992-01.com.example:client,format=raw,if=none,id=drive-scsi0-0-0-1 \

diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.args b/tests/qemuxml2argvdata/disk-network-iscsi.args
index 59a3cb8452e7430a10b21c9be5f197bc91100eb4..2b347064dcf4afad7e2b406df7a3da4a83f815cb 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-iscsi.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi.args
@@ -23,15 +23,15 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
--device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
+-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
 -usb \
 -drive file=iscsi://example.org:6000/iqn.1992-01.com.example/0,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
 -drive file=iscsi://example.org:6000/iqn.1992-01.com.example/1,format=raw,if=none,id=drive-virtio-disk1 \
--device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
 -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:6000/iqn.1992-01.com.example%3Astorage/1,format=raw,if=none,id=drive-virtio-disk2 \
--device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,id=virtio-disk2 \
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,id=virtio-disk2 \
 -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:6000/iqn.1992-01.com.example%3Astorage/2,format=raw,if=none,id=drive-virtio-disk3 \
--device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk3,id=virtio-disk3 \
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,id=virtio-disk3 \
 -drive file=iscsi://example.org:3260/iqn.1992-01.com.example/0,format=raw,if=none,id=drive-scsi0-0-0-0 \
 -device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0

diff --git a/tests/qemuxml2argvdata/disk-network-nbd.args b/tests/qemuxml2argvdata/disk-network-nbd.args
index fd6fb2a98db71ad9433dbf45bc08c000ec6e4a6e..58101b89e71548eedcaa2b31b682adf1f28a76e0 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-nbd.args
+++ b/tests/qemuxml2argvdata/disk-network-nbd.args
@@ -25,12 +25,12 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -usb \
 -drive file=nbd:example.org:6000,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
 -drive file=nbd:example.org:6000:exportname=bar,format=raw,if=none,id=drive-virtio-disk1 \
--device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,id=virtio-disk1 \
 -drive 'file=nbd://[::1]:6000,format=raw,if=none,id=drive-virtio-disk2' \
--device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,id=virtio-disk2 \
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk2,id=virtio-disk2 \
 -drive 'file=nbd://[::1]:6000/bar,format=raw,if=none,id=drive-virtio-disk3' \
--device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,id=virtio-disk3 \
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk3,id=virtio-disk3 \
 -drive file=nbd:unix:/var/run/nbdsock:exportname=bar,format=raw,if=none,id=drive-virtio-disk4 \
--device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk4,id=virtio-disk4
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk4,id=virtio-disk4

diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.args b/tests/qemuxml2argvdata/disk-network-sheepdog.args
index fb7102fbb8c26ddc881e425d5b7464e54aaca87e..44032292f4f22230c26edac4495489342cf3243b 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-sheepdog.args
+++ b/tests/qemuxml2argvdata/disk-network-sheepdog.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMU,,Guest,,,,1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -drive file=sheepdog:example.org:6000:image,,with,,commas,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0

diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.args b/tests/qemuxml2argvdata/disk-network-source-auth.args
index 833a0fddd862167e88b392316b8e58c72f5bddd4..8e07be7ebc34577f83cb560bc9c026c4a83e9acc 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-source-auth.args
+++ b/tests/qemuxml2argvdata/disk-network-source-auth.args
@@ -25,8 +25,8 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -usb \
 -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:6000/iqn.1992-01.com.example%3Astorage/1,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
 -drive 'file=rbd:pool/image:id=myname:key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=:auth_supported=cephx\;none:mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,id=drive-virtio-disk1' \
--device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,id=virtio-disk1 \
 -drive 'file=rbd:pool/image2:id=myname:key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=:auth_supported=cephx\;none:mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,id=drive-virtio-disk2' \
--device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,id=virtio-disk2
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk2,id=virtio-disk2

diff --git a/tests/qemuxml2argvdata/disk-order.args b/tests/qemuxml2argvdata/disk-order.args
index efce8661dbd556f6343d0a171dfbcc413c671959..be33dfc54566b7fafa4a3e0a6b265ee296982668 100644 (file)
--- a/tests/qemuxml2argvdata/disk-order.args
+++ b/tests/qemuxml2argvdata/disk-order.args
@@ -29,7 +29,7 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
 -drive file=/tmp/data.img,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0 \
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0 \
 -drive file=/tmp/logs.img,format=raw,if=none,id=drive-virtio-disk1 \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,id=virtio-disk1 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.args b/tests/qemuxml2argvdata/disk-readonly-disk.args
index 0e769fdc922153de6c9c4067daf5d6fd6049b0d1..3102c4f27df10adb6f74fb3692e89662a6518ede 100644 (file)
--- a/tests/qemuxml2argvdata/disk-readonly-disk.args
+++ b/tests/qemuxml2argvdata/disk-readonly-disk.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -drive file=/dev/sr0,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/disk-sata-device.args b/tests/qemuxml2argvdata/disk-sata-device.args
index 547fba75731ba638f67e06d01e385a96fe0d8ab9..1b8dac8e4b4e1fef8119f35b6f32e61c5f5561be 100644 (file)
--- a/tests/qemuxml2argvdata/disk-sata-device.args
+++ b/tests/qemuxml2argvdata/disk-sata-device.args
@@ -23,8 +23,8 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
--device ahci,id=sata0,bus=pci.0,addr=0x3 \
+-device ahci,id=sata0,bus=pci.0,addr=0x2 \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
 -device ide-hd,bus=sata0.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-split.args b/tests/qemuxml2argvdata/disk-scsi-disk-split.args
index 64819a19aa85b565a987994e872614e2a7037b45..eb2bf3cbc3bb2cf7514f3377c230a5a0628500a9 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-disk-split.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-split.args
@@ -23,10 +23,10 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
--device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
--device lsi,id=scsi1,bus=pci.0,addr=0x4 \
--device lsi,id=scsi2,bus=pci.0,addr=0x5 \
--device virtio-scsi-pci,id=scsi3,bus=pci.0,addr=0x6 \
+-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
+-device lsi,id=scsi1,bus=pci.0,addr=0x3 \
+-device lsi,id=scsi2,bus=pci.0,addr=0x4 \
+-device virtio-scsi-pci,id=scsi3,bus=pci.0,addr=0x5 \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-1-0,readonly=on \
 -device scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,id=scsi0-0-1-0 \
@@ -36,4 +36,4 @@ QEMU_AUDIO_DRV=none \
 -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=1,drive=drive-scsi0-0-0-1,id=scsi0-0-0-1,bootindex=1 \
 -drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-1-1 \
 -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=1,lun=1,drive=drive-scsi0-0-1-1,id=scsi0-0-1-1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6

diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
index 5d922c6d87de7c49861b2687ef0b32bcf099b2c5..69c8f47e569f695f6484a1a65b73ab5d64575507 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
@@ -23,11 +23,11 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
--device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
--device lsi,id=scsi1,bus=pci.0,addr=0x4 \
+-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
+-device lsi,id=scsi1,bus=pci.0,addr=0x3 \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-0-0,readonly=on \
 -device scsi-cd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,vendor=SEAGATE,product=ST3146707LC \
 -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi1-0-0,readonly=on \
 -device 'scsi-hd,bus=scsi1.0,scsi-id=0,drive=drive-scsi1-0-0,id=scsi1-0-0,bootindex=1,vendor=SEA GATE,product=ST67 807GD' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
index 8ad1bcb7e078cdea3f4aab404221401048c7944f..4fd37a0268f6e8ce28a6272a9718ff8de3348818 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
@@ -23,11 +23,11 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
--device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
--device lsi,id=scsi1,bus=pci.0,addr=0x4 \
+-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
+-device lsi,id=scsi1,bus=pci.0,addr=0x3 \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-1-0,readonly=on \
 -device scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,id=scsi0-0-1-0,wwn=0x5000c50015ea71ac,serial=WD-WMAP9A966149 \
 -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi0-0-0-0 \
 -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1,wwn=0x5000c50015ea71ad \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
index b6343709d22e4c5d36334ab12d42ce4d0379076b..1265f6ecd712b7eecf26a06c18314b7837a03670 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
+++ b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
@@ -23,11 +23,11 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
--device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
--device lsi,id=scsi1,bus=pci.0,addr=0x4 \
+-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
+-device lsi,id=scsi1,bus=pci.0,addr=0x3 \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-0-0 \
 -device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 \
 -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi0-0-1-1 \
 -device scsi-block,bus=scsi0.0,channel=0,scsi-id=1,lun=1,drive=drive-scsi0-0-1-1,id=scsi0-0-1-1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/disk-serial.args b/tests/qemuxml2argvdata/disk-serial.args
index 3fad5e098a42db8c1d6e404d0b8d6d023da6809d..016e8b435465303e0611eeb30fe6a7a1eb810b6e 100644 (file)
--- a/tests/qemuxml2argvdata/disk-serial.args
+++ b/tests/qemuxml2argvdata/disk-serial.args
@@ -29,4 +29,4 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/AllSerialChars,format=raw,if=none,id=drive-ide0-0-2 \
 -device 'ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,serial=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_\ .+' \
 -drive file=/some/file,format=raw,if=sd,index=0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/disk-snapshot.args b/tests/qemuxml2argvdata/disk-snapshot.args
index 884c15683dfb27e221466b955c16ab9b9e2c6328..53bef27c1a18f92f6d72472e604d6e5a73b46fe5 100644 (file)
--- a/tests/qemuxml2argvdata/disk-snapshot.args
+++ b/tests/qemuxml2argvdata/disk-snapshot.args
@@ -30,4 +30,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.2,unit=0,drive=drive-ide0-2-0,id=ide0-2-0 \
 -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/disk-source-pool-mode.args b/tests/qemuxml2argvdata/disk-source-pool-mode.args
index 9f335e62be953e46885b5e1a0b5408be9adcc6b1..0ea20e74be4cedd0de99fbfac19cb5ed5013ce28 100644 (file)
--- a/tests/qemuxml2argvdata/disk-source-pool-mode.args
+++ b/tests/qemuxml2argvdata/disk-source-pool-mode.args
@@ -32,4 +32,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=3,drive=drive-ide0-0-3,id=ide0-0-3,bootindex=1 \
 -drive file=iscsi://iscsi.example.com:3260/demo-target/3,format=raw,if=none,id=drive-ide0-0-4,readonly=on \
 -device ide-cd,bus=ide.0,unit=4,drive=drive-ide0-0-4,id=ide0-0-4 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/disk-source-pool.args b/tests/qemuxml2argvdata/disk-source-pool.args
index d662269a9555734e74716a7d72d024f140d7a12c..1e17d3482df4322fe34b371845b1e4df582edafd 100644 (file)
--- a/tests/qemuxml2argvdata/disk-source-pool.args
+++ b/tests/qemuxml2argvdata/disk-source-pool.args
@@ -31,7 +31,7 @@ QEMU_AUDIO_DRV=none \
 -drive file=/tmp/idedisk.img,format=raw,if=none,id=drive-ide0-0-2 \
 -device ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,bootindex=1 \
 -drive file=fat:/some/dir/device/vol1,if=none,id=drive-virtio-disk0,readonly=on \
--device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 \
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0 \
 -drive file=fat:/some/dir/device/vol2,if=none,id=drive-virtio-disk1,readonly=on \
--device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/disk-usb-device-removable.args b/tests/qemuxml2argvdata/disk-usb-device-removable.args
index aca5eeffdcfa3f46b6f42ab85f45d2f514ef35b3..901cfeb22f6a2eab9e8370eb88bedd3f47d266ae 100644 (file)
--- a/tests/qemuxml2argvdata/disk-usb-device-removable.args
+++ b/tests/qemuxml2argvdata/disk-usb-device-removable.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -drive file=/tmp/usbdisk.img,format=raw,if=none,id=drive-usb-disk0 \
 -device usb-storage,bus=usb.0,port=1,drive=drive-usb-disk0,id=usb-disk0,removable=on \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/disk-usb-device.args b/tests/qemuxml2argvdata/disk-usb-device.args
index 4cdda76d511a95066bae78e5449500c629b2dda1..946a74e0b79ddc2d7ca3aea284dabb7792791f68 100644 (file)
--- a/tests/qemuxml2argvdata/disk-usb-device.args
+++ b/tests/qemuxml2argvdata/disk-usb-device.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -drive file=/tmp/usbdisk.img,format=raw,if=none,id=drive-usb-disk0 \
 -device usb-storage,bus=usb.0,port=1,drive=drive-usb-disk0,id=usb-disk0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/disk-virtio.args b/tests/qemuxml2argvdata/disk-virtio.args
index bca665cd5974fc7ea5962555d62cc8e4872916c4..6787d46b59bc65bd1089b2c7901641640e8af0f6 100644 (file)
--- a/tests/qemuxml2argvdata/disk-virtio.args
+++ b/tests/qemuxml2argvdata/disk-virtio.args
@@ -29,6 +29,6 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
 -drive file=/tmp/data.img,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0 \
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0 \
 -drive file=/tmp/logs.img,format=raw,if=none,id=drive-virtio-disk1 \
--device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,id=virtio-disk1

diff --git a/tests/qemuxml2argvdata/encrypted-disk.args b/tests/qemuxml2argvdata/encrypted-disk.args
index 1ffc287ea295b0a6ca33bbf817330290494736a5..a98e0fc03a7e439aa9853a3b29076394a8f7f8bc 100644 (file)
--- a/tests/qemuxml2argvdata/encrypted-disk.args
+++ b/tests/qemuxml2argvdata/encrypted-disk.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -object secret,id=virtio-disk0-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 -drive file=/storage/guest_disks/encryptdisk,encrypt.format=luks,encrypt.key-secret=virtio-disk0-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk0 \
 -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/event_idx.args b/tests/qemuxml2argvdata/event_idx.args
index e1a9cb3565ac7b604b50af72d0ec6e138c1d9359..519a46ce1d559132048d0e140d4464f19bb96c37 100644 (file)
--- a/tests/qemuxml2argvdata/event_idx.args
+++ b/tests/qemuxml2argvdata/event_idx.args
@@ -31,5 +31,5 @@ QEMU_AUDIO_DRV=none \
 -drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
 -netdev user,id=hostnet0 \
--device virtio-net-pci,event_idx=off,netdev=hostnet0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device virtio-net-pci,event_idx=off,netdev=hostnet0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.args b/tests/qemuxml2argvdata/floppy-drive-fat.args
index 9d5fa3c7716a69564ca5a812066f366abd29a7ec..79cfb2f5fadfdd5ee1968669a41e2facfd8665a2 100644 (file)
--- a/tests/qemuxml2argvdata/floppy-drive-fat.args
+++ b/tests/qemuxml2argvdata/floppy-drive-fat.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -drive file=fat:floppy:/var/somefiles,if=none,id=drive-fdc0-0-0,readonly=on \
 -global isa-fdc.driveA=drive-fdc0-0-0 \
 -global isa-fdc.bootindexA=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/fs9p.args b/tests/qemuxml2argvdata/fs9p.args
index 6eee0ac89062440e0689bb9e689e46a812d2e8f3..48de1371919777be5496a0c426b904233294e705 100644 (file)
--- a/tests/qemuxml2argvdata/fs9p.args
+++ b/tests/qemuxml2argvdata/fs9p.args
@@ -24,8 +24,8 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \
--device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,bus=pci.0,addr=0x3 \
+-device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,bus=pci.0,addr=0x2 \
 -fsdev local,security_model=mapped,writeout=immediate,id=fsdev-fs1,path=/export/to/guest2 \
--device virtio-9p-pci,id=fs1,fsdev=fsdev-fs1,mount_tag=/import/from/host2,bus=pci.0,addr=0x4 \
+-device virtio-9p-pci,id=fs1,fsdev=fsdev-fs1,mount_tag=/import/from/host2,bus=pci.0,addr=0x3 \
 -fsdev handle,writeout=immediate,id=fsdev-fs2,path=/export/to/guest3 \
--device virtio-9p-pci,id=fs2,fsdev=fsdev-fs2,mount_tag=/import/from/host3,bus=pci.0,addr=0x5
+-device virtio-9p-pci,id=fs2,fsdev=fsdev-fs2,mount_tag=/import/from/host3,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.args b/tests/qemuxml2argvdata/graphics-egl-headless.args
index 343273fda0ffe7ab2e46fd078f565780c7e3e1cf..15d6b05f061f66d555af5d2322ae3b8e8d0e8f02 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-egl-headless.args
@@ -25,4 +25,4 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -display egl-headless \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
index e35091025b62365260a89d6d3007b2c0a2e9868b..3cb348e8185438d73e7a4a9ec0cef38248623454 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
+++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
@@ -28,4 +28,4 @@ DISPLAY=:0.1 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -full-screen \
 -display sdl \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/graphics-sdl.args b/tests/qemuxml2argvdata/graphics-sdl.args
index 4cfa15550a15cba24f67341e857680ee7d4b25ca..95e56ebf7232d7752f7ab4caed3231b54ed55151 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-sdl.args
+++ b/tests/qemuxml2argvdata/graphics-sdl.args
@@ -27,4 +27,4 @@ DISPLAY=:0.1 \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -display sdl \
--vga std
+-device VGA,id=video0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
index 1a6f5eabf35dcf421e255840b7fe6bfb7fa690f1..0e561a8b753cf2690ad78c47f454e052fc0b1688 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
+++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
@@ -26,8 +26,6 @@ QEMU_AUDIO_DRV=spice \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,disable-agent-file-xfer=on,seamless-migration=on \
--vga qxl \
--global qxl-vga.ram_size=67108864 \
--global qxl-vga.vram_size=33554432 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \
 -device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
index c4dd28fe475447037836e2357c2a6a93f540e0da..03c8c58e6c6070c06e19edafbb810df8e8557f9e 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
+++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
@@ -29,5 +29,5 @@ QEMU_AUDIO_DRV=spice \
 -chardev spicevmc,id=charchannel0,name=vdagent \
 -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=com.redhat.spice.0 \
 -spice port=5903,tls-port=5904,addr=127.0.0.1,agent-mouse=off,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,seamless-migration=on \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
index c590bef6af7a32a272c20b6ba898e8a22d2287da..6f797644464d304b2a6956ab284b517f63c66cc0 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=spice \
 -no-acpi \
 -usb \
 -spice unix,addr=/tmp/lib/domain--1-QEMUGuest1/spice.sock,seamless-migration=on \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
index c590bef6af7a32a272c20b6ba898e8a22d2287da..6f797644464d304b2a6956ab284b517f63c66cc0 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=spice \
 -no-acpi \
 -usb \
 -spice unix,addr=/tmp/lib/domain--1-QEMUGuest1/spice.sock,seamless-migration=on \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.args b/tests/qemuxml2argvdata/graphics-spice-compression.args
index a2fcbfdd68248ed3eb99457bc7b1807ea370a590..7499b1b4b9de685a55e31bf819ccf64195cac895 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-compression.args
+++ b/tests/qemuxml2argvdata/graphics-spice-compression.args
@@ -26,8 +26,6 @@ QEMU_AUDIO_DRV=spice \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,seamless-migration=on \
--vga qxl \
--global qxl-vga.ram_size=67108864 \
--global qxl-vga.vram_size=33554432 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \
 -device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
index 38a1b3aa23925dcafb8e04643b08fc83a6b0b60b..66d6e491bd636edee5e680b996c1c4a1fcf2ade4 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
@@ -27,7 +27,5 @@ QEMU_AUDIO_DRV=spice \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -spice port=5903,addr=127.0.0.1,seamless-migration=on \
 -display egl-headless \
--vga qxl \
--global qxl-vga.ram_size=67108864 \
--global qxl-vga.vram_size=33554432 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.args b/tests/qemuxml2argvdata/graphics-spice-no-args.args
index 4d0d4fa10c63b524a50eb2c07d59bc182eb57e01..016d19d9ebd629f95d1d295787e4499c45a7ebb1 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-no-args.args
+++ b/tests/qemuxml2argvdata/graphics-spice-no-args.args
@@ -24,5 +24,5 @@ QEMU_AUDIO_DRV=spice \
 -no-acpi \
 -usb \
 -spice port=0,seamless-migration=on \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
index d4892deb58c9be2665ff0e4d1cc5d7a4331d2bb2..f9ba765198a7666c7b0f2615e94fa4611b9bbcd9 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
+++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
@@ -26,8 +26,6 @@ QEMU_AUDIO_DRV=spice \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,seamless-migration=on \
--vga qxl \
--global qxl-vga.ram_size=67108864 \
--global qxl-vga.vram_size=33554432 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \
 -device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.args b/tests/qemuxml2argvdata/graphics-spice-sasl.args
index 2bec8485a993c1c423ae81d8d841f864cb07aa07..306f2923881f5cb263c3635e4d304a88c16290b1 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-sasl.args
+++ b/tests/qemuxml2argvdata/graphics-spice-sasl.args
@@ -27,7 +27,5 @@ SASL_CONF_PATH=/root/.sasl2 \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -spice port=5903,tls-port=5904,addr=127.0.0.1,sasl=on,x509-dir=/etc/pki/libvirt-spice,tls-channel=default,seamless-migration=on \
--vga qxl \
--global qxl-vga.ram_size=67108864 \
--global qxl-vga.vram_size=33554432 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.args b/tests/qemuxml2argvdata/graphics-spice-socket.args
index a0fd778a5836462fa64d42d365bf732b9a4dcb35..71278eaab5c70a4b7e40ea2f302be0a7e34448d8 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-socket.args
+++ b/tests/qemuxml2argvdata/graphics-spice-socket.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=spice \
 -no-acpi \
 -usb \
 -spice unix,addr=/tmp/spice.sock,seamless-migration=on \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.args b/tests/qemuxml2argvdata/graphics-spice-timeout.args
index c23d02d05c54d0909ce2e7d3d141df2f96ff9d16..6ff61dfa88be191f940c375f37ac408a9427256a 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-timeout.args
+++ b/tests/qemuxml2argvdata/graphics-spice-timeout.args
@@ -33,6 +33,6 @@ QEMU_AUDIO_DRV=spice \
 -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:71:70:89,bus=pci.0,addr=0x7 \
 -device usb-tablet,id=input0,bus=usb.0,port=1 \
 -spice port=5900,addr=127.0.0.1,seamless-migration=on \
--vga std \
+-device VGA,id=video0,bus=pci.0,addr=0x2 \
 -device AC97,id=sound0,bus=pci.0,addr=0x3 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5

diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
index aae5910b07732bfba4f73b10e24e21eb91c9eb02..cfe591e882349d604dd9f17ea78a31a95c3eff98 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
+++ b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
@@ -27,7 +27,7 @@ QEMU_AUDIO_DRV=spice \
 -device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
 -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
 -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,tls-channel=usbredir,image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,disable-copy-paste=on,seamless-migration=on \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -chardev socket,id=charredir0,host=localhost,port=4000 \
 -device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=1 \
 -chardev spicevmc,id=charredir1,name=usbredir \

diff --git a/tests/qemuxml2argvdata/graphics-spice.args b/tests/qemuxml2argvdata/graphics-spice.args
index 4f5a08621ff65930fbefd221537c57d740bae941..7a9e55c59fbecb82d24a1aacc6a3d422644889bd 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice.args
+++ b/tests/qemuxml2argvdata/graphics-spice.args
@@ -26,8 +26,6 @@ QEMU_AUDIO_DRV=spice \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=default,tls-channel=main,plaintext-channel=inputs,image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,disable-copy-paste=on,disable-agent-file-xfer=on,seamless-migration=on \
--vga qxl \
--global qxl-vga.ram_size=67108864 \
--global qxl-vga.vram_size=33554432 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x2 \
 -device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
index 2add4f43324283967042c59740ab380890b0ba3c..d11ac68cb12fb9299f4e6ac99c879da6b765a95c 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -vnc unix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
index 351a43351d630df136caace17e31ad704739263a..bbb464433d3435c5500560a1909267309a62b9a6 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -usb \
 -vnc unix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
index 2090f43609e4286d6d445e1911037792b0e5549d..5e9f41794001e9afb66878039df8caa469c5deed 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -vnc '[2001:1:2:3:4:5:1234:1234]:3' \
 -display egl-headless \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
index dea9aad2c5853383aaf913dd172c816f11a554df..4b314c4269a30c228d227aea950fb58efcb4bbab 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -vnc '[2001:1:2:3:4:5:1234:1234]:3' \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/graphics-vnc-none.args b/tests/qemuxml2argvdata/graphics-vnc-none.args
index 87f9268c5994e5096912de02f55bc9e34d453b5e..c75eb0ed522ace9a22918bd7fa89ea09e15a9dda 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-none.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-none.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -usb \
 -vnc none \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.args b/tests/qemuxml2argvdata/graphics-vnc-policy.args
index 8e2023005012c6397a926f6d7b0aef02df018bc6..dbdfb0074e132c9a9ad088d7172705d163e0f77f 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-policy.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-policy.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -vnc '[::]:59630,share=allow-exclusive' \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
index 5fff7d85b1d8f80fc1273d9b00d4d915c67dee93..b598886017c5b0f10e4cf21c8feb2fc68128d78d 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -vnc 127.0.0.1:0 \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.args b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
index fd8caee0da8a99a1e6c1260bd3bf19a1861b752b..c566c92c0082681b5aa2a8b594b60a55022e250f 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
@@ -27,4 +27,4 @@ SASL_CONF_PATH=/root/.sasl2 \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -vnc 127.0.0.1:3,sasl \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
index e77d772af1b2b433e1ddf20be07365860ead642c..bede4e2e81a634fe491c7789ca3a88a9f8d5d409 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -usb \
 -vnc vnc=unix:/tmp/foo=bar.sock \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket.args b/tests/qemuxml2argvdata/graphics-vnc-socket.args
index 16f931b32ead32ae4afe51786bfe406eeea4bacb..d99802b334508a598554ef1345758a95795afd88 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-socket.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -usb \
 -vnc unix:/tmp/vnc.sock \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.args b/tests/qemuxml2argvdata/graphics-vnc-tls.args
index f1e0877a0db1ee1c845cd815d5ecf9194da2914d..e5b3f87ea0a19c779784b971be7518e91ecd47b3 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.args
@@ -25,4 +25,4 @@ SASL_CONF_PATH=/root/.sasl2 \
 -no-acpi \
 -usb \
 -vnc 127.0.0.1:3,tls,x509verify=/etc/pki/libvirt-vnc,sasl \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.args b/tests/qemuxml2argvdata/graphics-vnc-websocket.args
index 30c10e3490b325c493bd7d2e8451ab8dd6b51415..c4b11106debd359e659abd611d4075e32deaee1f 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-websocket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-websocket.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -usb \
 -vnc 127.0.0.1:0,websocket=5700 \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/graphics-vnc.args b/tests/qemuxml2argvdata/graphics-vnc.args
index dea9aad2c5853383aaf913dd172c816f11a554df..4b314c4269a30c228d227aea950fb58efcb4bbab 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc.args
+++ b/tests/qemuxml2argvdata/graphics-vnc.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -vnc '[2001:1:2:3:4:5:1234:1234]:3' \
--vga cirrus
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
index 96de25ff7ef0ed06c27a38fa7e353bfe38baf860..1804f87133298405cbbdf9d068cbf91d23b61c18 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device vfio-pci,id=hostdev0,sysfsdev=/sys/bus/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc,bus=pci.0,addr=0x3
+-device vfio-pci,id=hostdev0,sysfsdev=/sys/bus/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.args b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
index 14b0b4e18b617c77f20d4d69f972403db2be5baa..ab38116c35038257583e8cbda643999bf8c2a37f 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-pci-address-device.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device vfio-pci,host=0000:06:12.5,id=hostdev0,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device vfio-pci,host=0000:06:12.5,id=hostdev0,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
index 2f304127b175af18395397e728d95aef3d4febb6..820237497662237898e48457a086151b4a3caaea 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
@@ -24,7 +24,7 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device vfio-pci,host=0005:90:01.0,id=hostdev0,bus=pci.0,addr=0x3 \
--device vfio-pci,host=0005:90:01.2,id=hostdev2,bus=pci.0,addr=0x4 \
--device vfio-pci,host=0005:90:01.3,id=hostdev3,bus=pci.0,addr=0x5 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6
+-device vfio-pci,host=0005:90:01.0,id=hostdev0,bus=pci.0,addr=0x2 \
+-device vfio-pci,host=0005:90:01.2,id=hostdev2,bus=pci.0,addr=0x3 \
+-device vfio-pci,host=0005:90:01.3,id=hostdev3,bus=pci.0,addr=0x4 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5

diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.args b/tests/qemuxml2argvdata/hostdev-pci-address.args
index 2a2a23f5b4ca37547867f3dacd2705c664fe39bf..73e6f71a5ceb4a602a6369ee1116250e819ff759 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-pci-address.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device vfio-pci,host=0000:06:12.5,id=hostdev0,bus=pci.0,addr=0x3
+-device vfio-pci,host=0000:06:12.5,id=hostdev0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
index 70d759545f65907d39243333626aba5992fa6462..24097628564784491baa603b83c015effa0d6bf4 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
@@ -24,11 +24,11 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device vfio-pci,host=0005:90:01.0,id=hostdev0,bus=pci.0,addr=0x3 \
--device vfio-pci,host=0001:01:00.1,id=hostdev1,bus=pci.0,addr=0x4 \
--device vfio-pci,host=0001:01:00.0,id=hostdev2,bus=pci.0,addr=0x5 \
--device vfio-pci,host=0005:90:01.2,id=hostdev3,bus=pci.0,addr=0x6 \
--device vfio-pci,host=0005:90:01.3,id=hostdev4,bus=pci.0,addr=0x7 \
--device vfio-pci,host=0000:06:12.1,id=hostdev5,bus=pci.0,addr=0x8 \
--device vfio-pci,host=0000:06:12.2,id=hostdev6,bus=pci.0,addr=0x9 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0xa
+-device vfio-pci,host=0005:90:01.0,id=hostdev0,bus=pci.0,addr=0x2 \
+-device vfio-pci,host=0001:01:00.1,id=hostdev1,bus=pci.0,addr=0x3 \
+-device vfio-pci,host=0001:01:00.0,id=hostdev2,bus=pci.0,addr=0x4 \
+-device vfio-pci,host=0005:90:01.2,id=hostdev3,bus=pci.0,addr=0x5 \
+-device vfio-pci,host=0005:90:01.3,id=hostdev4,bus=pci.0,addr=0x6 \
+-device vfio-pci,host=0000:06:12.1,id=hostdev5,bus=pci.0,addr=0x7 \
+-device vfio-pci,host=0000:06:12.2,id=hostdev6,bus=pci.0,addr=0x8 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x9

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
index 32434b3560b584479a3ddbface9af94b226c7b75..baa707029ab5636be6519a6403d53a00e5823e39 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
@@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device vhost-scsi-pci,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.0,addr=0x5 \
+-device vhost-scsi-pci,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
index 28de74c88526fe46cca765e1d13d435a65c56081..7953e9e6614eb6fc60747adcfb4e56b821992c89 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
@@ -23,6 +23,6 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
--device pcie-root-port,port=0x10,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \
--device pcie-root-port,port=0x11,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
+-device pcie-root-port,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
+-device pcie-root-port,port=0x9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
 -device vhost-scsi-pci,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.1,addr=0x0

diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
index 82e7d77088850fd16cb8274d8868b4340059d24b..a5d5d7f7254419a68a3d71bba28bddf0136e1e43 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bootindex=1,bus=usb.0,port=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.args b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
index 512d76b3b1e20aa3f135f1789daf06c87adeb9bb..e8e9f1b2bdea531f95c4a586ee645cdf18bdf268 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=usb.0,port=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
index dad04098bbffd6507b0a18d5402727d8d549c961..371fbe30a1c0997e19e09094ddf64d905ac02e73 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device vfio-pci,host=0021:de:1f.1,id=hostdev0,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device vfio-pci,host=0021:de:1f.1,id=hostdev0,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args b/tests/qemuxml2argvdata/hostdev-vfio.args
index 8329001ab0d780750df9c597efc92b6352f48b85..1e3118dcc3ca099dc86279b7a4141f4f773938ba 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device vfio-pci,host=0000:06:12.1,id=hostdev0,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device vfio-pci,host=0000:06:12.1,id=hostdev0,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/hugepages-default.args b/tests/qemuxml2argvdata/hugepages-default.args
index 8436d949a9783d4b0ad20c311b27ef0c6ae51e75..3bccaa83c36aa1eb67dd8d59f4f1c1cb3dcf0265 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-default.args
+++ b/tests/qemuxml2argvdata/hugepages-default.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/hugepages-shared.args b/tests/qemuxml2argvdata/hugepages-shared.args
index 659121d39eb87c47312ebb527f4e5aeeea625052..c2b01e2012674e3df3bec476184066a000badc58 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-shared.args
+++ b/tests/qemuxml2argvdata/hugepages-shared.args
@@ -34,4 +34,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args b/tests/qemuxml2argvdata/input-usbmouse-addr.args
index 721c99ad103999393d06086db358be6c5acb7dc0..28f7cdff257bae8e5ac89f9ef8bf4ba7ded33800 100644 (file)
--- a/tests/qemuxml2argvdata/input-usbmouse-addr.args
+++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -device usb-mouse,id=input0,bus=usb.0,port=2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/iothreads-disk.args b/tests/qemuxml2argvdata/iothreads-disk.args
index 537c48b3168c1fe153858a5f5f0860e22a4647be..0a36315fb361d11bfdc8a4cf84817406845501b6 100644 (file)
--- a/tests/qemuxml2argvdata/iothreads-disk.args
+++ b/tests/qemuxml2argvdata/iothreads-disk.args
@@ -31,4 +31,4 @@ QEMU_AUDIO_DRV=none \
 -drive file=/var/lib/libvirt/images/iothrtest1.img,format=raw,if=none,id=drive-virtio-disk1 \
 -device virtio-blk-pci,iothread=iothread1,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
 -drive file=/var/lib/libvirt/images/iothrtest2.img,format=raw,if=none,id=drive-virtio-disk2 \
--device virtio-blk-pci,iothread=iothread2,bus=pci.0,addr=0x3,drive=drive-virtio-disk2,id=virtio-disk2
+-device virtio-blk-pci,iothread=iothread2,bus=pci.0,addr=0x2,drive=drive-virtio-disk2,id=virtio-disk2

diff --git a/tests/qemuxml2argvdata/kvm-features-off.args b/tests/qemuxml2argvdata/kvm-features-off.args
index 1bba9ef7bce4a3f632a545bd45920419e18f39cb..a61203a01b816de0a78b062757b48e2398feeed8 100644 (file)
--- a/tests/qemuxml2argvdata/kvm-features-off.args
+++ b/tests/qemuxml2argvdata/kvm-features-off.args
@@ -23,4 +23,4 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argvdata/kvm-pit-delay.args
index e86ffd7422b10d5b219686a2bb11c12c712e9fac..d1e340b6a87f2af717dc400fdcd05a162b9f22b3 100644 (file)
--- a/tests/qemuxml2argvdata/kvm-pit-delay.args
+++ b/tests/qemuxml2argvdata/kvm-pit-delay.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args b/tests/qemuxml2argvdata/kvm-pit-discard.args
index 4051949bdef9d5ffdb2c2a4cd727dd7788807cad..3b0cb48230eabb56ff0b087203f46f5a09509c33 100644 (file)
--- a/tests/qemuxml2argvdata/kvm-pit-discard.args
+++ b/tests/qemuxml2argvdata/kvm-pit-discard.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args b/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
index 3d169e301fc1f4bcc2fb2374103b2632342a42a3..33e5b5126417ba418576bcbdb4cdc687f20817dc 100644 (file)
--- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
+++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
@@ -33,14 +33,14 @@ QEMU_AUDIO_DRV=none \
 -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
 -object secret,id=virtio-disk2-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:6000/iqn.1992-01.com.example%3Astorage/1,encrypt.format=luks,encrypt.key-secret=virtio-disk2-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk2 \
--device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,id=virtio-disk2 \
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk2,id=virtio-disk2 \
 -object secret,id=virtio-disk3-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 -drive file=iscsi://iscsi.example.com:3260/demo-target/3,encrypt.format=luks,encrypt.key-secret=virtio-disk3-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk3 \
--device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk3,id=virtio-disk3 \
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,id=virtio-disk3 \
 -object secret,id=virtio-disk4-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 -drive 'file=rbd:pool/image:auth_supported=none:mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,encrypt.format=luks,encrypt.key-secret=virtio-disk4-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk4' \
--device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk4,id=virtio-disk4 \
+-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk4,id=virtio-disk4 \
 -object secret,id=virtio-disk5-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 -drive file=/storage/guest_disks/encryptdisk5,encrypt.format=luks,encrypt.key-secret=virtio-disk5-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk5 \
--device virtio-blk-pci,bus=pci.0,addr=0x9,drive=drive-virtio-disk5,id=virtio-disk5 \
+-device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk5,id=virtio-disk5 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/luks-disks-source.args b/tests/qemuxml2argvdata/luks-disks-source.args
index 321754c7188bdaebff0fd8ddb16d3ab982fcff38..2cc9495b6502464755dd55ded4753211f6822663 100644 (file)
--- a/tests/qemuxml2argvdata/luks-disks-source.args
+++ b/tests/qemuxml2argvdata/luks-disks-source.args
@@ -33,11 +33,11 @@ QEMU_AUDIO_DRV=none \
 -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
 -object secret,id=virtio-disk2-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:6000/iqn.1992-01.com.example%3Astorage/1,key-secret=virtio-disk2-encryption-secret0,format=luks,if=none,id=drive-virtio-disk2 \
--device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,id=virtio-disk2 \
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk2,id=virtio-disk2 \
 -object secret,id=virtio-disk3-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 -drive file=iscsi://iscsi.example.com:3260/demo-target/3,key-secret=virtio-disk3-encryption-secret0,format=luks,if=none,id=drive-virtio-disk3 \
--device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk3,id=virtio-disk3 \
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,id=virtio-disk3 \
 -object secret,id=virtio-disk4-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
 -drive 'file=rbd:pool/image:auth_supported=none:mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,key-secret=virtio-disk4-encryption-secret0,format=luks,if=none,id=drive-virtio-disk4' \
--device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk4,id=virtio-disk4 \
+-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk4,id=virtio-disk4 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/machine-aliases1.args b/tests/qemuxml2argvdata/machine-aliases1.args
index 58a1ee3cdc29bed0f46477c43961372d4673372a..e5c7056a2e95917dd020e3d5fdf26606c9de460a 100644 (file)
--- a/tests/qemuxml2argvdata/machine-aliases1.args
+++ b/tests/qemuxml2argvdata/machine-aliases1.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/machine-aliases2.args b/tests/qemuxml2argvdata/machine-aliases2.args
index ad291184b7d411320aca680acac8ca5a48e1da4a..a1a8d8b70a0d5cf28c9760adea87de3b7d6ce5d2 100644 (file)
--- a/tests/qemuxml2argvdata/machine-aliases2.args
+++ b/tests/qemuxml2argvdata/machine-aliases2.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/machine-smm-opt.args b/tests/qemuxml2argvdata/machine-smm-opt.args
index 62833351f62f15c0770a54687331085d64b81f73..5d2a0a02bbf5e8d4a151b2daee446438df02c52e 100644 (file)
--- a/tests/qemuxml2argvdata/machine-smm-opt.args
+++ b/tests/qemuxml2argvdata/machine-smm-opt.args
@@ -25,7 +25,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
--device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
+-device ioh3420,port=0x8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
 -device virtio-scsi-pci,id=scsi0,bus=pci.2,addr=0x1 \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-0-0 \
 -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 \

diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml2argvdata/machine-vmport-opt.args
index 1ce42179ed1162d1cfdf2a1941b985e056df83e8..e59d477e388ba9215f42e10c9b6c2d1375363014 100644 (file)
--- a/tests/qemuxml2argvdata/machine-vmport-opt.args
+++ b/tests/qemuxml2argvdata/machine-vmport-opt.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
index c12879e6bc329454b062910ebe1101ead765b44e..ec5811dc74c3d91b1e503be0b4394c78c79adc4a 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
@@ -31,4 +31,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
index cdadded1c99e75407d1d298ddfcbb2b8711b1628..7f52d89e408c2914b178058c3882e34ec511fc07 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
@@ -31,4 +31,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/memory-hotplug.args b/tests/qemuxml2argvdata/memory-hotplug.args
index 52b8ebec54c8a34b4131e12daedaf17a7d8ff0c0..b459f50ce5e1677ddbd41ee1f7dc08f7d743a6e8 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug.args
+++ b/tests/qemuxml2argvdata/memory-hotplug.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args b/tests/qemuxml2argvdata/memtune-unlimited.args
index 5770ba928af271685820273f89b3f64c159a446c..699ed70abcd8963b033de8e0c395ff5117a5f225 100644 (file)
--- a/tests/qemuxml2argvdata/memtune-unlimited.args
+++ b/tests/qemuxml2argvdata/memtune-unlimited.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.args
index 5770ba928af271685820273f89b3f64c159a446c..699ed70abcd8963b033de8e0c395ff5117a5f225 100644 (file)
--- a/tests/qemuxml2argvdata/memtune.args
+++ b/tests/qemuxml2argvdata/memtune.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/migrate-numa-unaligned.args b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
index 730af94f48f44c5bbc0184bf40030fff57510d5e..510abc5f5722e7d417f728e6c0557e00a5c25b54 100644 (file)
--- a/tests/qemuxml2argvdata/migrate-numa-unaligned.args
+++ b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
@@ -31,4 +31,4 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -usb \
 -incoming fd:7 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/minimal-msg-timestamp.args b/tests/qemuxml2argvdata/minimal-msg-timestamp.args
index e495f6be1a090b3303b5cce7b588ebe62d0f1434..18838030fea57458da6a68db4093447644a1f884 100644 (file)
--- a/tests/qemuxml2argvdata/minimal-msg-timestamp.args
+++ b/tests/qemuxml2argvdata/minimal-msg-timestamp.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/minimal-sandbox.args b/tests/qemuxml2argvdata/minimal-sandbox.args
index ce4914e960c8725d90ea6224e2ec644dc0e49336..c0878334cd3bf3da2a4bc35524324a4065a467d9 100644 (file)
--- a/tests/qemuxml2argvdata/minimal-sandbox.args
+++ b/tests/qemuxml2argvdata/minimal-sandbox.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny

diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.args
index 5770ba928af271685820273f89b3f64c159a446c..699ed70abcd8963b033de8e0c395ff5117a5f225 100644 (file)
--- a/tests/qemuxml2argvdata/minimal.args
+++ b/tests/qemuxml2argvdata/minimal.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/monitor-json.args b/tests/qemuxml2argvdata/monitor-json.args
index 9d9d02fc4f6df6cf4a1092edf1afc1e4a4f29778..ba3587601be4523a83e6ab08cfaa55cb9d1b4275 100644 (file)
--- a/tests/qemuxml2argvdata/monitor-json.args
+++ b/tests/qemuxml2argvdata/monitor-json.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/hda1,format=qcow2,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/qemuxml2argvdata/multifunction-pci-device.args
index f3ee4abc40194064aa79ecfb4b397e1603fff420..4938756b963449aba50dc7cb5474ac9733dce316 100644 (file)
--- a/tests/qemuxml2argvdata/multifunction-pci-device.args
+++ b/tests/qemuxml2argvdata/multifunction-pci-device.args
@@ -35,4 +35,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-0 \
 -device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/net-client.args b/tests/qemuxml2argvdata/net-client.args
index c47ee20be2d709930acfebf209780ae3f644446e..535533d044f853f4bf879426130878f720060c5a 100644 (file)
--- a/tests/qemuxml2argvdata/net-client.args
+++ b/tests/qemuxml2argvdata/net-client.args
@@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev socket,connect=192.168.0.1:5558,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/net-eth-hostip.args b/tests/qemuxml2argvdata/net-eth-hostip.args
index 989004299ed48ad98b9238406ce8c1625130cd9c..a7cac1689468fdb4eadd989d8dd559811a89a304 100644 (file)
--- a/tests/qemuxml2argvdata/net-eth-hostip.args
+++ b/tests/qemuxml2argvdata/net-eth-hostip.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev tap,fd=3,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3
+-device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/net-eth-ifname.args b/tests/qemuxml2argvdata/net-eth-ifname.args
index 989004299ed48ad98b9238406ce8c1625130cd9c..a7cac1689468fdb4eadd989d8dd559811a89a304 100644 (file)
--- a/tests/qemuxml2argvdata/net-eth-ifname.args
+++ b/tests/qemuxml2argvdata/net-eth-ifname.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev tap,fd=3,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3
+-device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/net-eth-names.args b/tests/qemuxml2argvdata/net-eth-names.args
index dc9cefe7dd7962536791faefb1ae1c3406027479..3c74b440332e13d64a242c2c934e3249a084c18b 100644 (file)
--- a/tests/qemuxml2argvdata/net-eth-names.args
+++ b/tests/qemuxml2argvdata/net-eth-names.args
@@ -27,7 +27,7 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev tap,fd=3,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \
+-device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
 -netdev tap,fd=3,id=hostnet1 \
--device e1000,netdev=hostnet1,id=net1,mac=00:11:22:33:44:56,bus=pci.0,addr=0x4 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+-device e1000,netdev=hostnet1,id=net1,mac=00:11:22:33:44:56,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
index 136079b974839bda49c630e58b3be627269084b2..009071590df84faac7aceb212ee0a3ca17c08d9b 100644 (file)
--- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
+++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev tap,fd=3,id=hostnet0,vhost=on,vhostfd=44 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=fe:11:22:33:44:55,bus=pci.0,addr=0x3
+-device virtio-net-pci,netdev=hostnet0,id=net0,mac=fe:11:22:33:44:55,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/net-eth.args b/tests/qemuxml2argvdata/net-eth.args
index 989004299ed48ad98b9238406ce8c1625130cd9c..a7cac1689468fdb4eadd989d8dd559811a89a304 100644 (file)
--- a/tests/qemuxml2argvdata/net-eth.args
+++ b/tests/qemuxml2argvdata/net-eth.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev tap,fd=3,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3
+-device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.args b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
index fc45018608a7c9ee865bfd77240072401049ecb2..fa0288d5773b2cf9a5cb4568335b3da08dca11b1 100644 (file)
--- a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
+++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=2 \
--device vfio-pci,host=0000:03:07.1,id=hostdev0,bootindex=1,bus=pci.0,addr=0x3
+-device vfio-pci,host=0000:03:07.1,id=hostdev0,bootindex=1,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.args b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
index 29de18202c15dbdd6c07bf2f1d5a080d779a88bb..76cbdfd518b0dd91812135279843d2022b9475e3 100644 (file)
--- a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device vfio-pci,host=2424:21:1c.6,id=hostdev0,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device vfio-pci,host=2424:21:1c.6,id=hostdev0,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
index b24cc55aa47754467d97518545ff95290cedbb22..935a849916c58730cc2d7126ea0100b09abb1a87 100644 (file)
--- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device vfio-pci,host=0021:de:1f.1,id=hostdev0,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device vfio-pci,host=0021:de:1f.1,id=hostdev0,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.args b/tests/qemuxml2argvdata/net-hostdev-vfio.args
index c63f4141655c536491ad5f981eca4ac2d5ca5b9d..3466963173ac424c4511bc5c4242472ae96a8f0f 100644 (file)
--- a/tests/qemuxml2argvdata/net-hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device vfio-pci,host=0000:06:12.1,id=hostdev0,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device vfio-pci,host=0000:06:12.1,id=hostdev0,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/net-hostdev.args b/tests/qemuxml2argvdata/net-hostdev.args
index a8593e451f51d64ec355b7e599703f4498da9dba..4014cef655eaeda146f9efc4eea885018323718a 100644 (file)
--- a/tests/qemuxml2argvdata/net-hostdev.args
+++ b/tests/qemuxml2argvdata/net-hostdev.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device vfio-pci,host=0000:03:07.1,id=hostdev0,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device vfio-pci,host=0000:03:07.1,id=hostdev0,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/net-many-models.args b/tests/qemuxml2argvdata/net-many-models.args
index 35bd2564676975ffa27db6ebc0d9e3762d29b2aa..f83ab3812244a4ed00fd5b96b950e78200324860 100644 (file)
--- a/tests/qemuxml2argvdata/net-many-models.args
+++ b/tests/qemuxml2argvdata/net-many-models.args
@@ -24,14 +24,14 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -netdev user,id=hostnet0 \
--device idontexist,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \
+-device idontexist,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
 -netdev user,id=hostnet1 \
--device vmxnet3,netdev=hostnet1,id=net1,mac=00:11:22:33:44:56,bus=pci.0,addr=0x4 \
+-device vmxnet3,netdev=hostnet1,id=net1,mac=00:11:22:33:44:56,bus=pci.0,addr=0x3 \
 -netdev user,id=hostnet2 \
--device netfront,netdev=hostnet2,id=net2,mac=00:11:22:33:44:57,bus=pci.0,addr=0x5 \
+-device netfront,netdev=hostnet2,id=net2,mac=00:11:22:33:44:57,bus=pci.0,addr=0x4 \
 -netdev user,id=hostnet3 \
--device virtio-net-pci,netdev=hostnet3,id=net3,mac=00:11:22:33:44:58,bus=pci.0,addr=0x6 \
+-device virtio-net-pci,netdev=hostnet3,id=net3,mac=00:11:22:33:44:58,bus=pci.0,addr=0x5 \
 -netdev user,id=hostnet4 \
--device ne2k_pci,netdev=hostnet4,id=net4,mac=00:11:22:33:44:58,bus=pci.0,addr=0x7 \
+-device ne2k_pci,netdev=hostnet4,id=net4,mac=00:11:22:33:44:58,bus=pci.0,addr=0x6 \
 -netdev user,id=hostnet5 \
--device pcnet,netdev=hostnet5,id=net5,mac=00:11:22:33:44:58,bus=pci.0,addr=0x8
+-device pcnet,netdev=hostnet5,id=net5,mac=00:11:22:33:44:58,bus=pci.0,addr=0x7

diff --git a/tests/qemuxml2argvdata/net-mcast.args b/tests/qemuxml2argvdata/net-mcast.args
index 6af85fe616e163b348f027e262ade7ccdbda910d..c73b5383c24c274723144305e366e5ff3ddc3225 100644 (file)
--- a/tests/qemuxml2argvdata/net-mcast.args
+++ b/tests/qemuxml2argvdata/net-mcast.args
@@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev socket,mcast=192.0.0.1:5558,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/net-server.args b/tests/qemuxml2argvdata/net-server.args
index 226b9e5ecc96494de2f2365296bccec17c6ff578..ea7501285984f876b610bace828f305272389a51 100644 (file)
--- a/tests/qemuxml2argvdata/net-server.args
+++ b/tests/qemuxml2argvdata/net-server.args
@@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev socket,listen=192.168.0.1:5558,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/net-udp.args b/tests/qemuxml2argvdata/net-udp.args
index 0fde906e4c29282ad4e9e55332005f54b9bf5934..a7d1cdcb1e66e4f638adbbc24ddd24f95fa97bfe 100644 (file)
--- a/tests/qemuxml2argvdata/net-udp.args
+++ b/tests/qemuxml2argvdata/net-udp.args
@@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev socket,udp=192.168.10.1:5555,localaddr=192.168.10.1:5556,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/net-user.args b/tests/qemuxml2argvdata/net-user.args
index e44ca7572f568b1a6926953ca03d7e29720250f4..56dbab4bfc0d1a709429b6653aa43e6cfad549ee 100644 (file)
--- a/tests/qemuxml2argvdata/net-user.args
+++ b/tests/qemuxml2argvdata/net-user.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3
+-device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.args b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
index d3d80be212a7a86fac3c10f59cd44e3b5af756eb..0da421824d39f0c669f66ed9cf95fd9e29c29d12 100644 (file)
--- a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
+++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
@@ -28,15 +28,15 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev socket,id=charnet0,path=/tmp/vhost0.sock,server=on \
 -netdev vhost-user,chardev=charnet0,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,addr=0x3 \
+-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,addr=0x2 \
 -chardev socket,id=charnet1,path=/tmp/vhost1.sock \
 -netdev vhost-user,chardev=charnet1,id=hostnet1 \
--device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,addr=0x4 \
+-device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,addr=0x3 \
 -netdev socket,listen=:2015,id=hostnet2 \
--device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,addr=0x5 \
+-device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,addr=0x4 \
 -chardev socket,id=charnet3,path=/tmp/vhost2.sock,reconnect=10 \
 -netdev vhost-user,chardev=charnet3,id=hostnet3 \
--device virtio-net-pci,netdev=hostnet3,id=net3,mac=52:54:00:ee:96:6d,bus=pci.0,addr=0x6 \
+-device virtio-net-pci,netdev=hostnet3,id=net3,mac=52:54:00:ee:96:6d,bus=pci.0,addr=0x5 \
 -chardev socket,id=charnet4,path=/tmp/vhost3.sock,reconnect=0 \
 -netdev vhost-user,chardev=charnet4,queues=4,id=hostnet4 \
--device virtio-net-pci,mq=on,vectors=10,netdev=hostnet4,id=net4,mac=52:54:00:ee:96:6e,bus=pci.0,addr=0x7
+-device virtio-net-pci,mq=on,vectors=10,netdev=hostnet4,id=net4,mac=52:54:00:ee:96:6e,bus=pci.0,addr=0x6

diff --git a/tests/qemuxml2argvdata/net-vhostuser.args b/tests/qemuxml2argvdata/net-vhostuser.args
index 54869f8d1761716ae1d9854762b6f502d8f26c65..d823a8130aecbf34387c6d49d11969e502c1e3cc 100644 (file)
--- a/tests/qemuxml2argvdata/net-vhostuser.args
+++ b/tests/qemuxml2argvdata/net-vhostuser.args
@@ -26,9 +26,9 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -chardev socket,id=charnet0,path=/tmp/vhost0.sock,server=on \
 -netdev vhost-user,chardev=charnet0,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,addr=0x3 \
+-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,addr=0x2 \
 -chardev socket,id=charnet1,path=/tmp/vhost1.sock \
 -netdev vhost-user,chardev=charnet1,id=hostnet1 \
--device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,addr=0x4 \
+-device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,addr=0x3 \
 -netdev socket,listen=:2015,id=hostnet2 \
--device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,addr=0x5
+-device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/net-virtio-device.args b/tests/qemuxml2argvdata/net-virtio-device.args
index 2bf3f1280c16173545d84dbb37b757fcba9b554c..6ed328d716f1f477c5bc30e0812267a4a526c300 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-device.args
+++ b/tests/qemuxml2argvdata/net-virtio-device.args
@@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
--device virtio-net-pci,tx=bh,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device virtio-net-pci,tx=bh,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
index 970f6d1d895f512b295a011190ebef90ef75319a..3d6905f40c52153953e03115806417c41dfd68e6 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
+++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
@@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest7,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
--device virtio-net-pci,csum=off,gso=off,host_tso4=off,host_tso6=off,host_ecn=off,host_ufo=off,mrg_rxbuf=off,guest_csum=off,guest_tso4=off,guest_tso6=off,guest_ecn=off,guest_ufo=off,netdev=hostnet0,id=net0,mac=00:22:44:66:88:aa,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device virtio-net-pci,csum=off,gso=off,host_tso4=off,host_tso6=off,host_ecn=off,host_ufo=off,mrg_rxbuf=off,guest_csum=off,guest_tso4=off,guest_tso6=off,guest_ecn=off,guest_ufo=off,netdev=hostnet0,id=net0,mac=00:22:44:66:88:aa,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.args b/tests/qemuxml2argvdata/net-virtio-netdev.args
index 01435ea24bb0c33f124eced25b1284f904227108..fff6d0ecb53e405baf357987322a3bf86d8d5b77 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-netdev.args
+++ b/tests/qemuxml2argvdata/net-virtio-netdev.args
@@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
index 22d911b1ab3a145448f47a4646847aea6be5b0dc..d900d3590e97542e2b02ddd53e52555acec6664f 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
+++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
@@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
--device virtio-net-pci,rx_queue_size=512,tx_queue_size=1024,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
+-device virtio-net-pci,rx_queue_size=512,tx_queue_size=1024,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.args b/tests/qemuxml2argvdata/net-virtio-teaming.args
index 6a8ae6a23b3d10b73dbf5da779ac3a3899575a57..567e5d76bc7eaab894907ca80e46c03f9b880a25 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-teaming.args
+++ b/tests/qemuxml2argvdata/net-virtio-teaming.args
@@ -27,9 +27,9 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev user,id=hostua-backup0 \
--device virtio-net-pci,failover=on,netdev=hostua-backup0,id=ua-backup0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \
+-device virtio-net-pci,failover=on,netdev=hostua-backup0,id=ua-backup0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
 -netdev user,id=hostua-backup1 \
--device virtio-net-pci,failover=on,netdev=hostua-backup1,id=ua-backup1,mac=66:44:33:22:11:00,bus=pci.0,addr=0x4 \
--device vfio-pci,host=0000:03:07.1,id=hostdev0,bus=pci.0,addr=0x5,failover_pair_id=ua-backup0 \
--device vfio-pci,host=0000:03:07.2,id=hostdev1,bus=pci.0,addr=0x6,failover_pair_id=ua-backup1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7
+-device virtio-net-pci,failover=on,netdev=hostua-backup1,id=ua-backup1,mac=66:44:33:22:11:00,bus=pci.0,addr=0x3 \
+-device vfio-pci,host=0000:03:07.1,id=hostdev0,bus=pci.0,addr=0x4,failover_pair_id=ua-backup0 \
+-device vfio-pci,host=0000:03:07.2,id=hostdev1,bus=pci.0,addr=0x5,failover_pair_id=ua-backup1 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6

diff --git a/tests/qemuxml2argvdata/net-virtio.args b/tests/qemuxml2argvdata/net-virtio.args
index 66a588942c747e307666fd8f1be169f4c0e205fd..de99277a0c429737231c099c571f877d2c41c3bf 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio.args
+++ b/tests/qemuxml2argvdata/net-virtio.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3
+-device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
index 91290fbe0e107fc07d7ae276f79e623072e3998c..e66bd7deb010e2a38ad8fe08fc6b255c1944a343 100644 (file)
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
index 91290fbe0e107fc07d7ae276f79e623072e3998c..e66bd7deb010e2a38ad8fe08fc6b255c1944a343 100644 (file)
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
index 91290fbe0e107fc07d7ae276f79e623072e3998c..e66bd7deb010e2a38ad8fe08fc6b255c1944a343 100644 (file)
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
index 91290fbe0e107fc07d7ae276f79e623072e3998c..e66bd7deb010e2a38ad8fe08fc6b255c1944a343 100644 (file)
--- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
+++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args
index 91290fbe0e107fc07d7ae276f79e623072e3998c..e66bd7deb010e2a38ad8fe08fc6b255c1944a343 100644 (file)
--- a/tests/qemuxml2argvdata/numad.args
+++ b/tests/qemuxml2argvdata/numad.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
index 91290fbe0e107fc07d7ae276f79e623072e3998c..e66bd7deb010e2a38ad8fe08fc6b255c1944a343 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
+++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/numatune-auto-prefer.args b/tests/qemuxml2argvdata/numatune-auto-prefer.args
index 916220eb799e093fcc45ba3a5bb1e6d09d3b9d46..8816aca495d549df2798b9c38a934149fdc4862a 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-auto-prefer.args
+++ b/tests/qemuxml2argvdata/numatune-auto-prefer.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/numatune-distances.args b/tests/qemuxml2argvdata/numatune-distances.args
index b5a2e85c37a7cae137117162aa007156baf15218..0445b8ec8bba7cd921e1815270a66516289fe909 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-distances.args
+++ b/tests/qemuxml2argvdata/numatune-distances.args
@@ -65,4 +65,4 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
index 6a07e829c5c90f8918133a19aba9c0b6888d6474..9bce6ee90d7d9d49764530932361135e922ab31c 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/numatune-memnode.args b/tests/qemuxml2argvdata/numatune-memnode.args
index 3d2f56c5ca743ab3ce9f9fda4ffd6c4f19950209..7b436cb7123d621ad42ad10bb00f2c01ca39b374 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-memnode.args
+++ b/tests/qemuxml2argvdata/numatune-memnode.args
@@ -30,4 +30,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/numatune-memory.args b/tests/qemuxml2argvdata/numatune-memory.args
index 91290fbe0e107fc07d7ae276f79e623072e3998c..e66bd7deb010e2a38ad8fe08fc6b255c1944a343 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memory.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/panic-no-address.args b/tests/qemuxml2argvdata/panic-no-address.args
index 56454f1de51accbbc3b1bcfc0b852d5b078efa07..d311679e99f6d0a530f18b2ead3d68351bf6ba1c 100644 (file)
--- a/tests/qemuxml2argvdata/panic-no-address.args
+++ b/tests/qemuxml2argvdata/panic-no-address.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -device pvpanic

diff --git a/tests/qemuxml2argvdata/panic.args b/tests/qemuxml2argvdata/panic.args
index 2758e99219bbba4174665ccead6316b01b4b0e70..b7540a4c2e0afa5e327c07040036a876bbcb380d 100644 (file)
--- a/tests/qemuxml2argvdata/panic.args
+++ b/tests/qemuxml2argvdata/panic.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -device pvpanic,ioport=1285

diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args b/tests/qemuxml2argvdata/parallel-parport-chardev.args
index 45dce5351282167ffa3b01bee730911ebb13dc1e..0b428a1dab94ababe158023a3ad97ed0f09b4ccf 100644 (file)
--- a/tests/qemuxml2argvdata/parallel-parport-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-parport-chardev.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev parport,id=charparallel0,path=/dev/parport0 \
 -device isa-parallel,chardev=charparallel0,id=parallel0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.args b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
index dcc8ad75e4d5cdc107592341e5112406b45aa430..9ad6d7eb92544e5dcc08ced2ec1a0ba03cd175f4 100644 (file)
--- a/tests/qemuxml2argvdata/parallel-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev socket,id=charparallel0,host=127.0.0.1,port=9999,server=on,wait=off \
 -device isa-parallel,chardev=charparallel0,id=parallel0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2argvdata/pci-autoadd-addr.args
index c8abbc35012eb94bbdce1c56ebcb00a46419b577..65c0f4a15c5d4298885f4f22db16b6f34772a96c 100644 (file)
--- a/tests/qemuxml2argvdata/pci-autoadd-addr.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args
@@ -32,5 +32,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/iso/f18kde.iso,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.7,addr=0x6

diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2argvdata/pci-autoadd-idx.args
index 6b2dc13d1cfc7cf30988a7636dbdebcf28076b1a..46fc711e97d69085a9c35490f8480fed2ec59109 100644 (file)
--- a/tests/qemuxml2argvdata/pci-autoadd-idx.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args
@@ -33,5 +33,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/iso/f18kde.iso,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x6

diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2argvdata/pci-autofill-addr.args
index 5c281de780941d81f40badfd1b38666c1eabab58..f21fb7b7d0d88229fd957df763a5fa4a6d3614c5 100644 (file)
--- a/tests/qemuxml2argvdata/pci-autofill-addr.args
+++ b/tests/qemuxml2argvdata/pci-autofill-addr.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/iso/f18kde.iso,format=raw,if=none,id=drive-virtio-disk0,readonly=on \
 -device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4

diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
index 297afb6374ad3bcd9da07e066da8c2be1e0e2ccc..cabb05a0f0114793507ae2968f6f4d59f2ddf06b 100644 (file)
--- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args
+++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
@@ -24,217 +24,217 @@ QEMU_AUDIO_DRV=none \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
--device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x3 \
--device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x4 \
--device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.0,addr=0x5 \
+-device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x2 \
+-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x3 \
+-device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.0,addr=0x4 \
 -usb \
 -drive file=/var/lib/libvirt/images/test.img,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
 -drive file=/var/lib/libvirt/images/disk-a-a.img,format=raw,if=none,id=drive-virtio-disk26 \
--device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk26,id=virtio-disk26 \
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk26,id=virtio-disk26 \
 -drive file=/var/lib/libvirt/images/disk-a-b.img,format=raw,if=none,id=drive-virtio-disk27 \
--device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk27,id=virtio-disk27 \
+-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk27,id=virtio-disk27 \
 -drive file=/var/lib/libvirt/images/disk-a-c.img,format=raw,if=none,id=drive-virtio-disk28 \
--device virtio-blk-pci,bus=pci.0,addr=0x9,drive=drive-virtio-disk28,id=virtio-disk28 \
+-device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk28,id=virtio-disk28 \
 -drive file=/var/lib/libvirt/images/disk-a-d.img,format=raw,if=none,id=drive-virtio-disk29 \
--device virtio-blk-pci,bus=pci.0,addr=0xa,drive=drive-virtio-disk29,id=virtio-disk29 \
+-device virtio-blk-pci,bus=pci.0,addr=0x9,drive=drive-virtio-disk29,id=virtio-disk29 \
 -drive file=/var/lib/libvirt/images/disk-b-a.img,format=raw,if=none,id=drive-virtio-disk52 \
--device virtio-blk-pci,bus=pci.0,addr=0xb,drive=drive-virtio-disk52,id=virtio-disk52 \
+-device virtio-blk-pci,bus=pci.0,addr=0xa,drive=drive-virtio-disk52,id=virtio-disk52 \
 -drive file=/var/lib/libvirt/images/disk-b-b.img,format=raw,if=none,id=drive-virtio-disk53 \
--device virtio-blk-pci,bus=pci.0,addr=0xc,drive=drive-virtio-disk53,id=virtio-disk53 \
+-device virtio-blk-pci,bus=pci.0,addr=0xb,drive=drive-virtio-disk53,id=virtio-disk53 \
 -drive file=/var/lib/libvirt/images/disk-b-c.img,format=raw,if=none,id=drive-virtio-disk54 \
--device virtio-blk-pci,bus=pci.0,addr=0xd,drive=drive-virtio-disk54,id=virtio-disk54 \
+-device virtio-blk-pci,bus=pci.0,addr=0xc,drive=drive-virtio-disk54,id=virtio-disk54 \
 -drive file=/var/lib/libvirt/images/disk-b-d.img,format=raw,if=none,id=drive-virtio-disk55 \
--device virtio-blk-pci,bus=pci.0,addr=0xe,drive=drive-virtio-disk55,id=virtio-disk55 \
+-device virtio-blk-pci,bus=pci.0,addr=0xd,drive=drive-virtio-disk55,id=virtio-disk55 \
 -drive file=/var/lib/libvirt/images/disk-c-a.img,format=raw,if=none,id=drive-virtio-disk78 \
--device virtio-blk-pci,bus=pci.0,addr=0xf,drive=drive-virtio-disk78,id=virtio-disk78 \
+-device virtio-blk-pci,bus=pci.0,addr=0xe,drive=drive-virtio-disk78,id=virtio-disk78 \
 -drive file=/var/lib/libvirt/images/disk-c-b.img,format=raw,if=none,id=drive-virtio-disk79 \
--device virtio-blk-pci,bus=pci.0,addr=0x10,drive=drive-virtio-disk79,id=virtio-disk79 \
+-device virtio-blk-pci,bus=pci.0,addr=0xf,drive=drive-virtio-disk79,id=virtio-disk79 \
 -drive file=/var/lib/libvirt/images/disk-c-c.img,format=raw,if=none,id=drive-virtio-disk80 \
--device virtio-blk-pci,bus=pci.0,addr=0x11,drive=drive-virtio-disk80,id=virtio-disk80 \
+-device virtio-blk-pci,bus=pci.0,addr=0x10,drive=drive-virtio-disk80,id=virtio-disk80 \
 -drive file=/var/lib/libvirt/images/disk-c-d.img,format=raw,if=none,id=drive-virtio-disk81 \
--device virtio-blk-pci,bus=pci.0,addr=0x12,drive=drive-virtio-disk81,id=virtio-disk81 \
+-device virtio-blk-pci,bus=pci.0,addr=0x11,drive=drive-virtio-disk81,id=virtio-disk81 \
 -drive file=/var/lib/libvirt/images/disk-d-a.img,format=raw,if=none,id=drive-virtio-disk104 \
--device virtio-blk-pci,bus=pci.0,addr=0x13,drive=drive-virtio-disk104,id=virtio-disk104 \
+-device virtio-blk-pci,bus=pci.0,addr=0x12,drive=drive-virtio-disk104,id=virtio-disk104 \
 -drive file=/var/lib/libvirt/images/disk-d-b.img,format=raw,if=none,id=drive-virtio-disk105 \
--device virtio-blk-pci,bus=pci.0,addr=0x14,drive=drive-virtio-disk105,id=virtio-disk105 \
+-device virtio-blk-pci,bus=pci.0,addr=0x13,drive=drive-virtio-disk105,id=virtio-disk105 \
 -drive file=/var/lib/libvirt/images/disk-d-c.img,format=raw,if=none,id=drive-virtio-disk106 \
--device virtio-blk-pci,bus=pci.0,addr=0x15,drive=drive-virtio-disk106,id=virtio-disk106 \
+-device virtio-blk-pci,bus=pci.0,addr=0x14,drive=drive-virtio-disk106,id=virtio-disk106 \
 -drive file=/var/lib/libvirt/images/disk-d-d.img,format=raw,if=none,id=drive-virtio-disk107 \
--device virtio-blk-pci,bus=pci.0,addr=0x16,drive=drive-virtio-disk107,id=virtio-disk107 \
+-device virtio-blk-pci,bus=pci.0,addr=0x15,drive=drive-virtio-disk107,id=virtio-disk107 \
 -drive file=/var/lib/libvirt/images/disk-e-a.img,format=raw,if=none,id=drive-virtio-disk130 \
--device virtio-blk-pci,bus=pci.0,addr=0x17,drive=drive-virtio-disk130,id=virtio-disk130 \
+-device virtio-blk-pci,bus=pci.0,addr=0x16,drive=drive-virtio-disk130,id=virtio-disk130 \
 -drive file=/var/lib/libvirt/images/disk-e-b.img,format=raw,if=none,id=drive-virtio-disk131 \
--device virtio-blk-pci,bus=pci.0,addr=0x18,drive=drive-virtio-disk131,id=virtio-disk131 \
+-device virtio-blk-pci,bus=pci.0,addr=0x17,drive=drive-virtio-disk131,id=virtio-disk131 \
 -drive file=/var/lib/libvirt/images/disk-e-c.img,format=raw,if=none,id=drive-virtio-disk132 \
--device virtio-blk-pci,bus=pci.0,addr=0x19,drive=drive-virtio-disk132,id=virtio-disk132 \
+-device virtio-blk-pci,bus=pci.0,addr=0x18,drive=drive-virtio-disk132,id=virtio-disk132 \
 -drive file=/var/lib/libvirt/images/disk-e-d.img,format=raw,if=none,id=drive-virtio-disk133 \
--device virtio-blk-pci,bus=pci.0,addr=0x1a,drive=drive-virtio-disk133,id=virtio-disk133 \
+-device virtio-blk-pci,bus=pci.0,addr=0x19,drive=drive-virtio-disk133,id=virtio-disk133 \
 -drive file=/var/lib/libvirt/images/disk-f-a.img,format=raw,if=none,id=drive-virtio-disk156 \
--device virtio-blk-pci,bus=pci.0,addr=0x1b,drive=drive-virtio-disk156,id=virtio-disk156 \
+-device virtio-blk-pci,bus=pci.0,addr=0x1a,drive=drive-virtio-disk156,id=virtio-disk156 \
 -drive file=/var/lib/libvirt/images/disk-f-b.img,format=raw,if=none,id=drive-virtio-disk157 \
--device virtio-blk-pci,bus=pci.0,addr=0x1c,drive=drive-virtio-disk157,id=virtio-disk157 \
+-device virtio-blk-pci,bus=pci.0,addr=0x1b,drive=drive-virtio-disk157,id=virtio-disk157 \
 -drive file=/var/lib/libvirt/images/disk-f-c.img,format=raw,if=none,id=drive-virtio-disk158 \
--device virtio-blk-pci,bus=pci.0,addr=0x1d,drive=drive-virtio-disk158,id=virtio-disk158 \
+-device virtio-blk-pci,bus=pci.0,addr=0x1c,drive=drive-virtio-disk158,id=virtio-disk158 \
 -drive file=/var/lib/libvirt/images/disk-f-d.img,format=raw,if=none,id=drive-virtio-disk159 \
--device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=drive-virtio-disk159,id=virtio-disk159 \
+-device virtio-blk-pci,bus=pci.0,addr=0x1d,drive=drive-virtio-disk159,id=virtio-disk159 \
 -drive file=/var/lib/libvirt/images/disk-g-a.img,format=raw,if=none,id=drive-virtio-disk182 \
--device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=drive-virtio-disk182,id=virtio-disk182 \
+-device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=drive-virtio-disk182,id=virtio-disk182 \
 -drive file=/var/lib/libvirt/images/disk-g-b.img,format=raw,if=none,id=drive-virtio-disk183 \
--device virtio-blk-pci,bus=pci.1,addr=0x1,drive=drive-virtio-disk183,id=virtio-disk183 \
+-device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=drive-virtio-disk183,id=virtio-disk183 \
 -drive file=/var/lib/libvirt/images/disk-g-c.img,format=raw,if=none,id=drive-virtio-disk184 \
--device virtio-blk-pci,bus=pci.1,addr=0x2,drive=drive-virtio-disk184,id=virtio-disk184 \
+-device virtio-blk-pci,bus=pci.1,addr=0x1,drive=drive-virtio-disk184,id=virtio-disk184 \
 -drive file=/var/lib/libvirt/images/disk-g-d.img,format=raw,if=none,id=drive-virtio-disk185 \
--device virtio-blk-pci,bus=pci.1,addr=0x3,drive=drive-virtio-disk185,id=virtio-disk185 \
+-device virtio-blk-pci,bus=pci.1,addr=0x2,drive=drive-virtio-disk185,id=virtio-disk185 \
 -drive file=/var/lib/libvirt/images/disk-h-a.img,format=raw,if=none,id=drive-virtio-disk208 \
--device virtio-blk-pci,bus=pci.1,addr=0x4,drive=drive-virtio-disk208,id=virtio-disk208 \
+-device virtio-blk-pci,bus=pci.1,addr=0x3,drive=drive-virtio-disk208,id=virtio-disk208 \
 -drive file=/var/lib/libvirt/images/disk-h-b.img,format=raw,if=none,id=drive-virtio-disk209 \
--device virtio-blk-pci,bus=pci.1,addr=0x5,drive=drive-virtio-disk209,id=virtio-disk209 \
+-device virtio-blk-pci,bus=pci.1,addr=0x4,drive=drive-virtio-disk209,id=virtio-disk209 \
 -drive file=/var/lib/libvirt/images/disk-h-c.img,format=raw,if=none,id=drive-virtio-disk210 \
--device virtio-blk-pci,bus=pci.1,addr=0x6,drive=drive-virtio-disk210,id=virtio-disk210 \
+-device virtio-blk-pci,bus=pci.1,addr=0x5,drive=drive-virtio-disk210,id=virtio-disk210 \
 -drive file=/var/lib/libvirt/images/disk-h-d.img,format=raw,if=none,id=drive-virtio-disk211 \
--device virtio-blk-pci,bus=pci.1,addr=0x7,drive=drive-virtio-disk211,id=virtio-disk211 \
+-device virtio-blk-pci,bus=pci.1,addr=0x6,drive=drive-virtio-disk211,id=virtio-disk211 \
 -drive file=/var/lib/libvirt/images/disk-i-a.img,format=raw,if=none,id=drive-virtio-disk234 \
--device virtio-blk-pci,bus=pci.1,addr=0x8,drive=drive-virtio-disk234,id=virtio-disk234 \
+-device virtio-blk-pci,bus=pci.1,addr=0x7,drive=drive-virtio-disk234,id=virtio-disk234 \
 -drive file=/var/lib/libvirt/images/disk-i-b.img,format=raw,if=none,id=drive-virtio-disk235 \
--device virtio-blk-pci,bus=pci.1,addr=0x9,drive=drive-virtio-disk235,id=virtio-disk235 \
+-device virtio-blk-pci,bus=pci.1,addr=0x8,drive=drive-virtio-disk235,id=virtio-disk235 \
 -drive file=/var/lib/libvirt/images/disk-i-c.img,format=raw,if=none,id=drive-virtio-disk236 \
--device virtio-blk-pci,bus=pci.1,addr=0xa,drive=drive-virtio-disk236,id=virtio-disk236 \
+-device virtio-blk-pci,bus=pci.1,addr=0x9,drive=drive-virtio-disk236,id=virtio-disk236 \
 -drive file=/var/lib/libvirt/images/disk-i-d.img,format=raw,if=none,id=drive-virtio-disk237 \
--device virtio-blk-pci,bus=pci.1,addr=0xb,drive=drive-virtio-disk237,id=virtio-disk237 \
+-device virtio-blk-pci,bus=pci.1,addr=0xa,drive=drive-virtio-disk237,id=virtio-disk237 \
 -drive file=/var/lib/libvirt/images/disk-j-a.img,format=raw,if=none,id=drive-virtio-disk260 \
--device virtio-blk-pci,bus=pci.1,addr=0xc,drive=drive-virtio-disk260,id=virtio-disk260 \
+-device virtio-blk-pci,bus=pci.1,addr=0xb,drive=drive-virtio-disk260,id=virtio-disk260 \
 -drive file=/var/lib/libvirt/images/disk-j-b.img,format=raw,if=none,id=drive-virtio-disk261 \
--device virtio-blk-pci,bus=pci.1,addr=0xd,drive=drive-virtio-disk261,id=virtio-disk261 \
+-device virtio-blk-pci,bus=pci.1,addr=0xc,drive=drive-virtio-disk261,id=virtio-disk261 \
 -drive file=/var/lib/libvirt/images/disk-j-c.img,format=raw,if=none,id=drive-virtio-disk262 \
--device virtio-blk-pci,bus=pci.1,addr=0xe,drive=drive-virtio-disk262,id=virtio-disk262 \
+-device virtio-blk-pci,bus=pci.1,addr=0xd,drive=drive-virtio-disk262,id=virtio-disk262 \
 -drive file=/var/lib/libvirt/images/disk-j-d.img,format=raw,if=none,id=drive-virtio-disk263 \
--device virtio-blk-pci,bus=pci.1,addr=0xf,drive=drive-virtio-disk263,id=virtio-disk263 \
+-device virtio-blk-pci,bus=pci.1,addr=0xe,drive=drive-virtio-disk263,id=virtio-disk263 \
 -drive file=/var/lib/libvirt/images/disk-k-a.img,format=raw,if=none,id=drive-virtio-disk286 \
--device virtio-blk-pci,bus=pci.1,addr=0x10,drive=drive-virtio-disk286,id=virtio-disk286 \
+-device virtio-blk-pci,bus=pci.1,addr=0xf,drive=drive-virtio-disk286,id=virtio-disk286 \
 -drive file=/var/lib/libvirt/images/disk-k-b.img,format=raw,if=none,id=drive-virtio-disk287 \
--device virtio-blk-pci,bus=pci.1,addr=0x11,drive=drive-virtio-disk287,id=virtio-disk287 \
+-device virtio-blk-pci,bus=pci.1,addr=0x10,drive=drive-virtio-disk287,id=virtio-disk287 \
 -drive file=/var/lib/libvirt/images/disk-k-c.img,format=raw,if=none,id=drive-virtio-disk288 \
--device virtio-blk-pci,bus=pci.1,addr=0x12,drive=drive-virtio-disk288,id=virtio-disk288 \
+-device virtio-blk-pci,bus=pci.1,addr=0x11,drive=drive-virtio-disk288,id=virtio-disk288 \
 -drive file=/var/lib/libvirt/images/disk-k-d.img,format=raw,if=none,id=drive-virtio-disk289 \
--device virtio-blk-pci,bus=pci.1,addr=0x13,drive=drive-virtio-disk289,id=virtio-disk289 \
+-device virtio-blk-pci,bus=pci.1,addr=0x12,drive=drive-virtio-disk289,id=virtio-disk289 \
 -drive file=/var/lib/libvirt/images/disk-l-a.img,format=raw,if=none,id=drive-virtio-disk312 \
--device virtio-blk-pci,bus=pci.1,addr=0x14,drive=drive-virtio-disk312,id=virtio-disk312 \
+-device virtio-blk-pci,bus=pci.1,addr=0x13,drive=drive-virtio-disk312,id=virtio-disk312 \
 -drive file=/var/lib/libvirt/images/disk-l-b.img,format=raw,if=none,id=drive-virtio-disk313 \
--device virtio-blk-pci,bus=pci.1,addr=0x15,drive=drive-virtio-disk313,id=virtio-disk313 \
+-device virtio-blk-pci,bus=pci.1,addr=0x14,drive=drive-virtio-disk313,id=virtio-disk313 \
 -drive file=/var/lib/libvirt/images/disk-l-c.img,format=raw,if=none,id=drive-virtio-disk314 \
--device virtio-blk-pci,bus=pci.1,addr=0x16,drive=drive-virtio-disk314,id=virtio-disk314 \
+-device virtio-blk-pci,bus=pci.1,addr=0x15,drive=drive-virtio-disk314,id=virtio-disk314 \
 -drive file=/var/lib/libvirt/images/disk-l-d.img,format=raw,if=none,id=drive-virtio-disk315 \
--device virtio-blk-pci,bus=pci.1,addr=0x17,drive=drive-virtio-disk315,id=virtio-disk315 \
+-device virtio-blk-pci,bus=pci.1,addr=0x16,drive=drive-virtio-disk315,id=virtio-disk315 \
 -drive file=/var/lib/libvirt/images/disk-m-a.img,format=raw,if=none,id=drive-virtio-disk338 \
--device virtio-blk-pci,bus=pci.1,addr=0x18,drive=drive-virtio-disk338,id=virtio-disk338 \
+-device virtio-blk-pci,bus=pci.1,addr=0x17,drive=drive-virtio-disk338,id=virtio-disk338 \
 -drive file=/var/lib/libvirt/images/disk-m-b.img,format=raw,if=none,id=drive-virtio-disk339 \
--device virtio-blk-pci,bus=pci.1,addr=0x19,drive=drive-virtio-disk339,id=virtio-disk339 \
+-device virtio-blk-pci,bus=pci.1,addr=0x18,drive=drive-virtio-disk339,id=virtio-disk339 \
 -drive file=/var/lib/libvirt/images/disk-m-c.img,format=raw,if=none,id=drive-virtio-disk340 \
--device virtio-blk-pci,bus=pci.1,addr=0x1a,drive=drive-virtio-disk340,id=virtio-disk340 \
+-device virtio-blk-pci,bus=pci.1,addr=0x19,drive=drive-virtio-disk340,id=virtio-disk340 \
 -drive file=/var/lib/libvirt/images/disk-m-d.img,format=raw,if=none,id=drive-virtio-disk341 \
--device virtio-blk-pci,bus=pci.1,addr=0x1b,drive=drive-virtio-disk341,id=virtio-disk341 \
+-device virtio-blk-pci,bus=pci.1,addr=0x1a,drive=drive-virtio-disk341,id=virtio-disk341 \
 -drive file=/var/lib/libvirt/images/disk-n-a.img,format=raw,if=none,id=drive-virtio-disk364 \
--device virtio-blk-pci,bus=pci.1,addr=0x1c,drive=drive-virtio-disk364,id=virtio-disk364 \
+-device virtio-blk-pci,bus=pci.1,addr=0x1b,drive=drive-virtio-disk364,id=virtio-disk364 \
 -drive file=/var/lib/libvirt/images/disk-n-b.img,format=raw,if=none,id=drive-virtio-disk365 \
--device virtio-blk-pci,bus=pci.1,addr=0x1d,drive=drive-virtio-disk365,id=virtio-disk365 \
+-device virtio-blk-pci,bus=pci.1,addr=0x1c,drive=drive-virtio-disk365,id=virtio-disk365 \
 -drive file=/var/lib/libvirt/images/disk-n-c.img,format=raw,if=none,id=drive-virtio-disk366 \
--device virtio-blk-pci,bus=pci.1,addr=0x1e,drive=drive-virtio-disk366,id=virtio-disk366 \
+-device virtio-blk-pci,bus=pci.1,addr=0x1d,drive=drive-virtio-disk366,id=virtio-disk366 \
 -drive file=/var/lib/libvirt/images/disk-n-d.img,format=raw,if=none,id=drive-virtio-disk367 \
--device virtio-blk-pci,bus=pci.1,addr=0x1f,drive=drive-virtio-disk367,id=virtio-disk367 \
+-device virtio-blk-pci,bus=pci.1,addr=0x1e,drive=drive-virtio-disk367,id=virtio-disk367 \
 -drive file=/var/lib/libvirt/images/disk-o-a.img,format=raw,if=none,id=drive-virtio-disk390 \
--device virtio-blk-pci,bus=pci.2,addr=0x1,drive=drive-virtio-disk390,id=virtio-disk390 \
+-device virtio-blk-pci,bus=pci.1,addr=0x1f,drive=drive-virtio-disk390,id=virtio-disk390 \
 -drive file=/var/lib/libvirt/images/disk-o-b.img,format=raw,if=none,id=drive-virtio-disk391 \
--device virtio-blk-pci,bus=pci.2,addr=0x2,drive=drive-virtio-disk391,id=virtio-disk391 \
+-device virtio-blk-pci,bus=pci.2,addr=0x1,drive=drive-virtio-disk391,id=virtio-disk391 \
 -drive file=/var/lib/libvirt/images/disk-o-c.img,format=raw,if=none,id=drive-virtio-disk392 \
--device virtio-blk-pci,bus=pci.2,addr=0x3,drive=drive-virtio-disk392,id=virtio-disk392 \
+-device virtio-blk-pci,bus=pci.2,addr=0x2,drive=drive-virtio-disk392,id=virtio-disk392 \
 -drive file=/var/lib/libvirt/images/disk-o-d.img,format=raw,if=none,id=drive-virtio-disk393 \
--device virtio-blk-pci,bus=pci.2,addr=0x4,drive=drive-virtio-disk393,id=virtio-disk393 \
+-device virtio-blk-pci,bus=pci.2,addr=0x3,drive=drive-virtio-disk393,id=virtio-disk393 \
 -drive file=/var/lib/libvirt/images/disk-p-a.img,format=raw,if=none,id=drive-virtio-disk416 \
--device virtio-blk-pci,bus=pci.2,addr=0x5,drive=drive-virtio-disk416,id=virtio-disk416 \
+-device virtio-blk-pci,bus=pci.2,addr=0x4,drive=drive-virtio-disk416,id=virtio-disk416 \
 -drive file=/var/lib/libvirt/images/disk-p-b.img,format=raw,if=none,id=drive-virtio-disk417 \
--device virtio-blk-pci,bus=pci.2,addr=0x6,drive=drive-virtio-disk417,id=virtio-disk417 \
+-device virtio-blk-pci,bus=pci.2,addr=0x5,drive=drive-virtio-disk417,id=virtio-disk417 \
 -drive file=/var/lib/libvirt/images/disk-p-c.img,format=raw,if=none,id=drive-virtio-disk418 \
--device virtio-blk-pci,bus=pci.2,addr=0x7,drive=drive-virtio-disk418,id=virtio-disk418 \
+-device virtio-blk-pci,bus=pci.2,addr=0x6,drive=drive-virtio-disk418,id=virtio-disk418 \
 -drive file=/var/lib/libvirt/images/disk-p-d.img,format=raw,if=none,id=drive-virtio-disk419 \
--device virtio-blk-pci,bus=pci.2,addr=0x8,drive=drive-virtio-disk419,id=virtio-disk419 \
+-device virtio-blk-pci,bus=pci.2,addr=0x7,drive=drive-virtio-disk419,id=virtio-disk419 \
 -drive file=/var/lib/libvirt/images/disk-q-a.img,format=raw,if=none,id=drive-virtio-disk442 \
--device virtio-blk-pci,bus=pci.2,addr=0x9,drive=drive-virtio-disk442,id=virtio-disk442 \
+-device virtio-blk-pci,bus=pci.2,addr=0x8,drive=drive-virtio-disk442,id=virtio-disk442 \
 -drive file=/var/lib/libvirt/images/disk-q-b.img,format=raw,if=none,id=drive-virtio-disk443 \
--device virtio-blk-pci,bus=pci.2,addr=0xa,drive=drive-virtio-disk443,id=virtio-disk443 \
+-device virtio-blk-pci,bus=pci.2,addr=0x9,drive=drive-virtio-disk443,id=virtio-disk443 \
 -drive file=/var/lib/libvirt/images/disk-q-c.img,format=raw,if=none,id=drive-virtio-disk444 \
--device virtio-blk-pci,bus=pci.2,addr=0xb,drive=drive-virtio-disk444,id=virtio-disk444 \
+-device virtio-blk-pci,bus=pci.2,addr=0xa,drive=drive-virtio-disk444,id=virtio-disk444 \
 -drive file=/var/lib/libvirt/images/disk-q-d.img,format=raw,if=none,id=drive-virtio-disk445 \
--device virtio-blk-pci,bus=pci.2,addr=0xc,drive=drive-virtio-disk445,id=virtio-disk445 \
+-device virtio-blk-pci,bus=pci.2,addr=0xb,drive=drive-virtio-disk445,id=virtio-disk445 \
 -drive file=/var/lib/libvirt/images/disk-r-a.img,format=raw,if=none,id=drive-virtio-disk468 \
--device virtio-blk-pci,bus=pci.2,addr=0xd,drive=drive-virtio-disk468,id=virtio-disk468 \
+-device virtio-blk-pci,bus=pci.2,addr=0xc,drive=drive-virtio-disk468,id=virtio-disk468 \
 -drive file=/var/lib/libvirt/images/disk-r-b.img,format=raw,if=none,id=drive-virtio-disk469 \
--device virtio-blk-pci,bus=pci.2,addr=0xe,drive=drive-virtio-disk469,id=virtio-disk469 \
+-device virtio-blk-pci,bus=pci.2,addr=0xd,drive=drive-virtio-disk469,id=virtio-disk469 \
 -drive file=/var/lib/libvirt/images/disk-r-c.img,format=raw,if=none,id=drive-virtio-disk470 \
--device virtio-blk-pci,bus=pci.2,addr=0xf,drive=drive-virtio-disk470,id=virtio-disk470 \
+-device virtio-blk-pci,bus=pci.2,addr=0xe,drive=drive-virtio-disk470,id=virtio-disk470 \
 -drive file=/var/lib/libvirt/images/disk-r-d.img,format=raw,if=none,id=drive-virtio-disk471 \
--device virtio-blk-pci,bus=pci.2,addr=0x10,drive=drive-virtio-disk471,id=virtio-disk471 \
+-device virtio-blk-pci,bus=pci.2,addr=0xf,drive=drive-virtio-disk471,id=virtio-disk471 \
 -drive file=/var/lib/libvirt/images/disk-s-a.img,format=raw,if=none,id=drive-virtio-disk494 \
--device virtio-blk-pci,bus=pci.2,addr=0x11,drive=drive-virtio-disk494,id=virtio-disk494 \
+-device virtio-blk-pci,bus=pci.2,addr=0x10,drive=drive-virtio-disk494,id=virtio-disk494 \
 -drive file=/var/lib/libvirt/images/disk-s-b.img,format=raw,if=none,id=drive-virtio-disk495 \
--device virtio-blk-pci,bus=pci.2,addr=0x12,drive=drive-virtio-disk495,id=virtio-disk495 \
+-device virtio-blk-pci,bus=pci.2,addr=0x11,drive=drive-virtio-disk495,id=virtio-disk495 \
 -drive file=/var/lib/libvirt/images/disk-s-c.img,format=raw,if=none,id=drive-virtio-disk496 \
--device virtio-blk-pci,bus=pci.2,addr=0x13,drive=drive-virtio-disk496,id=virtio-disk496 \
+-device virtio-blk-pci,bus=pci.2,addr=0x12,drive=drive-virtio-disk496,id=virtio-disk496 \
 -drive file=/var/lib/libvirt/images/disk-s-d.img,format=raw,if=none,id=drive-virtio-disk497 \
--device virtio-blk-pci,bus=pci.2,addr=0x14,drive=drive-virtio-disk497,id=virtio-disk497 \
+-device virtio-blk-pci,bus=pci.2,addr=0x13,drive=drive-virtio-disk497,id=virtio-disk497 \
 -drive file=/var/lib/libvirt/images/disk-t-a.img,format=raw,if=none,id=drive-virtio-disk520 \
--device virtio-blk-pci,bus=pci.2,addr=0x15,drive=drive-virtio-disk520,id=virtio-disk520 \
+-device virtio-blk-pci,bus=pci.2,addr=0x14,drive=drive-virtio-disk520,id=virtio-disk520 \
 -drive file=/var/lib/libvirt/images/disk-t-b.img,format=raw,if=none,id=drive-virtio-disk521 \
--device virtio-blk-pci,bus=pci.2,addr=0x16,drive=drive-virtio-disk521,id=virtio-disk521 \
+-device virtio-blk-pci,bus=pci.2,addr=0x15,drive=drive-virtio-disk521,id=virtio-disk521 \
 -drive file=/var/lib/libvirt/images/disk-t-c.img,format=raw,if=none,id=drive-virtio-disk522 \
--device virtio-blk-pci,bus=pci.2,addr=0x17,drive=drive-virtio-disk522,id=virtio-disk522 \
+-device virtio-blk-pci,bus=pci.2,addr=0x16,drive=drive-virtio-disk522,id=virtio-disk522 \
 -drive file=/var/lib/libvirt/images/disk-t-d.img,format=raw,if=none,id=drive-virtio-disk523 \
--device virtio-blk-pci,bus=pci.2,addr=0x18,drive=drive-virtio-disk523,id=virtio-disk523 \
+-device virtio-blk-pci,bus=pci.2,addr=0x17,drive=drive-virtio-disk523,id=virtio-disk523 \
 -drive file=/var/lib/libvirt/images/disk-u-a.img,format=raw,if=none,id=drive-virtio-disk546 \
--device virtio-blk-pci,bus=pci.2,addr=0x19,drive=drive-virtio-disk546,id=virtio-disk546 \
+-device virtio-blk-pci,bus=pci.2,addr=0x18,drive=drive-virtio-disk546,id=virtio-disk546 \
 -drive file=/var/lib/libvirt/images/disk-u-b.img,format=raw,if=none,id=drive-virtio-disk547 \
--device virtio-blk-pci,bus=pci.2,addr=0x1a,drive=drive-virtio-disk547,id=virtio-disk547 \
+-device virtio-blk-pci,bus=pci.2,addr=0x19,drive=drive-virtio-disk547,id=virtio-disk547 \
 -drive file=/var/lib/libvirt/images/disk-u-c.img,format=raw,if=none,id=drive-virtio-disk548 \
--device virtio-blk-pci,bus=pci.2,addr=0x1b,drive=drive-virtio-disk548,id=virtio-disk548 \
+-device virtio-blk-pci,bus=pci.2,addr=0x1a,drive=drive-virtio-disk548,id=virtio-disk548 \
 -drive file=/var/lib/libvirt/images/disk-u-d.img,format=raw,if=none,id=drive-virtio-disk549 \
--device virtio-blk-pci,bus=pci.2,addr=0x1c,drive=drive-virtio-disk549,id=virtio-disk549 \
+-device virtio-blk-pci,bus=pci.2,addr=0x1b,drive=drive-virtio-disk549,id=virtio-disk549 \
 -drive file=/var/lib/libvirt/images/disk-v-a.img,format=raw,if=none,id=drive-virtio-disk572 \
--device virtio-blk-pci,bus=pci.2,addr=0x1d,drive=drive-virtio-disk572,id=virtio-disk572 \
+-device virtio-blk-pci,bus=pci.2,addr=0x1c,drive=drive-virtio-disk572,id=virtio-disk572 \
 -drive file=/var/lib/libvirt/images/disk-v-b.img,format=raw,if=none,id=drive-virtio-disk573 \
--device virtio-blk-pci,bus=pci.2,addr=0x1e,drive=drive-virtio-disk573,id=virtio-disk573 \
+-device virtio-blk-pci,bus=pci.2,addr=0x1d,drive=drive-virtio-disk573,id=virtio-disk573 \
 -drive file=/var/lib/libvirt/images/disk-v-c.img,format=raw,if=none,id=drive-virtio-disk574 \
--device virtio-blk-pci,bus=pci.2,addr=0x1f,drive=drive-virtio-disk574,id=virtio-disk574 \
+-device virtio-blk-pci,bus=pci.2,addr=0x1e,drive=drive-virtio-disk574,id=virtio-disk574 \
 -drive file=/var/lib/libvirt/images/disk-v-d.img,format=raw,if=none,id=drive-virtio-disk575 \
--device virtio-blk-pci,bus=pci.3,addr=0x1,drive=drive-virtio-disk575,id=virtio-disk575 \
+-device virtio-blk-pci,bus=pci.2,addr=0x1f,drive=drive-virtio-disk575,id=virtio-disk575 \
 -drive file=/var/lib/libvirt/images/disk-w-a.img,format=raw,if=none,id=drive-virtio-disk598 \
--device virtio-blk-pci,bus=pci.3,addr=0x2,drive=drive-virtio-disk598,id=virtio-disk598 \
+-device virtio-blk-pci,bus=pci.3,addr=0x1,drive=drive-virtio-disk598,id=virtio-disk598 \
 -drive file=/var/lib/libvirt/images/disk-w-b.img,format=raw,if=none,id=drive-virtio-disk599 \
--device virtio-blk-pci,bus=pci.3,addr=0x3,drive=drive-virtio-disk599,id=virtio-disk599 \
+-device virtio-blk-pci,bus=pci.3,addr=0x2,drive=drive-virtio-disk599,id=virtio-disk599 \
 -drive file=/var/lib/libvirt/images/disk-w-c.img,format=raw,if=none,id=drive-virtio-disk600 \
--device virtio-blk-pci,bus=pci.3,addr=0x4,drive=drive-virtio-disk600,id=virtio-disk600 \
+-device virtio-blk-pci,bus=pci.3,addr=0x3,drive=drive-virtio-disk600,id=virtio-disk600 \
 -drive file=/var/lib/libvirt/images/disk-w-d.img,format=raw,if=none,id=drive-virtio-disk601 \
--device virtio-blk-pci,bus=pci.3,addr=0x5,drive=drive-virtio-disk601,id=virtio-disk601 \
+-device virtio-blk-pci,bus=pci.3,addr=0x4,drive=drive-virtio-disk601,id=virtio-disk601 \
 -drive file=/var/lib/libvirt/images/disk-x-a.img,format=raw,if=none,id=drive-virtio-disk624 \
--device virtio-blk-pci,bus=pci.3,addr=0x6,drive=drive-virtio-disk624,id=virtio-disk624 \
+-device virtio-blk-pci,bus=pci.3,addr=0x5,drive=drive-virtio-disk624,id=virtio-disk624 \
 -drive file=/var/lib/libvirt/images/disk-x-b.img,format=raw,if=none,id=drive-virtio-disk625 \
--device virtio-blk-pci,bus=pci.3,addr=0x7,drive=drive-virtio-disk625,id=virtio-disk625 \
+-device virtio-blk-pci,bus=pci.3,addr=0x6,drive=drive-virtio-disk625,id=virtio-disk625 \
 -drive file=/var/lib/libvirt/images/disk-x-c.img,format=raw,if=none,id=drive-virtio-disk626 \
--device virtio-blk-pci,bus=pci.3,addr=0x8,drive=drive-virtio-disk626,id=virtio-disk626 \
+-device virtio-blk-pci,bus=pci.3,addr=0x7,drive=drive-virtio-disk626,id=virtio-disk626 \
 -drive file=/var/lib/libvirt/images/disk-x-d.img,format=raw,if=none,id=drive-virtio-disk627 \
--device virtio-blk-pci,bus=pci.3,addr=0x9,drive=drive-virtio-disk627,id=virtio-disk627 \
+-device virtio-blk-pci,bus=pci.3,addr=0x8,drive=drive-virtio-disk627,id=virtio-disk627 \
 -drive file=/var/lib/libvirt/images/disk-y-a.img,format=raw,if=none,id=drive-virtio-disk650 \
--device virtio-blk-pci,bus=pci.3,addr=0xa,drive=drive-virtio-disk650,id=virtio-disk650 \
+-device virtio-blk-pci,bus=pci.3,addr=0x9,drive=drive-virtio-disk650,id=virtio-disk650 \
 -drive file=/var/lib/libvirt/images/disk-y-b.img,format=raw,if=none,id=drive-virtio-disk651 \
--device virtio-blk-pci,bus=pci.3,addr=0xb,drive=drive-virtio-disk651,id=virtio-disk651 \
+-device virtio-blk-pci,bus=pci.3,addr=0xa,drive=drive-virtio-disk651,id=virtio-disk651 \
 -drive file=/var/lib/libvirt/images/disk-y-c.img,format=raw,if=none,id=drive-virtio-disk652 \
--device virtio-blk-pci,bus=pci.3,addr=0xc,drive=drive-virtio-disk652,id=virtio-disk652 \
+-device virtio-blk-pci,bus=pci.3,addr=0xb,drive=drive-virtio-disk652,id=virtio-disk652 \
 -drive file=/var/lib/libvirt/images/disk-y-d.img,format=raw,if=none,id=drive-virtio-disk653 \
--device virtio-blk-pci,bus=pci.3,addr=0xd,drive=drive-virtio-disk653,id=virtio-disk653 \
+-device virtio-blk-pci,bus=pci.3,addr=0xc,drive=drive-virtio-disk653,id=virtio-disk653 \
 -drive file=/var/lib/libvirt/images/disk-z-a.img,format=raw,if=none,id=drive-virtio-disk676 \
--device virtio-blk-pci,bus=pci.3,addr=0xe,drive=drive-virtio-disk676,id=virtio-disk676 \
+-device virtio-blk-pci,bus=pci.3,addr=0xd,drive=drive-virtio-disk676,id=virtio-disk676 \
 -drive file=/var/lib/libvirt/images/disk-z-b.img,format=raw,if=none,id=drive-virtio-disk677 \
--device virtio-blk-pci,bus=pci.3,addr=0xf,drive=drive-virtio-disk677,id=virtio-disk677 \
+-device virtio-blk-pci,bus=pci.3,addr=0xe,drive=drive-virtio-disk677,id=virtio-disk677 \
 -drive file=/var/lib/libvirt/images/disk-z-c.img,format=raw,if=none,id=drive-virtio-disk678 \
--device virtio-blk-pci,bus=pci.3,addr=0x10,drive=drive-virtio-disk678,id=virtio-disk678 \
+-device virtio-blk-pci,bus=pci.3,addr=0xf,drive=drive-virtio-disk678,id=virtio-disk678 \
 -drive file=/var/lib/libvirt/images/disk-z-d.img,format=raw,if=none,id=drive-virtio-disk679 \
--device virtio-blk-pci,bus=pci.3,addr=0x11,drive=drive-virtio-disk679,id=virtio-disk679
+-device virtio-blk-pci,bus=pci.3,addr=0x10,drive=drive-virtio-disk679,id=virtio-disk679

diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdata/pci-bridge.args
index 00a9996bfed8479e2632fec13ab50c7ed1ef9b05..571e25cb4db1a167e2cd1dc74bf36d6b6863212b 100644 (file)
--- a/tests/qemuxml2argvdata/pci-bridge.args
+++ b/tests/qemuxml2argvdata/pci-bridge.args
@@ -92,5 +92,5 @@ QEMU_AUDIO_DRV=none \
 -device e1000,netdev=hostnet31,id=net31,mac=52:54:00:7e:6e:c8,bus=pci.1,addr=0x6 \
 -vnc 127.0.0.1:0 \
 -k en-us \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6

diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args b/tests/qemuxml2argvdata/pci-expander-bus.args
index c010cc90c9e97d89751c7f345ae9b3bb95af1cc6..a4fcd982fe65940a9cf52bec6d015fa12b79476f 100644 (file)
--- a/tests/qemuxml2argvdata/pci-expander-bus.args
+++ b/tests/qemuxml2argvdata/pci-expander-bus.args
@@ -25,70 +25,70 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
--device pxb,bus_nr=254,id=pci.1,numa_node=1,bus=pci.0,addr=0x3 \
--device pxb,bus_nr=252,id=pci.2,bus=pci.0,addr=0x4 \
+-device pxb,bus_nr=254,id=pci.1,numa_node=1,bus=pci.0,addr=0x2 \
+-device pxb,bus_nr=252,id=pci.2,bus=pci.0,addr=0x3 \
 -netdev user,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:f1:95:51,bus=pci.0,addr=0x5 \
+-device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:f1:95:51,bus=pci.0,addr=0x4 \
 -netdev user,id=hostnet1 \
--device e1000,netdev=hostnet1,id=net1,mac=52:54:00:5c:c6:1a,bus=pci.0,addr=0x7 \
+-device e1000,netdev=hostnet1,id=net1,mac=52:54:00:5c:c6:1a,bus=pci.0,addr=0x5 \
 -netdev user,id=hostnet2 \
--device e1000,netdev=hostnet2,id=net2,mac=52:54:00:39:97:ac,bus=pci.0,addr=0x8 \
+-device e1000,netdev=hostnet2,id=net2,mac=52:54:00:39:97:ac,bus=pci.0,addr=0x7 \
 -netdev user,id=hostnet3 \
--device e1000,netdev=hostnet3,id=net3,mac=52:54:00:45:28:cb,bus=pci.0,addr=0x9 \
+-device e1000,netdev=hostnet3,id=net3,mac=52:54:00:45:28:cb,bus=pci.0,addr=0x8 \
 -netdev user,id=hostnet4 \
--device e1000,netdev=hostnet4,id=net4,mac=52:54:00:ee:b9:a8,bus=pci.0,addr=0xa \
+-device e1000,netdev=hostnet4,id=net4,mac=52:54:00:ee:b9:a8,bus=pci.0,addr=0x9 \
 -netdev user,id=hostnet5 \
--device e1000,netdev=hostnet5,id=net5,mac=52:54:00:a9:f7:17,bus=pci.0,addr=0xb \
+-device e1000,netdev=hostnet5,id=net5,mac=52:54:00:a9:f7:17,bus=pci.0,addr=0xa \
 -netdev user,id=hostnet6 \
--device e1000,netdev=hostnet6,id=net6,mac=52:54:00:df:2b:f3,bus=pci.0,addr=0xc \
+-device e1000,netdev=hostnet6,id=net6,mac=52:54:00:df:2b:f3,bus=pci.0,addr=0xb \
 -netdev user,id=hostnet7 \
--device e1000,netdev=hostnet7,id=net7,mac=52:54:00:78:94:b4,bus=pci.0,addr=0xd \
+-device e1000,netdev=hostnet7,id=net7,mac=52:54:00:78:94:b4,bus=pci.0,addr=0xc \
 -netdev user,id=hostnet8 \
--device e1000,netdev=hostnet8,id=net8,mac=52:54:00:6b:9b:06,bus=pci.0,addr=0xe \
+-device e1000,netdev=hostnet8,id=net8,mac=52:54:00:6b:9b:06,bus=pci.0,addr=0xd \
 -netdev user,id=hostnet9 \
--device e1000,netdev=hostnet9,id=net9,mac=52:54:00:17:df:bc,bus=pci.0,addr=0xf \
+-device e1000,netdev=hostnet9,id=net9,mac=52:54:00:17:df:bc,bus=pci.0,addr=0xe \
 -netdev user,id=hostnet10 \
--device e1000,netdev=hostnet10,id=net10,mac=52:54:00:3b:d0:51,bus=pci.0,addr=0x10 \
+-device e1000,netdev=hostnet10,id=net10,mac=52:54:00:3b:d0:51,bus=pci.0,addr=0xf \
 -netdev user,id=hostnet11 \
--device e1000,netdev=hostnet11,id=net11,mac=52:54:00:8d:2d:17,bus=pci.0,addr=0x11 \
+-device e1000,netdev=hostnet11,id=net11,mac=52:54:00:8d:2d:17,bus=pci.0,addr=0x10 \
 -netdev user,id=hostnet12 \
--device e1000,netdev=hostnet12,id=net12,mac=52:54:00:a7:66:af,bus=pci.0,addr=0x12 \
+-device e1000,netdev=hostnet12,id=net12,mac=52:54:00:a7:66:af,bus=pci.0,addr=0x11 \
 -netdev user,id=hostnet13 \
--device e1000,netdev=hostnet13,id=net13,mac=52:54:00:54:ab:d7,bus=pci.0,addr=0x13 \
+-device e1000,netdev=hostnet13,id=net13,mac=52:54:00:54:ab:d7,bus=pci.0,addr=0x12 \
 -netdev user,id=hostnet14 \
--device e1000,netdev=hostnet14,id=net14,mac=52:54:00:1f:99:90,bus=pci.0,addr=0x14 \
+-device e1000,netdev=hostnet14,id=net14,mac=52:54:00:1f:99:90,bus=pci.0,addr=0x13 \
 -netdev user,id=hostnet15 \
--device e1000,netdev=hostnet15,id=net15,mac=52:54:00:c8:43:87,bus=pci.0,addr=0x15 \
+-device e1000,netdev=hostnet15,id=net15,mac=52:54:00:c8:43:87,bus=pci.0,addr=0x14 \
 -netdev user,id=hostnet16 \
--device e1000,netdev=hostnet16,id=net16,mac=52:54:00:df:22:b2,bus=pci.0,addr=0x16 \
+-device e1000,netdev=hostnet16,id=net16,mac=52:54:00:df:22:b2,bus=pci.0,addr=0x15 \
 -netdev user,id=hostnet17 \
--device e1000,netdev=hostnet17,id=net17,mac=52:54:00:d2:9a:47,bus=pci.0,addr=0x17 \
+-device e1000,netdev=hostnet17,id=net17,mac=52:54:00:d2:9a:47,bus=pci.0,addr=0x16 \
 -netdev user,id=hostnet18 \
--device e1000,netdev=hostnet18,id=net18,mac=52:54:00:86:05:e2,bus=pci.0,addr=0x18 \
+-device e1000,netdev=hostnet18,id=net18,mac=52:54:00:86:05:e2,bus=pci.0,addr=0x17 \
 -netdev user,id=hostnet19 \
--device e1000,netdev=hostnet19,id=net19,mac=52:54:00:8c:1c:c2,bus=pci.0,addr=0x19 \
+-device e1000,netdev=hostnet19,id=net19,mac=52:54:00:8c:1c:c2,bus=pci.0,addr=0x18 \
 -netdev user,id=hostnet20 \
--device e1000,netdev=hostnet20,id=net20,mac=52:54:00:48:58:92,bus=pci.0,addr=0x1a \
+-device e1000,netdev=hostnet20,id=net20,mac=52:54:00:48:58:92,bus=pci.0,addr=0x19 \
 -netdev user,id=hostnet21 \
--device e1000,netdev=hostnet21,id=net21,mac=52:54:00:99:e5:bf,bus=pci.0,addr=0x1b \
+-device e1000,netdev=hostnet21,id=net21,mac=52:54:00:99:e5:bf,bus=pci.0,addr=0x1a \
 -netdev user,id=hostnet22 \
--device e1000,netdev=hostnet22,id=net22,mac=52:54:00:b1:8c:25,bus=pci.0,addr=0x1c \
+-device e1000,netdev=hostnet22,id=net22,mac=52:54:00:b1:8c:25,bus=pci.0,addr=0x1b \
 -netdev user,id=hostnet23 \
--device e1000,netdev=hostnet23,id=net23,mac=52:54:00:60:e0:d0,bus=pci.0,addr=0x1d \
+-device e1000,netdev=hostnet23,id=net23,mac=52:54:00:60:e0:d0,bus=pci.0,addr=0x1c \
 -netdev user,id=hostnet24 \
--device e1000,netdev=hostnet24,id=net24,mac=52:54:00:37:00:6a,bus=pci.0,addr=0x1e \
+-device e1000,netdev=hostnet24,id=net24,mac=52:54:00:37:00:6a,bus=pci.0,addr=0x1d \
 -netdev user,id=hostnet25 \
--device e1000,netdev=hostnet25,id=net25,mac=52:54:00:c7:c8:ad,bus=pci.0,addr=0x1f \
+-device e1000,netdev=hostnet25,id=net25,mac=52:54:00:c7:c8:ad,bus=pci.0,addr=0x1e \
 -netdev user,id=hostnet26 \
--device e1000,netdev=hostnet26,id=net26,mac=52:54:00:4e:a7:cf,bus=pci.1,addr=0x0 \
+-device e1000,netdev=hostnet26,id=net26,mac=52:54:00:4e:a7:cf,bus=pci.0,addr=0x1f \
 -netdev user,id=hostnet27 \
--device e1000,netdev=hostnet27,id=net27,mac=52:54:00:00:79:69,bus=pci.1,addr=0x1 \
+-device e1000,netdev=hostnet27,id=net27,mac=52:54:00:00:79:69,bus=pci.1,addr=0x0 \
 -netdev user,id=hostnet28 \
--device e1000,netdev=hostnet28,id=net28,mac=52:54:00:47:00:6f,bus=pci.1,addr=0x2 \
+-device e1000,netdev=hostnet28,id=net28,mac=52:54:00:47:00:6f,bus=pci.1,addr=0x1 \
 -netdev user,id=hostnet29 \
--device e1000,netdev=hostnet29,id=net29,mac=52:54:00:2a:8c:8b,bus=pci.1,addr=0x3 \
+-device e1000,netdev=hostnet29,id=net29,mac=52:54:00:2a:8c:8b,bus=pci.1,addr=0x2 \
 -netdev user,id=hostnet30 \
--device e1000,netdev=hostnet30,id=net30,mac=52:54:00:ec:d5:e3,bus=pci.1,addr=0x4 \
+-device e1000,netdev=hostnet30,id=net30,mac=52:54:00:ec:d5:e3,bus=pci.1,addr=0x3 \
 -netdev user,id=hostnet31 \
--device e1000,netdev=hostnet31,id=net31,mac=52:54:00:7e:6e:c8,bus=pci.1,addr=0x5 \
+-device e1000,netdev=hostnet31,id=net31,mac=52:54:00:7e:6e:c8,bus=pci.1,addr=0x4 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6

diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.args
index 2512b2bdebfa702b299be9b347060682935a8def..972a5d43ffa98aec050e42130ba9d8fa6228a8f4 100644 (file)
--- a/tests/qemuxml2argvdata/pci-many.args
+++ b/tests/qemuxml2argvdata/pci-many.args
@@ -81,5 +81,5 @@ QEMU_AUDIO_DRV=none \
 -device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=drive-virtio-disk182,id=virtio-disk182 \
 -drive file=/var/lib/libvirt/images/disk-g-b.img,format=raw,if=none,id=drive-virtio-disk183 \
 -device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=drive-virtio-disk183,id=virtio-disk183 \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6

diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.args b/tests/qemuxml2argvdata/pci-rom-disabled.args
index 1552a069f5ba7c2db6405a603b66158b5d415cae..10fd805c8ecc4370dd1f6b93ab38c2161551de8a 100644 (file)
--- a/tests/qemuxml2argvdata/pci-rom-disabled.args
+++ b/tests/qemuxml2argvdata/pci-rom-disabled.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -netdev user,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,addr=0x3,romfile=
+-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,addr=0x2,romfile=

diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.args
index 047f27d2d98de87e001d12ae8f4019f4c4f11d9a..1d0eeb17e0d38537e38521e9999e015dee63cb6d 100644 (file)
--- a/tests/qemuxml2argvdata/pci-rom.args
+++ b/tests/qemuxml2argvdata/pci-rom.args
@@ -27,9 +27,9 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,addr=0x3,rombar=1 \
+-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,addr=0x2,rombar=1 \
 -netdev user,id=hostnet1 \
--device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:24:a5:9e,bus=pci.0,addr=0x4,romfile=/etc/fake/bootrom.bin \
--device vfio-pci,host=0000:06:12.5,id=hostdev0,bus=pci.0,addr=0x5,rombar=0 \
--device vfio-pci,host=0000:06:12.6,id=hostdev1,bus=pci.0,addr=0x6,rombar=1,romfile=/etc/fake/bootrom.bin \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7
+-device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:24:a5:9e,bus=pci.0,addr=0x3,romfile=/etc/fake/bootrom.bin \
+-device vfio-pci,host=0000:06:12.5,id=hostdev0,bus=pci.0,addr=0x4,rombar=0 \
+-device vfio-pci,host=0000:06:12.6,id=hostdev1,bus=pci.0,addr=0x5,rombar=1,romfile=/etc/fake/bootrom.bin \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6

diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
index 543c645b8b57aa6b3fb4849033ac8844023ac3d4..d4e1768e52e69a7516d45883cd87757ab272260a 100644 (file)
--- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev tty,id=charserial0,path=/dev/ttyS2 \
 -device pci-serial,chardev=charserial0,id=serial0,bus=pci.0,addr=0x4 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
index 234f58be60816a0da0c77dfa56d4b6c05c585c3c..ea3a735b9c9afaa965bc565def15dbf868970e3f 100644 (file)
--- a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
@@ -23,6 +23,6 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
--device pcie-root-port,port=0x10,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \
--device pcie-root-port,port=0x11,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
--device ioh3420,port=0x12,chassis=3,id=pci.3,bus=pcie.0,addr=0x2.0x2
+-device pcie-root-port,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
+-device pcie-root-port,port=0x9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
+-device ioh3420,port=0xa,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2

diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
index 38f61ccc13d5b79950cacc996d956859100bfa1b..d0ffa60b86a66cef03d53e2f6686a5745bfd6938 100644 (file)
--- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
@@ -23,5 +23,5 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
--device ioh3420,port=0x10,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \
--device ioh3420,port=0x11,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1
+-device ioh3420,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
+-device ioh3420,port=0x9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1

diff --git a/tests/qemuxml2argvdata/pcihole64.args b/tests/qemuxml2argvdata/pcihole64.args
index 9cf277b39011afb6c158b9a7ef6f039abdf71d3a..2d45126d01822d5e1c0930091f621f27f05ef3bd 100644 (file)
--- a/tests/qemuxml2argvdata/pcihole64.args
+++ b/tests/qemuxml2argvdata/pcihole64.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -global i440FX-pcihost.pci-hole64-size=1048576K \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args b/tests/qemuxml2argvdata/q35-pci-force-address.args
index 19f8648c7cc0c34c91317eecf6a6206c3779f185..e61a43dfe009a8a8de76d3b7f155d018ac330fe5 100644 (file)
--- a/tests/qemuxml2argvdata/q35-pci-force-address.args
+++ b/tests/qemuxml2argvdata/q35-pci-force-address.args
@@ -25,7 +25,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
--device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
+-device ioh3420,port=0x8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
 -netdev user,id=hostnet0 \
 -device e1000e,netdev=hostnet0,id=net0,mac=52:54:00:aa:bf:ef,bus=pci.2,addr=0x1 \
 -device intel-hda,id=sound0,bus=pci.3,addr=0x0 \

diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
index 0f9a37523031ac3771d18627b47de05c1a78a14e..f75686f4638489256f1c90c3a5eb3889a22693f3 100644 (file)
--- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
@@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=none \
 -global PIIX4_PM.disable_s4=1 \
 -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
--device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
+-device ioh3420,port=0x8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x1

diff --git a/tests/qemuxml2argvdata/q35-pm-disable.args b/tests/qemuxml2argvdata/q35-pm-disable.args
index 485ea80e14edbfa901a6b4c490d6e3d994a47546..dcdd4574328ea871f5f1935c22ec120da946b6c2 100644 (file)
--- a/tests/qemuxml2argvdata/q35-pm-disable.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable.args
@@ -27,5 +27,5 @@ QEMU_AUDIO_DRV=none \
 -global ICH9-LPC.disable_s4=1 \
 -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
--device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
+-device ioh3420,port=0x8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x1

diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args b/tests/qemuxml2argvdata/qemu-ns-alt.args
index 04c9a66cb98344419bb7598448115f759e9a3e43..19c884813bf0bb6ca2bd4e136d008725fd6b475c 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-alt.args
+++ b/tests/qemuxml2argvdata/qemu-ns-alt.args
@@ -28,5 +28,5 @@ BAR='' \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -unknown parameter

diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
index 05bab92f308e15868279cfb7f01b677213453bbf..d88a94b4bdf78c0b7ce4e512f71603c7d90e3bb1 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 ARGUMENT

diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
index 05bab92f308e15868279cfb7f01b677213453bbf..d88a94b4bdf78c0b7ce4e512f71603c7d90e3bb1 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 ARGUMENT

diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args b/tests/qemuxml2argvdata/qemu-ns-commandline.args
index 05bab92f308e15868279cfb7f01b677213453bbf..d88a94b4bdf78c0b7ce4e512f71603c7d90e3bb1 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 ARGUMENT

diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
index 05bab92f308e15868279cfb7f01b677213453bbf..d88a94b4bdf78c0b7ce4e512f71603c7d90e3bb1 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 ARGUMENT

diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
index 05bab92f308e15868279cfb7f01b677213453bbf..d88a94b4bdf78c0b7ce4e512f71603c7d90e3bb1 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 ARGUMENT

diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
index 05bab92f308e15868279cfb7f01b677213453bbf..d88a94b4bdf78c0b7ce4e512f71603c7d90e3bb1 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 ARGUMENT

diff --git a/tests/qemuxml2argvdata/restore-v2-fd.args b/tests/qemuxml2argvdata/restore-v2-fd.args
index 1fe1913513bcdbceaea336cdb649d0e01b3bd195..9535795942e478db7f76ca060b97a43c7c0a4047 100644 (file)
--- a/tests/qemuxml2argvdata/restore-v2-fd.args
+++ b/tests/qemuxml2argvdata/restore-v2-fd.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -incoming fd:7 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args b/tests/qemuxml2argvdata/seclabel-dac-none.args
index 5770ba928af271685820273f89b3f64c159a446c..699ed70abcd8963b033de8e0c395ff5117a5f225 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dac-none.args
+++ b/tests/qemuxml2argvdata/seclabel-dac-none.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
index 5770ba928af271685820273f89b3f64c159a446c..699ed70abcd8963b033de8e0c395ff5117a5f225 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
index 5770ba928af271685820273f89b3f64c159a446c..699ed70abcd8963b033de8e0c395ff5117a5f225 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
index c1c4ffcf999a82b998bb9d30ccf2685076a88cb3..72dbb0f1c581e571ba2cd733df8cfb4cb7a37a4d 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-1 \
 -device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
index 5770ba928af271685820273f89b3f64c159a446c..699ed70abcd8963b033de8e0c395ff5117a5f225 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args b/tests/qemuxml2argvdata/seclabel-dynamic.args
index 5770ba928af271685820273f89b3f64c159a446c..699ed70abcd8963b033de8e0c395ff5117a5f225 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dynamic.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/seclabel-none.args b/tests/qemuxml2argvdata/seclabel-none.args
index 5770ba928af271685820273f89b3f64c159a446c..699ed70abcd8963b033de8e0c395ff5117a5f225 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-none.args
+++ b/tests/qemuxml2argvdata/seclabel-none.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
index 5770ba928af271685820273f89b3f64c159a446c..699ed70abcd8963b033de8e0c395ff5117a5f225 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args b/tests/qemuxml2argvdata/seclabel-static-relabel.args
index 5770ba928af271685820273f89b3f64c159a446c..699ed70abcd8963b033de8e0c395ff5117a5f225 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-static-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/seclabel-static.args b/tests/qemuxml2argvdata/seclabel-static.args
index 5770ba928af271685820273f89b3f64c159a446c..699ed70abcd8963b033de8e0c395ff5117a5f225 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-static.args
+++ b/tests/qemuxml2argvdata/seclabel-static.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
index 7669ecd87c34e68cc3fb539c1c020817992bd099..a3a3c71c3f8e83833bee82748502093f5daeb0d1 100644 (file)
--- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev tty,id=charserial0,path=/dev/ttyS2 \
 -device isa-serial,chardev=charserial0,id=serial0,iobase=0x3f8,irq=0x4 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args b/tests/qemuxml2argvdata/serial-dev-chardev.args
index a55f2470774067b427ee94818223a53e1767f941..209e27bdc9d60f8d5b80209536cf7d08b58c587a 100644 (file)
--- a/tests/qemuxml2argvdata/serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev tty,id=charserial0,path=/dev/ttyS2 \
 -device isa-serial,chardev=charserial0,id=serial0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/serial-file-chardev.args b/tests/qemuxml2argvdata/serial-file-chardev.args
index 5654e1ac13ec89b1c9b46fd36059c936120d387b..99c67377a557a717ddd01c1441ba854303836239 100644 (file)
--- a/tests/qemuxml2argvdata/serial-file-chardev.args
+++ b/tests/qemuxml2argvdata/serial-file-chardev.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev file,id=charserial0,path=/tmp/serial.log,append=on \
 -device isa-serial,chardev=charserial0,id=serial0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/serial-many-chardev.args b/tests/qemuxml2argvdata/serial-many-chardev.args
index 9918c3a5992050699021bdca0a11a68875ae6869..6656a6009eb2a2b7f162674eb219c41d03721bd0 100644 (file)
--- a/tests/qemuxml2argvdata/serial-many-chardev.args
+++ b/tests/qemuxml2argvdata/serial-many-chardev.args
@@ -30,4 +30,4 @@ QEMU_AUDIO_DRV=none \
 -device isa-serial,chardev=charserial0,id=serial0 \
 -chardev file,id=charserial1,path=/tmp/serial.log \
 -device isa-serial,chardev=charserial1,id=serial1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.args b/tests/qemuxml2argvdata/serial-pty-chardev.args
index e46ad1044267f8c0c288b60294e4571ecb9eff80..10370f64830808709862b74d65e5dfc4b70a366e 100644 (file)
--- a/tests/qemuxml2argvdata/serial-pty-chardev.args
+++ b/tests/qemuxml2argvdata/serial-pty-chardev.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/serial-spiceport-nospice.args b/tests/qemuxml2argvdata/serial-spiceport-nospice.args
index 5770ba928af271685820273f89b3f64c159a446c..699ed70abcd8963b033de8e0c395ff5117a5f225 100644 (file)
--- a/tests/qemuxml2argvdata/serial-spiceport-nospice.args
+++ b/tests/qemuxml2argvdata/serial-spiceport-nospice.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.args b/tests/qemuxml2argvdata/serial-tcp-chardev.args
index 963619be2be2897e8675fa0ac734538e3ea3e215..cc7d6b863916c13d5afbe2f0fe0ae26c1a876149 100644 (file)
--- a/tests/qemuxml2argvdata/serial-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-chardev.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev socket,id=charserial0,host=127.0.0.1,port=9999 \
 -device isa-serial,chardev=charserial0,id=serial0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
index ec834152faedea8ce86e07d353ba4dcb9f4f00ba..d9e450fe755af1b37ac9d09a319bd2ceb2974e27 100644 (file)
--- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev socket,id=charserial0,host=127.0.0.1,port=9999,telnet=on,server=on,wait=off \
 -device isa-serial,chardev=charserial0,id=serial0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
index cb62e40f48b72103737857c1b7406e1fb014c6d6..06ff3a3a4db457c81474ff653149c5cbca313d8d 100644 (file)
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
@@ -31,4 +31,4 @@ QEMU_AUDIO_DRV=none \
 -object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,endpoint=client,verify-peer=on \
 -chardev socket,id=charserial1,host=127.0.0.1,port=5555,tls-creds=objcharserial1_tls0 \
 -device isa-serial,chardev=charserial1,id=serial1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
index cb62e40f48b72103737857c1b7406e1fb014c6d6..06ff3a3a4db457c81474ff653149c5cbca313d8d 100644 (file)
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
@@ -31,4 +31,4 @@ QEMU_AUDIO_DRV=none \
 -object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,endpoint=client,verify-peer=on \
 -chardev socket,id=charserial1,host=127.0.0.1,port=5555,tls-creds=objcharserial1_tls0 \
 -device isa-serial,chardev=charserial1,id=serial1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.args b/tests/qemuxml2argvdata/serial-udp-chardev.args
index bf92f10578490745666880c7c946586132b3f91a..dfbc7e11e1c8bbd98a50aa6c7d7342df917953dd 100644 (file)
--- a/tests/qemuxml2argvdata/serial-udp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-udp-chardev.args
@@ -30,4 +30,4 @@ QEMU_AUDIO_DRV=none \
 -device isa-serial,chardev=charserial0,id=serial0 \
 -chardev udp,id=charserial1,host=,port=9999,localaddr=,localport=0 \
 -device isa-serial,chardev=charserial1,id=serial1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.args b/tests/qemuxml2argvdata/serial-unix-chardev.args
index 659006e991e5dad00e09b31efd910c23b06f6fca..aaec92a96e8d22a747ec5e7986518f620a5fec5b 100644 (file)
--- a/tests/qemuxml2argvdata/serial-unix-chardev.args
+++ b/tests/qemuxml2argvdata/serial-unix-chardev.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device isa-serial,chardev=charserial0,id=serial0 \
 -chardev socket,id=charserial1,path=/tmp/serial-server.sock,server=on,wait=off \
 -device isa-serial,chardev=charserial1,id=serial1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args b/tests/qemuxml2argvdata/serial-vc-chardev.args
index 7e37ca631cbc3c865a310210dfd8e722efbbc912..19f54a411971f7ed36095a13da02673367780f03 100644 (file)
--- a/tests/qemuxml2argvdata/serial-vc-chardev.args
+++ b/tests/qemuxml2argvdata/serial-vc-chardev.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev vc,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.args b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
index aeb27e5ed5296d5425dca40e2981063f7d42d6ed..ba3204233a4f244bcaa86726e4151a67ea64f814 100644 (file)
--- a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
+++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
@@ -25,18 +25,18 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -usb \
 -object memory-backend-file,id=shmmem-shmem0,mem-path=/dev/shm/shmem0,size=4194304,share=on \
--device ivshmem-plain,id=shmem0,memdev=shmmem-shmem0,bus=pci.0,addr=0x3 \
+-device ivshmem-plain,id=shmem0,memdev=shmmem-shmem0,bus=pci.0,addr=0x2 \
 -object memory-backend-file,id=shmmem-shmem1,mem-path=/dev/shm/shmem1,size=134217728,share=on \
--device ivshmem-plain,id=shmem1,memdev=shmmem-shmem1,master=off,bus=pci.0,addr=0x5 \
+-device ivshmem-plain,id=shmem1,memdev=shmmem-shmem1,master=off,bus=pci.0,addr=0x3 \
 -object memory-backend-file,id=shmmem-shmem2,mem-path=/dev/shm/shmem2,size=268435456,share=on \
 -device ivshmem-plain,id=shmem2,memdev=shmmem-shmem2,master=on,bus=pci.0,addr=0x4 \
--device ivshmem-doorbell,id=shmem3,chardev=charshmem3,ioeventfd=on,bus=pci.0,addr=0x6 \
+-device ivshmem-doorbell,id=shmem3,chardev=charshmem3,ioeventfd=on,bus=pci.0,addr=0x5 \
 -chardev socket,id=charshmem3,path=/var/lib/libvirt/shmem-shmem3-sock \
--device ivshmem-doorbell,id=shmem4,chardev=charshmem4,ioeventfd=on,bus=pci.0,addr=0x7 \
+-device ivshmem-doorbell,id=shmem4,chardev=charshmem4,ioeventfd=on,bus=pci.0,addr=0x6 \
 -chardev socket,id=charshmem4,path=/tmp/shmem4-sock \
--device ivshmem-doorbell,id=shmem5,chardev=charshmem5,ioeventfd=off,bus=pci.0,addr=0x8 \
+-device ivshmem-doorbell,id=shmem5,chardev=charshmem5,ioeventfd=off,bus=pci.0,addr=0x7 \
 -chardev socket,id=charshmem5,path=/tmp/shmem5-sock \
--device ivshmem-doorbell,id=shmem6,chardev=charshmem6,vectors=16,ioeventfd=on,bus=pci.0,addr=0x9 \
+-device ivshmem-doorbell,id=shmem6,chardev=charshmem6,vectors=16,ioeventfd=on,bus=pci.0,addr=0x8 \
 -chardev socket,id=charshmem6,path=/tmp/shmem6-sock \
--device ivshmem-doorbell,id=shmem7,chardev=charshmem7,vectors=32,ioeventfd=on,bus=pci.0,addr=0xa \
+-device ivshmem-doorbell,id=shmem7,chardev=charshmem7,vectors=32,ioeventfd=on,bus=pci.0,addr=0x9 \
 -chardev socket,id=charshmem7,path=/tmp/shmem7-sock

diff --git a/tests/qemuxml2argvdata/shmem.args b/tests/qemuxml2argvdata/shmem.args
index 89df230fc52fc7151552b1cfb949d7fd91eb7585..8e55cc328769cb2c6ea07ad522650e6f1888eee2 100644 (file)
--- a/tests/qemuxml2argvdata/shmem.args
+++ b/tests/qemuxml2argvdata/shmem.args
@@ -24,16 +24,16 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device ivshmem,id=shmem0,size=4m,shm=shmem0,bus=pci.0,addr=0x3 \
--device ivshmem,id=shmem1,size=128m,shm=shmem1,bus=pci.0,addr=0x5 \
+-device ivshmem,id=shmem0,size=4m,shm=shmem0,bus=pci.0,addr=0x2 \
+-device ivshmem,id=shmem1,size=128m,shm=shmem1,bus=pci.0,addr=0x3 \
 -device ivshmem,id=shmem2,size=256m,shm=shmem2,bus=pci.0,addr=0x4 \
--device ivshmem,id=shmem3,size=512m,chardev=charshmem3,bus=pci.0,addr=0x6 \
+-device ivshmem,id=shmem3,size=512m,chardev=charshmem3,bus=pci.0,addr=0x5 \
 -chardev socket,id=charshmem3,path=/var/lib/libvirt/shmem-shmem3-sock \
--device ivshmem,id=shmem4,size=1024m,chardev=charshmem4,bus=pci.0,addr=0x7 \
+-device ivshmem,id=shmem4,size=1024m,chardev=charshmem4,bus=pci.0,addr=0x6 \
 -chardev socket,id=charshmem4,path=/tmp/shmem4-sock \
--device ivshmem,id=shmem5,size=2048m,chardev=charshmem5,msi=on,ioeventfd=off,bus=pci.0,addr=0x8 \
+-device ivshmem,id=shmem5,size=2048m,chardev=charshmem5,msi=on,ioeventfd=off,bus=pci.0,addr=0x7 \
 -chardev socket,id=charshmem5,path=/tmp/shmem5-sock \
--device ivshmem,id=shmem6,size=4096m,chardev=charshmem6,msi=on,vectors=16,bus=pci.0,addr=0x9 \
+-device ivshmem,id=shmem6,size=4096m,chardev=charshmem6,msi=on,vectors=16,bus=pci.0,addr=0x8 \
 -chardev socket,id=charshmem6,path=/tmp/shmem6-sock \
--device ivshmem,id=shmem7,size=8192m,chardev=charshmem7,msi=on,vectors=32,ioeventfd=on,bus=pci.0,addr=0xa \
+-device ivshmem,id=shmem7,size=8192m,chardev=charshmem7,msi=on,vectors=32,ioeventfd=on,bus=pci.0,addr=0x9 \
 -chardev socket,id=charshmem7,path=/tmp/shmem7-sock

diff --git a/tests/qemuxml2argvdata/smartcard-controller.args b/tests/qemuxml2argvdata/smartcard-controller.args
index b1f55f66ee5fc166b3cdf7eda138930200d95d95..4906c23e0a037858ad489f78120dc8b5d37090fa 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-controller.args
+++ b/tests/qemuxml2argvdata/smartcard-controller.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -device usb-ccid,id=ccid0,bus=usb.0,port=1 \
 -device ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
index d99a343db9506042b56f41786a234d0af461f735..52cbb3884e11ca4670ec705b03d4b27368b0a156 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -device usb-ccid,id=ccid0,bus=usb.0,port=1 \
 -device ccid-card-emulated,backend=certificates,cert1=cert1,cert2=cert2,cert3=cert3,db=/tmp/foo,id=smartcard0,bus=ccid0.0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args b/tests/qemuxml2argvdata/smartcard-host-certificates.args
index 907a58d0816907d3748124a3f551a70fb8f31838..cab65b173390b3be11e37493dd3d91f6e89a365c 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-host-certificates.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -device usb-ccid,id=ccid0,bus=usb.0,port=1 \
 -device ccid-card-emulated,backend=certificates,cert1=cert1,cert2=cert2,cert3=cert3,db=/etc/pki/nssdb,id=smartcard0,bus=ccid0.0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/smartcard-host.args b/tests/qemuxml2argvdata/smartcard-host.args
index b1f55f66ee5fc166b3cdf7eda138930200d95d95..4906c23e0a037858ad489f78120dc8b5d37090fa 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-host.args
+++ b/tests/qemuxml2argvdata/smartcard-host.args
@@ -26,4 +26,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -device usb-ccid,id=ccid0,bus=usb.0,port=1 \
 -device ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
index a57c74d5585381b28befd1f8cc67f8aec186e737..0a10a212e061dd0c57733679e27f298069a6ab84 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -device usb-ccid,id=ccid0,bus=usb.0,port=1 \
 -chardev spicevmc,id=charsmartcard0,name=smartcard \
 -device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
index 905ced4ed2bcc24bed809e3232df831c01363e92..c06f16ae5398232bacfab1e3e28f137b84c31d50 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -device usb-ccid,id=ccid0,bus=usb.0,port=1 \
 -chardev socket,id=charsmartcard0,host=127.0.0.1,port=2001,server=on,wait=off \
 -device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args
index 7b434e7e328373486b1e7665d80aacfea52f5da2..d58d410809995c09dcb913a67f6e0b744452e977 100644 (file)
--- a/tests/qemuxml2argvdata/smbios.args
+++ b/tests/qemuxml2argvdata/smbios.args
@@ -31,4 +31,4 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/sound-device.args b/tests/qemuxml2argvdata/sound-device.args
index f8b1792a1d1456110237b04bac210a9902e952d2..cc026df2ecdbdcd6167abf2060ae6f60d138c53a 100644 (file)
--- a/tests/qemuxml2argvdata/sound-device.args
+++ b/tests/qemuxml2argvdata/sound-device.args
@@ -27,20 +27,20 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -soundhw pcspk \
--device ES1370,id=sound1,bus=pci.0,addr=0x3 \
+-device ES1370,id=sound1,bus=pci.0,addr=0x2 \
 -device sb16,id=sound2 \
--device AC97,id=sound3,bus=pci.0,addr=0x4 \
--device intel-hda,id=sound4,bus=pci.0,addr=0x5 \
+-device AC97,id=sound3,bus=pci.0,addr=0x3 \
+-device intel-hda,id=sound4,bus=pci.0,addr=0x4 \
 -device hda-duplex,id=sound4-codec0,bus=sound4.0,cad=0 \
--device intel-hda,id=sound5,bus=pci.0,addr=0x6 \
+-device intel-hda,id=sound5,bus=pci.0,addr=0x5 \
 -device hda-micro,id=sound5-codec0,bus=sound5.0,cad=0 \
 -device hda-duplex,id=sound5-codec1,bus=sound5.0,cad=1 \
 -device hda-output,id=sound5-codec2,bus=sound5.0,cad=2 \
--device ich9-intel-hda,id=sound6,bus=pci.0,addr=0x7 \
+-device ich9-intel-hda,id=sound6,bus=pci.0,addr=0x6 \
 -device hda-duplex,id=sound6-codec0,bus=sound6.0,cad=0 \
--device ich9-intel-hda,id=sound7,bus=pci.0,addr=0x8 \
+-device ich9-intel-hda,id=sound7,bus=pci.0,addr=0x7 \
 -device hda-micro,id=sound7-codec0,bus=sound7.0,cad=0 \
 -device hda-duplex,id=sound7-codec1,bus=sound7.0,cad=1 \
 -device hda-output,id=sound7-codec2,bus=sound7.0,cad=2 \
 -device usb-audio,id=sound8,bus=usb.0,port=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x9
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x8

diff --git a/tests/qemuxml2argvdata/sound.args b/tests/qemuxml2argvdata/sound.args
index 8d861a47f5945b35df4cf9e186c6ddd1efaf11b4..e76bec43edc620ef154fff1fdee74536d4dbdf4b 100644 (file)
--- a/tests/qemuxml2argvdata/sound.args
+++ b/tests/qemuxml2argvdata/sound.args
@@ -27,6 +27,6 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -soundhw pcspk \
--device ES1370,id=sound1,bus=pci.0,addr=0x3 \
+-device ES1370,id=sound1,bus=pci.0,addr=0x2 \
 -device sb16,id=sound2 \
--device AC97,id=sound3,bus=pci.0,addr=0x4
+-device AC97,id=sound3,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
index 46e623b3d357a5a57917855f46c97a2f24b57a5b..6b84c62f92e03edaff3b6313a8bed5ceb8e4dc94 100644 (file)
--- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
@@ -23,4 +23,4 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
--device qemu-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x3
+-device qemu-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args b/tests/qemuxml2argvdata/usb-controller-xhci.args
index a061f72d4ffa96dd3567a8faeba71aa2a6747e84..e624d4db10e5ea2c277cb271025812022b11d01b 100644 (file)
--- a/tests/qemuxml2argvdata/usb-controller-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-xhci.args
@@ -23,4 +23,4 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
--device nec-usb-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x3
+-device nec-usb-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/usb-controller.args b/tests/qemuxml2argvdata/usb-controller.args
index f48cd091641e85f4c95b18b858b97a30bf259148..22f4032a6b7e0dbd912bbd7162363ae723490655 100644 (file)
--- a/tests/qemuxml2argvdata/usb-controller.args
+++ b/tests/qemuxml2argvdata/usb-controller.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
index d19103aaa60a75ef187b025142caad585c859561..171cca07097d08f488a1c8054569cb61a32cb17a 100644 (file)
--- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
@@ -43,4 +43,4 @@ QEMU_AUDIO_DRV=none \
 -device usb-tablet,id=input13,bus=usb.0,port=1.1.7 \
 -device usb-tablet,id=input14,bus=usb.0,port=1.1.8 \
 -device usb-tablet,id=input15,bus=usb.0,port=2.1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args b/tests/qemuxml2argvdata/usb-hub-autoadd.args
index 449421b103489c05199cb5d625510f23967c4754..5f6974bff3cf0c6de4ad96943fe24ba96d6f340f 100644 (file)
--- a/tests/qemuxml2argvdata/usb-hub-autoadd.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args
@@ -29,4 +29,4 @@ QEMU_AUDIO_DRV=none \
 -device usb-mouse,id=input1,bus=usb.0,port=1.1 \
 -device usb-mouse,id=input2,bus=usb.0,port=1.2 \
 -device usb-tablet,id=input3,bus=usb.0,port=1.3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/usb-hub.args
index 6cbd8c61a735ba1ab58cd0544f1f56be29af4c4d..d751493360d48e42b53fac78998d7247f47e6e49 100644 (file)
--- a/tests/qemuxml2argvdata/usb-hub.args
+++ b/tests/qemuxml2argvdata/usb-hub.args
@@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -usb \
 -device usb-hub,id=hub0,bus=usb.0,port=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
index b7f7b64517814a9597aab4e8f8a79abaa5b0d5f7..1b1a0b8b09047d3dd3402d217da0f143129f03be 100644 (file)
--- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
@@ -32,4 +32,4 @@ QEMU_AUDIO_DRV=none \
 -device usb-mouse,id=input0,bus=usb.0,port=3 \
 -device usb-mouse,id=input1,bus=usb.0,port=4 \
 -device usb-mouse,id=input2,bus=usb.0,port=5 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args b/tests/qemuxml2argvdata/usb-ich9-companion.args
index e9f437cded1a66ff232e4dd04bc62aef3b9dea99..77aa396263a13a03719424cbc33bc57b2556f1fe 100644 (file)
--- a/tests/qemuxml2argvdata/usb-ich9-companion.args
+++ b/tests/qemuxml2argvdata/usb-ich9-companion.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
 -device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
 -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
index 122923294f3528c0ea441faa852a182975870e7c..bb7a9b3983fb177008142710d24728f9eea189ab 100644 (file)
--- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
+++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
@@ -23,16 +23,16 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
--device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x3.0x7 \
--device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x3 \
--device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x3.0x2 \
--device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x3.0x1 \
--device ich9-usb-ehci1,id=usb1,bus=pci.0,addr=0x4.0x7 \
--device ich9-usb-uhci1,masterbus=usb1.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
--device ich9-usb-uhci3,masterbus=usb1.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
--device ich9-usb-uhci2,masterbus=usb1.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
--device ich9-usb-ehci1,id=usb2,bus=pci.0,addr=0x5.0x7 \
--device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.0,multifunction=on,addr=0x5 \
--device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.0,addr=0x5.0x2 \
--device ich9-usb-uhci2,masterbus=usb2.0,firstport=2,bus=pci.0,addr=0x5.0x1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6
+-device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x2.0x7 \
+-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x2 \
+-device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x2.0x2 \
+-device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x2.0x1 \
+-device ich9-usb-ehci1,id=usb1,bus=pci.0,addr=0x3.0x7 \
+-device ich9-usb-uhci1,masterbus=usb1.0,firstport=0,bus=pci.0,multifunction=on,addr=0x3 \
+-device ich9-usb-uhci3,masterbus=usb1.0,firstport=4,bus=pci.0,addr=0x3.0x2 \
+-device ich9-usb-uhci2,masterbus=usb1.0,firstport=2,bus=pci.0,addr=0x3.0x1 \
+-device ich9-usb-ehci1,id=usb2,bus=pci.0,addr=0x4.0x7 \
+-device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
+-device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
+-device ich9-usb-uhci2,masterbus=usb2.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5

diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args b/tests/qemuxml2argvdata/usb-long-port-path.args
index 2fd62a7997670eb6ff3bcb4756eedb34da87de63..9da0d13db6234f5c4bd69289c49434656b427454 100644 (file)
--- a/tests/qemuxml2argvdata/usb-long-port-path.args
+++ b/tests/qemuxml2argvdata/usb-long-port-path.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device usb-hub,id=hub1,bus=usb.0,port=1.1 \
 -device usb-hub,id=hub2,bus=usb.0,port=1.1.1 \
 -device usb-hub,id=hub3,bus=usb.0,port=1.1.1.1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/usb-none.args
index 1c50617665d6020305cc73df161518c4fdaeb024..000961d51c689e42642603203a388f3242f28cb5 100644 (file)
--- a/tests/qemuxml2argvdata/usb-none.args
+++ b/tests/qemuxml2argvdata/usb-none.args
@@ -23,4 +23,4 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args b/tests/qemuxml2argvdata/usb-piix3-controller.args
index 4e004d9273a2253f6149128d08ca342da6606c21..efaf5c49f8172a641c0cbce0ae8cba3989ff8164 100644 (file)
--- a/tests/qemuxml2argvdata/usb-piix3-controller.args
+++ b/tests/qemuxml2argvdata/usb-piix3-controller.args
@@ -24,4 +24,4 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args b/tests/qemuxml2argvdata/usb-port-autoassign.args
index 8e40f6ac34c2ad965d0bc0f9b0c7d67b3eccaf3a..2533c91b5ec755d437611fb0a7086fe868bfb113 100644 (file)
--- a/tests/qemuxml2argvdata/usb-port-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-port-autoassign.args
@@ -29,4 +29,4 @@ QEMU_AUDIO_DRV=none \
 -device usb-mouse,id=input0,bus=usb.0,port=1.1 \
 -device usb-mouse,id=input1,bus=usb.0,port=1.2 \
 -device usb-mouse,id=input2,bus=usb.0,port=1.3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/usb-port-missing.args b/tests/qemuxml2argvdata/usb-port-missing.args
index c4c45c051ac1a0b11b3ffd25e7f138a98ae8ab7c..d6d971fbc0737689575eac060ca869581247352c 100644 (file)
--- a/tests/qemuxml2argvdata/usb-port-missing.args
+++ b/tests/qemuxml2argvdata/usb-port-missing.args
@@ -27,4 +27,4 @@ QEMU_AUDIO_DRV=none \
 -device usb-hub,id=hub0,bus=usb.0,port=1 \
 -device usb-hub,id=hub1,bus=usb.0,port=2 \
 -device usb-mouse,id=input0,bus=usb.0,port=1.1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/usb-ports.args b/tests/qemuxml2argvdata/usb-ports.args
index 35a1aff6e7f64b1baf36b983d4a78377bd962804..fe477e0558953198d49e33d3c6a9f75c45285f6c 100644 (file)
--- a/tests/qemuxml2argvdata/usb-ports.args
+++ b/tests/qemuxml2argvdata/usb-ports.args
@@ -29,4 +29,4 @@ QEMU_AUDIO_DRV=none \
 -device usb-mouse,id=input0,bus=usb.0,port=1.1 \
 -device usb-mouse,id=input1,bus=usb.0,port=1.2.1 \
 -device usb-mouse,id=input2,bus=usb.0,port=1.2.2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args b/tests/qemuxml2argvdata/usb-redir-boot.args
index dbc6863cef3fdc50e5b45396b6b1e332f1312eb2..ce66ccd4219ec8418a13af00197070703f82e6b9 100644 (file)
--- a/tests/qemuxml2argvdata/usb-redir-boot.args
+++ b/tests/qemuxml2argvdata/usb-redir-boot.args
@@ -31,4 +31,4 @@ QEMU_AUDIO_DRV=none \
 -device usb-redir,chardev=charredir0,id=redir0,bootindex=1,bus=usb.0,port=1 \
 -chardev spicevmc,id=charredir1,name=usbredir \
 -device usb-redir,chardev=charredir1,id=redir1,bootindex=2,bus=usb.0,port=4 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args b/tests/qemuxml2argvdata/usb-redir-filter-version.args
index 550ef2c49a8a59a195ecb8308940114196ed2c48..c44948e540ccdc12209c27070c463351b38850ea 100644 (file)
--- a/tests/qemuxml2argvdata/usb-redir-filter-version.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device 'usb-redir,chardev=charredir0,id=redir0,filter=0x08:0x15E1:0x2007:0x0109:1|0x08:0x15E1:0x2007:0x0940:1|-1:-1:-1:-1:0,bus=usb.0,port=1' \
 -chardev spicevmc,id=charredir1,name=usbredir \
 -device 'usb-redir,chardev=charredir1,id=redir1,filter=0x08:0x15E1:0x2007:0x0109:1|0x08:0x15E1:0x2007:0x0940:1|-1:-1:-1:-1:0,bus=usb.0,port=2' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args b/tests/qemuxml2argvdata/usb-redir-filter.args
index e3a58aac4dacec95074bcb2d2eaba8be7c9e7146..bb4709faf7229010b1c9a1188c3dfdfaa84195dd 100644 (file)
--- a/tests/qemuxml2argvdata/usb-redir-filter.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter.args
@@ -31,4 +31,4 @@ QEMU_AUDIO_DRV=none \
 -device 'usb-redir,chardev=charredir0,id=redir0,filter=0x08:0x15E1:0x2007:0x0110:1|-1:-1:-1:-1:0,bus=usb.0,port=4' \
 -chardev spicevmc,id=charredir1,name=usbredir \
 -device 'usb-redir,chardev=charredir1,id=redir1,filter=0x08:0x15E1:0x2007:0x0110:1|-1:-1:-1:-1:0,bus=usb.0,port=5' \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/usb-redir.args b/tests/qemuxml2argvdata/usb-redir.args
index a34ff4574d9eccd54502144df2e6e7be4684568a..a03f839f4bd2b7012cdb54786fed34f9e7f671f9 100644 (file)
--- a/tests/qemuxml2argvdata/usb-redir.args
+++ b/tests/qemuxml2argvdata/usb-redir.args
@@ -31,4 +31,4 @@ QEMU_AUDIO_DRV=none \
 -device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=1 \
 -chardev spicevmc,id=charredir1,name=usbredir \
 -device usb-redir,chardev=charredir1,id=redir1,bus=usb.0,port=4 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
index 25a9fc8a93fe76c9a211a77b284d4ad6aa38d01a..a59d91bf1848bb0ed4535b10e718ede264a492fc 100644 (file)
--- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
--device nec-usb-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x3 \
+-device nec-usb-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x2 \
 -device usb-hub,id=hub0,bus=usb.0,port=1 \
 -device usb-hub,id=hub1,bus=usb.0,port=2 \
 -device usb-mouse,id=input0,bus=usb.0,port=3 \

diff --git a/tests/qemuxml2argvdata/usb1-usb2.args b/tests/qemuxml2argvdata/usb1-usb2.args
index f2f00b824c72a77a24008623e8ce3173d203bfcf..07039edfff97464371cba76fa1bf3ac8dc32c84b 100644 (file)
--- a/tests/qemuxml2argvdata/usb1-usb2.args
+++ b/tests/qemuxml2argvdata/usb1-usb2.args
@@ -36,4 +36,4 @@ QEMU_AUDIO_DRV=none \
 -device usb-tablet,id=input0,bus=usb.0,port=2 \
 -device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=usb2.0,port=1 \
 -device usb-host,hostbus=14,hostaddr=7,id=hostdev1,bus=usb2.0,port=2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/user-aliases-usb.args b/tests/qemuxml2argvdata/user-aliases-usb.args
index b19b978cc4423511f7a68b1bffcc62a977846c9f..f57aaa8a0d1b1d125d709bc958d1765224777649 100644 (file)
--- a/tests/qemuxml2argvdata/user-aliases-usb.args
+++ b/tests/qemuxml2argvdata/user-aliases-usb.args
@@ -34,4 +34,4 @@ QEMU_AUDIO_DRV=none \
 -device ich9-usb-uhci3,masterbus=ua-myUSB5.0,firstport=4,bus=pci.0,addr=0x5.0x2 \
 -device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=ua-myUSB1.0,port=3 \
 -device usb-host,hostbus=15,hostaddr=6,id=hostdev1,bus=ua-myUSB5.0,port=3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/user-aliases.args b/tests/qemuxml2argvdata/user-aliases.args
index 1656e1df255b2bae832ed8fd8a1aa61613253851..0afdab79f80c5fb5477be5e626e74b1378058dbc 100644 (file)
--- a/tests/qemuxml2argvdata/user-aliases.args
+++ b/tests/qemuxml2argvdata/user-aliases.args
@@ -59,7 +59,7 @@ QEMU_AUDIO_DRV=none \
 -chardev socket,id=charchannel0,path=/var/lib/libvirt/qemu/channel/target/gentoo.org.qemu.guest_agent.0,server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.qemu.guest_agent.0 \
 -vnc 127.0.0.1:0 \
--vga cirrus \
+-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device intel-hda,id=sound0,bus=pci.0,addr=0x4 \
 -device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6

diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.args b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
index 5fa7a53e522e284ccfeb65b738e2ff45f5a425c1..1b0d2862b739a817b5eba98e2a0280a79c42e070 100644 (file)
--- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
@@ -26,10 +26,7 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--vga qxl \
--global qxl-vga.ram_size=67108864 \
--global qxl-vga.vram_size=67108864 \
--global qxl-vga.max_outputs=1 \
+-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,max_outputs=1,bus=pci.0,addr=0x2 \
 -device qxl,id=video1,ram_size=67108864,vram_size=33554432,max_outputs=3,bus=pci.0,addr=0x4 \
 -device qxl,id=video2,ram_size=67108864,vram_size=67108864,max_outputs=7,bus=pci.0,addr=0x5 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args b/tests/qemuxml2argvdata/virtio-input-passthrough.args
index d7094f21615b1ea1efe9c9523ca1b5482a62f5f9..c8c8354695d2398c072117f2ba123ffd255bc656 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-input-passthrough.args
+++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args
@@ -24,5 +24,5 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-input-host-pci,id=input0,evdev=/dev/input/event1234,bus=pci.0,addr=0x4 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-input-host-pci,id=input0,evdev=/dev/input/event1234,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/virtio-input.args b/tests/qemuxml2argvdata/virtio-input.args
index 034c3e09f63da3cff304a196d812180c8259a3e9..ea624f9193abcda4ea0801dab9a670dbe28e3b80 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-input.args
+++ b/tests/qemuxml2argvdata/virtio-input.args
@@ -24,7 +24,7 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-mouse-pci,id=input0,bus=pci.0,addr=0x4 \
+-device virtio-mouse-pci,id=input0,bus=pci.0,addr=0x3 \
 -device virtio-keyboard-pci,id=input1,bus=pci.0,addr=0xa \
--device virtio-tablet-pci,id=input2,bus=pci.0,addr=0x5 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-tablet-pci,id=input2,bus=pci.0,addr=0x4 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/virtio-lun.args b/tests/qemuxml2argvdata/virtio-lun.args
index 1001b8fb6df996ac1fb44db7c5eaab1198543a22..571122b78bc39a32d48c9b6428c76d1986173587 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-lun.args
+++ b/tests/qemuxml2argvdata/virtio-lun.args
@@ -31,5 +31,5 @@ QEMU_AUDIO_DRV=none \
 -drive file=/dev/sdfake2,format=raw,if=none,id=drive-virtio-disk1 \
 -device virtio-blk-pci,scsi=on,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
 -netdev user,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7
+-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x2 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args b/tests/qemuxml2argvdata/virtio-rng-default.args
index 9eca1101f8c3857168687690e800010a30e7cd52..a2ff88c7caac88560cddf6ce4d449a9570f67f38 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-rng-default.args
+++ b/tests/qemuxml2argvdata/virtio-rng-default.args
@@ -24,6 +24,6 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -object rng-random,id=objrng0,filename=/dev/random \
 -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x7

diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args b/tests/qemuxml2argvdata/virtio-rng-egd.args
index f631741cf4ba3b883e50328b45a20f62357d9f20..1b34bf65b7f95ce8cc35bacc3c3c30627da90bd0 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-rng-egd.args
+++ b/tests/qemuxml2argvdata/virtio-rng-egd.args
@@ -24,7 +24,7 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -chardev socket,id=charrng0,host=1.2.3.4,port=1234 \
 -object rng-egd,id=objrng0,chardev=charrng0 \
--device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x4
+-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args b/tests/qemuxml2argvdata/virtio-rng-multiple.args
index 0c34ae32ba78e92c7ce3dcff4b72dea8284d047f..29464ae63fa39d8f4cf2833b2449ab68ea5c21ab 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-rng-multiple.args
+++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args
@@ -24,9 +24,9 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -object rng-random,id=objrng0,filename=/dev/random \
 -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x7 \
 -chardev socket,id=charrng1,host=1.2.3.4,port=1234 \
 -object rng-egd,id=objrng1,chardev=charrng1 \
--device virtio-rng-pci,rng=objrng1,id=rng1,bus=pci.0,addr=0x4
+-device virtio-rng-pci,rng=objrng1,id=rng1,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args b/tests/qemuxml2argvdata/virtio-rng-random.args
index b1fb99bd1dad4de86f4ff14c29cb7ca78613ac7f..9c480dbef864da71e61ec8029d20a9d18ea7bd9e 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-rng-random.args
+++ b/tests/qemuxml2argvdata/virtio-rng-random.args
@@ -24,6 +24,6 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -object rng-random,id=objrng0,filename=/dev/urandom \
--device virtio-rng-pci,rng=objrng0,id=rng0,max-bytes=123,period=1234,bus=pci.0,addr=0x4
+-device virtio-rng-pci,rng=objrng0,id=rng0,max-bytes=123,period=1234,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdata/vmcoreinfo.args
index d1ac737031e898eacaf47a8e8e1f6c5f571e63cb..99a091780326ead70006369a12148eae3f8e8d7f 100644 (file)
--- a/tests/qemuxml2argvdata/vmcoreinfo.args
+++ b/tests/qemuxml2argvdata/vmcoreinfo.args
@@ -26,5 +26,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -device vmcoreinfo

diff --git a/tests/qemuxml2argvdata/watchdog-device.args b/tests/qemuxml2argvdata/watchdog-device.args
index 4924d88a12285ac3eec9358ac5aae15d9f8b72b1..1db0bbf5c2143f3ace235f933d67a1b00e89285a 100644 (file)
--- a/tests/qemuxml2argvdata/watchdog-device.args
+++ b/tests/qemuxml2argvdata/watchdog-device.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -device ib700,id=watchdog0 \
 -watchdog-action poweroff \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/watchdog-dump.args b/tests/qemuxml2argvdata/watchdog-dump.args
index 5e4df54d0e5077b6a4aa6858a3fc9736286509b7..c191193a1113fe6fa2b580b6ecce4af10076ccb2 100644 (file)
--- a/tests/qemuxml2argvdata/watchdog-dump.args
+++ b/tests/qemuxml2argvdata/watchdog-dump.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -device ib700,id=watchdog0 \
 -watchdog-action pause \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.args b/tests/qemuxml2argvdata/watchdog-injectnmi.args
index 5637db0912f4493a4b62a8afaeab882a1455cddc..872aa0ad70c8c3b8dc7ecb3d0f4eb4f03cb74891 100644 (file)
--- a/tests/qemuxml2argvdata/watchdog-injectnmi.args
+++ b/tests/qemuxml2argvdata/watchdog-injectnmi.args
@@ -28,4 +28,4 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -device ib700,id=watchdog0 \
 -watchdog-action inject-nmi \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

diff --git a/tests/qemuxml2xmloutdata/autoindex.xml b/tests/qemuxml2xmloutdata/autoindex.xml
index 3e1c2889cbebcb725fa4c39a8bad6d624f8aac56..8f622d56b2198090d4f7488eb8445c1956f87b19 100644 (file)
--- 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 094ecb38db9d0f6cfdfaf3c3927c3e7ac56b6836..4c58641aca8902f55891728a834a5ba8d44cc273 100644 (file)
--- 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 e5ee451722e24ea9ad5388d5ec24e12a56e8d162..0a2f718faa88bbe53bc7c7ec1649dfb42d370434 100644 (file)
--- 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 294e65cd13f419fd083af570e8d0d462f8bef019..17f15fd00beb9d058d216dbfceb73872490d23f8 100644 (file)
--- 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 46b534d2c79a5e81904e9a084a08b7a0485a2440..6ac1464c655d67ed83b0dae29eb9184c30926d94 100644 (file)
--- 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 2f4d3f29d379295bb4a5c14596f1b731c7676bc0..6eb9df13f3a83f7052a4e459ac30b0f42df61276 100644 (file)
--- 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 631df4bbb436173a545b2fec32d52803fa14fd93..82285b30173907dbfea033db202cada33f7b61a4 100644 (file)
--- 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 631df4bbb436173a545b2fec32d52803fa14fd93..82285b30173907dbfea033db202cada33f7b61a4 100644 (file)
--- 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 b6775d3a47475e3004495d627139c2e316ca451a..994331ce0fab5328ee05624f1fbe936b5a859299 100644 (file)
--- 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 ebcbcb7e622a3a800a46e2ae114533cc82d2a822..abb098be5882647d27c1e9c8bcc3bb3ed91e31b2 100644 (file)
--- 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 bdd7e1b16fbf5e84c1888a26ed34a6d0cf065966..0d884152dd3eacd44861580494e1fab25c759a16 100644 (file)
--- 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 baf99c58cc33fbcb715effebf7397b4b91a47e30..acaab479466b54dff9019485659064471d8bec04 100644 (file)
--- 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 2917ed292a5d6689929e3e119d68a12c9c21a880..6ee9de6512493ff1574b0f5cd64162f21c979644 100644 (file)
--- 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 c5d219183ec22813175ad33c8df8391605821614..a36a94f9f046dc06df403ca42a7990fc6a8f1e97 100644 (file)
--- 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 94b0eaf34ee5e8dddc9436448b11fe51d90148c2..ec82bacea544eb3ad55494af9f94dae861382e60 100644 (file)
--- 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 351a99b4c83394636f31f94de8795a69ea944ebd..ef87c7727c226b36ecc6e7e392314cc368b16bdd 100644 (file)
--- 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 18b799f06679a34e227abbd4018853d7feb71312..598241d01b2bbfdf5023305bd7a76983ef899557 100644 (file)
--- 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 22e5f01db6894afb6193727eaf47d918c52c3b3d..a90679eafee7d9cb015a23eae62786def6ba8891 100644 (file)
--- 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 e90f7c2b257f13731ec312afbc4cb564f23f09eb..4dc09cfb383d2ac5eae6f7b7f157cb045fa8b496 100644 (file)
--- 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 2b7633db1260fcdcd9fa75681c370ed3c1c75e92..196e41b4a7b3ede4c57395c0fef62e4e167b8e19 100644 (file)
--- 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 fc2a5efdcb16135cc0f68880e7fc60a39a756716..0f106073a976dda5a6d985f52156ddf8acac75d3 100644 (file)
--- 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 eebef5aa15938af6297ca5277ae5c3620fb56ff1..37336a15c7a930a5fef334aff0ceecd5fad3c715 100644 (file)
--- 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 b8f710abf6fb7bb2e665e04d1821364b332ec308..e943ef6e288693c2f5eb8fbe3c01259e954047b1 100644 (file)
--- 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 a2d72269b22e99f8ff95d2148732fbd03d9e591d..5d3e551aa7e9fc0d2cc013c4cd269d583e7dccef 100644 (file)
--- 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 d540b81a4ed1ab9812f5bda268fd972a6a1d2e42..491f00687a264295344b7f703ebd8a3898e3f00b 100644 (file)
--- 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 cb4d8a1e6efa7a9185680e2e174a4c7925726012..3a7e7a323a667a49e9c7d3e0861ae4d17327ceb9 100644 (file)
--- 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 207bc87cf58000e3a1484227f3cb41ec8d9b7df8..f25ec8ee54f3d7f3205bd04c59b9fe9609610ec8 100644 (file)
--- 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 473fb7e6f192b9febbfa4b8e3176fce9af47e07a..d2ec332183057ab9f531fd9309a2e5dc74c9631c 100644 (file)
--- 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 e87bf6441656bfc660958dbea74494f39e271814..a7b593231410c06570f97a47deb6dee445d47ab0 100644 (file)
--- 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 2856fd4f4399f58a67a1ecb803ded03cf63421c5..ab1a42929d62de00ee79d5193624c367cb81d55f 100644 (file)
--- 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 1423620aa8422194bd2212996e6ae355b6090b84..98f2fc8fd06d43af37b9619918a4e3cc99703482 100644 (file)
--- 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 a978f70135fddb59d18365a92ae16377118c3fff..11fa1349a235b05acf57188206d57c955d1438f7 100644 (file)
--- 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 c4ea77cdf9c31d73a9cfaeca2cf0362f9ef35309..4bf679692cdda3de91c26c856ae2f9f1f2819d68 100644 (file)
--- 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 1423620aa8422194bd2212996e6ae355b6090b84..98f2fc8fd06d43af37b9619918a4e3cc99703482 100644 (file)
--- 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 394588b8f58329e2b07c409266b2028f9bb8e622..ee700da00dcf57c915d5388f28dfd2e42b9ef40a 100644 (file)
--- 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 176c7c3cbf566a83a2a19a03c8f2bf8d6dabf99c..7ae2c7034b0261a4cc320495b42dc908a1519c97 100644 (file)
--- 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 84cd2106eb0385195bfb88425a6d43baad9c07e4..bee4fd0240a5010d2070e9bc7f23fb5ac5a45cde 100644 (file)
--- 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 40148c3686190f7e036acbaee5174afbb350ebf3..8de03f032caf3265bd25ba8524f292d0e046f3b3 100644 (file)
--- 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 be51410d5369f96a14b1253a8640ddb79f6145ad..3a61d47abda70ef2ff4b058fbdbde3f0ef7371ae 100644 (file)
--- 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 670c171ebc276b930d10cab6cbb8b2dddb2aace2..482edbeb3dc9f9f25e389eec40baa12f897472c9 100644 (file)
--- 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 cc217f41a1020cedd7823f34927055a42bb4e393..99f52bed9a1bf53af928ebb7e859aad67f571496 100644 (file)
--- 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 090fff2d10cf7e050750a4f10c65d3f35f33e6c1..dcc3ccf8d36fdc20b2003fd316d6597a61b35702 100644 (file)
--- 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 8219c16939fde1aedc66004e7eac176c36a19d9e..58707b0d11fd6b486eb5a979ff6aec8aaf737832 100644 (file)
--- 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 dd15201aadf7368548fdfa713e11a6ad6fa0fa8d..3d57037bf11235299e8a47b7c68dc25d7b4e0cfe 100644 (file)
--- 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 0c53679827a3dfb46d8c53f53931aee1a23aa57c..1883a8368dc8a08b81368dbe4e6ba244927dd0e9 100644 (file)
--- 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 99269812d974148fead95c38a9c6f5524ef5f096..02c12542c0161b7e7813e66c2541fbe7431724e6 100644 (file)
--- 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 99269812d974148fead95c38a9c6f5524ef5f096..02c12542c0161b7e7813e66c2541fbe7431724e6 100644 (file)
--- 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 99269812d974148fead95c38a9c6f5524ef5f096..02c12542c0161b7e7813e66c2541fbe7431724e6 100644 (file)
--- 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 cc7b7a112f564a2caf56862b819b4d4185bf2d6a..36c4b0920fcb1314ca7f5690b17e21bef713c40a 100644 (file)
--- 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 e4491a9eee603e20a2fa90618b704e59d1cbeb4e..b6a79108e3fd6ef4208e62d81a41c5f6d4bedd91 100644 (file)
--- 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 da5f10ff641b97706b51e234d7f24ec30ee0180d..ca94bc8a3867e07ffa2bcf6df51f0615214e8df5 100644 (file)
--- 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 ce53f17cc982a3b259ba31398f16e5cedd745e14..557f1424451512c05d14f9aaf684f05a4aeb0869 100644 (file)
--- 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 2f4ef68679c987124d37bffa8ded866249ea942d..0c1ac3d50eb2e75d6c0a65dd883892554c521e71 100644 (file)
--- 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 756d3967cdc97bf634716e85de1fe45832683abf..c9f09b2231722aabc0c50593b5a35db6f60b3dc3 100644 (file)
--- 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 f392bc40aec72b1c5358b18832d1941a1ce6294a..9e3cbab7f85425731396849693bb45f61372cef7 100644 (file)
--- 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 010ab9fce00cf651d87ecb6ec67b980b1d32f17d..c3068c8c9345c0addf48c36344946751eeb35621 100644 (file)
--- 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 5479e8edfc46ce6d6c94630fbb99f04138e2b13a..e4fcb0c6ce0e4fb7458ee7498b9a538d18f26f09 100644 (file)
--- 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 8d6f8b5263ad753d23498a3ce5cebe94f1d2d69d..a7fa648c2a141c38dfdf3696641d5a06525da418 100644 (file)
--- 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 ba23787ad09f1f21d10428389980894ad4d96b70..5901aef3d3d4851f7e35004141a976014be7acb0 100644 (file)
--- 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 e4a8209bf36c3f762f70575995f3da410ef4b4b1..1d9adc85baa1c239c45ce867163d86c0e479756d 100644 (file)
--- 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 e5d0d739990edd54659d4bd6ca5a03753dbf117d..c25bb7bb1ad7d235cc823b6f254d2669ca360781 100644 (file)
--- 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 cc02b159919879d126130a5cad1b5f13ee59d1cc..4e2da4573325e0193ae3db7e58ec63be8d158a8e 100644 (file)
--- 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 cc02b159919879d126130a5cad1b5f13ee59d1cc..4e2da4573325e0193ae3db7e58ec63be8d158a8e 100644 (file)
--- 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 074d41b72e4e5056a0617d2fa621bed4210f2314..b2581450e93b0cd365d44ade041f5b84049c9c82 100644 (file)
--- 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 dca166d7f16fc447871a2b43add2ebedde5f62cc..5a02198f97594b92bf99a1ad94eaff08df70b96f 100644 (file)
--- 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 ba47bbad1a7a9095846f1e4d3f9256f8cc62d6f9..5d2caa5fcad9e184307ef636dd3de24a9ff5e56f 100644 (file)
--- 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 7e54cae592f6b3a524e5eb62acc806e6b2f257fd..34ac33753798a33a6d58b48904b7a371ea167ce9 100644 (file)
--- 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 5aec616002b9227f99999c76313de25daa03cc57..c957f8b45c634f4e66ee751195a13398f7f32182 100644 (file)
--- 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 c4763fa78f03a5fe05e34881067246f1c4e48267..7d8b531b963e15a7e12761fcf1d1bca3c26d15f0 100644 (file)
--- 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 cbf26754cd95b5433e5923dfd5405204f09989f3..a2fdaac5b01168b5162cebf907b620502f7d23f9 100644 (file)
--- 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 db088e0f8542dab39694f3188b2a11de836c6154..50e9f0b5bb70fda6cd58168f5234a5b3dbc59c51 100644 (file)
--- 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 01b1d66ecef35da71aafa59b2fa660e5517ad6a7..1ded5fac7954e4eb6cc2f28d17dd24ba5c782e65 100644 (file)
--- 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 c1862e5a540978ea166027048285e144bde1c231..1beaa36bc24519203d4b248df229bbdb4700c2b8 100644 (file)
--- 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 59258733bdb41adede790c2607dd32792b5fb6cf..3e829497c2eef7320f43ca2ea60a72afef9134d2 100644 (file)
--- 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 41bfcbaaf4de602315d863f1b8f7a8193a19c5dc..24763b532682390df8c621260f4591d0b7e9d61a 100644 (file)
--- 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 80fbf927afc8b9f36925e67a90678e43876703cb..2f686d058c915b91089c7846b19dac15eb555046 100644 (file)
--- 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 eb0c192d80780d3c1ea659f192e7ef1af2ff58b9..2b625958051d400847c816fae5c1761e4759fdf5 100644 (file)
--- 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 b4092eae24412907c756434d4b97055ae03529cc..59fba995cd6ae9bb7fd0e18f550ac1969165c120 100644 (file)
--- 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 046665f713d16c952a1048a9d940024ada573081..1183171e547bd5e9761a0a42b5caecd81ee30436 100644 (file)
--- 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 3f5aa73e55ba782185171c43a43f6d1c20e2e2d5..ed00ceb16c48d738a43b7e9be91a19df0c79bb01 100644 (file)
--- 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 ee19c37d9b613d32ad894d99a7ce7b7ab67d7f16..6c6af0457bb8eab5a495fed7a99503fce45b1649 100644 (file)
--- 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 d7abf57e4a8f11a6bc1a7a6a2f539585c8938fcc..ff72fb53758469bddcd4a1306eee63821c720094 100644 (file)
--- 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 59cae921fceb4632e964cbe773768a963908ccbe..06f2c5b47cd9ef03e12cbbac47f509a57898ee19 100644 (file)
--- 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 eedab82972ced84ef895224b39834c05cabb7c84..12db838a06519cd86d9633894bf0c338f8c65b14 100644 (file)
--- 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 3c42a3c1c024415b850d991a78c7182f35c7979a..45c1a951bfd3cc25407000ba144060ca40f6be6b 100644 (file)
--- 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 a8990cd63915686060807c027ddb626a06d2e7be..32a5e9ca7e779f8cd057517ccc34995bdf6620e6 100644 (file)
--- 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 ff489ade6d27bea386a9967e8336b7ac9c29521b..f82570b81acea5790e2e61258d75ef76f7e807af 100644 (file)
--- 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 42286eeebffdec9bd5edd92f4b34a65e191b1de9..a3a9a0f348e58f44c9f2963d09ab6020a3173bd1 100644 (file)
--- 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 136481411ec455652b86db6902e2d81aeee7f7bb..0725857827081cad13258571b312c0c8aef32578 100644 (file)
--- 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 6539069e09af93a6c449993494a2720e7efd4cd5..9ba3dfac453efba04a3306faf19880f98ec3ce4c 100644 (file)
--- 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 1e5a2ca532eab2d16994b3ef92e5548d80f6e274..489569b2896e486a024aacacb58567011ac74962 100644 (file)
--- 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 474cc88d32ae8fef3168290e0d8668207bb312b5..4948b5e8cb0cd3b1a5dfa82f9f34d8cff6d94e72 100644 (file)
--- 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 575f9e778abf7d9e7348fd868752b0fbb014625b..55d31c80eed78cb274b08d468d051dd7b9b093b9 100644 (file)
--- 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 640f7ac9c7c68911498488bf4b90735064f5c579..ad6cbb07e12d3298f3d0e84ab50510491a817725 100644 (file)
--- 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 d62652a27ee52abfc89c333b5f56e9f1152a7cf5..b9f3fc14465656c5320b0db68ccd1994db80f51c 100644 (file)
--- 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 32790c8f3b86efb9ba77dbce7beaceda0c0bb3b4..748d5ac543590a81b7020197c537719e6034395c 100644 (file)
--- 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 c1bf0bbc98481143123c3c29900f71eafed9db0c..0e8e8930f950db3b13f180b6a7ff6b91678fbb87 100644 (file)
--- 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 23ec57651ecb58bac9ffdd5ef6d8d6651ce4e79b..dbbe51946ec411a884db19a9630569aa53cf98ea 100644 (file)
--- 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 98c96605fb13b5283bbc9480ad8b84ed246a67a6..f66562e21669d6bcf94ce0f31fc30df4f6cabaaf 100644 (file)
--- 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 95cc6a4b7940c9b4c076bbb3a92311b6e13948ff..97cb50411625c079f7c46207864643509471844d 100644 (file)
--- 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 d04ad742154f001c0dde20fedceeab328ca86f13..7d0433eb1261c4c311300805d70cdb75732357ec 100644 (file)
--- 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 18e6d13a845762ddd6a74d6be369e6ad391d3edd..e14eb577a8e353bb6e910ee404df314e1d664727 100644 (file)
--- 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 01ea3f0545d49cedc274067b97ac4ad6d7c61491..4dcabe06f82f323e2856940b6576804abfdfde4c 100644 (file)
--- 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 46eea5fe2fee2804dc539d5bc513d3e3c089264d..20c7f653af8e9cd708c02117233622dfbeeeb437 100644 (file)
--- 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 eb5d672ea4cc881a06247aefd7fb4206e4c8590e..435489e009ec8af6f8b929f457429f062c9f7583 100644 (file)
--- 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 0aee306cf20546d3a9af39edb71d9ebaafb13314..38074b4c62a7065ce256a8f8da8ac9984407a269 100644 (file)
--- 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 42afbab369f3825be9f729c018290d6ef2f21094..f2e9407ac9617856d57e7ac266516e1e370afe6f 100644 (file)
--- 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 8d6c65e7acf07a71dcdf13c1fb95f064208cd8b3..a8d358d08fc84184860bc28c34b5384c2264c353 100644 (file)
--- 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 fbf01cb52a2cc40ec8ae62fdd6a1cb1795e42eb5..5333d4ac6ec5c1084cc02a758ea03f9df068203c 100644 (file)
--- 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 41399ff0d054f698352aa014d3cb79d72e977024..f886ee222829a1d184e6fc27c53265a48d9f51af 100644 (file)
--- 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 660e45205cb90bc176928dcf0103e52a1b849b1b..9545378508f03d5d2373f5b88701103af3a3e4a9 100644 (file)
--- 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 1924f75779997880ff9f8ca0e68587c9d9e2bb4b..7c9ddf31dc61b37abd76c1850332099f5264e3aa 100644 (file)
--- 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 19dfa64f64abf1983cc257c9a1a53f62ffdf9db8..2f7e8ac1cec1e45a56edfac25c96147e0183c36d 100644 (file)
--- 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 e65d09eb6ca15534328798a3e7763ee596c9710f..20eff9453390fe3b56b11aa513b29a3cf9ba0742 100644 (file)
--- 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 afe9468d8e8173b4686bf69e3dc5dbc5dc96aae8..53dae403550e1b15db902e0a1fd5c4e596a64258 100644 (file)
--- 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 bbd77393e71541ec96f1cef1d96137491cce9e67..12c246f35576e623319fdcc18a932efec8b57e30 100644 (file)
--- 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 bbd77393e71541ec96f1cef1d96137491cce9e67..12c246f35576e623319fdcc18a932efec8b57e30 100644 (file)
--- 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 86a0656c10570a6e99be4742e6f082488dd7306b..447bfbae2dd1310139b55ed73a5f6710c9be77c5 100644 (file)
--- 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 55d08cad1d8073d197de4c43b497782e024f526a..9a53b1941a4e9fcd1baf4fd3440cd2f4bc9a13a8 100644 (file)
--- 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 a144b5fc91edb0df7a3378996d42a964e6b04c9c..f860850ab0819497ca79be8de55263d5ea319d0f 100644 (file)
--- 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 51b16790120e109d27f4cc6838f5cf2c4e91c579..d15eb3d27a1455a4b2528a6a1c9e8b4d1355c884 100644 (file)
--- 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 de176f851b399eaf75e1aa23f964ac7217cc6035..419bfaa0e7c76a7295c5883c3b0e3e2d45f1b107 100644 (file)
--- 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 3703834d147d091acaf913c9e98b516ba0e98461..96ce9fdbf5093caca89933faf015202f01bdacf2 100644 (file)
--- 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 7caf0c050b05aec07eea3bd3efefd492d62e34dc..f92256d8cac622b1451b06eff4557de78657b42a 100644 (file)
--- 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 65dd69aae258dbee0524d4c7267e72b082d4807c..0e5e5814acf09718d81415c9bb7a62a133676b0b 100644 (file)
--- 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 47d35d2d0859544a2670a797311e1e4b33978287..a9873e4af562dcb9efd77d1fa0e32d6e93f4bc9c 100644 (file)
--- 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 e3c1e96c7d474ecff0bf6dbcf6ddc95a2cbad9bf..156ad0f1577b2f5c003642e62825ce47236f6d6b 100644 (file)
--- 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 9410b98f3821061046c64cd850e2544edaf90ae0..17a1239ac13819b5368efe855dae2e72ddfeb249 100644 (file)
--- 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 3fe5da65b4cc22a2410d67198fd7ef97509c6acb..900548b4652c3aa62fbaa0d03002eb08d2b16d8d 100644 (file)
--- 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 0f84b34ce118d1ae561023354ccb416602716b47..d35818435bdc56b5a20c66fe0ae424adfdab93f0 100644 (file)
--- 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 8a6654831a496cfe9597514e66d0894ab2b8ef3e..ce1eb5460cf43798f87ba0fb0ca2512931ae8ef6 100644 (file)
--- 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 0c52ebf2a4ad4c3a4e83f3b2ef05482b06881feb..856a4cea48d5b1d2b5e7931ee1176afc95fbfb50 100644 (file)
--- 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 c9de151a0861ac503d914ae8f5ed03971bfe923b..b8e9da0020272bfe17d896b79e96082efdbef7e2 100644 (file)
--- 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 637935b641f105bffb1f33382a6deb029a57bb40..e2e2c2a34e65f5a9da4d8bf6c6982a3874f6c2f1 100644 (file)
--- 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 dd94a8d6d1dfd7057141c4837d33bd7f943f3249..9827329be7551e3379b005f60ec657be2c569cdd 100644 (file)
--- 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 40e57db44a46cec8ce9e3b5b4baa1ab083dc0d23..decf71b86cb2a562a13fa9593256434b20ca427a 100644 (file)
--- 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 334745d8f878f13bfd06d19067efd1c277248dc4..0402ed8affe3a9493fb9b6270765da19d07043f5 100644 (file)
--- 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 a9dffc0062c5830c2096271406e07e3401f2c5c1..b0e5fc37b54d48e3ae8b3c40dd508142b978f1e2 100644 (file)
--- 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 72791868e0b7ffb4e81284ea7eb6639a349e04e0..6359fd54c70ecc262958453e12fbd335f45f0b94 100644 (file)
--- 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 39dd50ade69efe4c17e3d9aebbfe53bebbc83053..35fd3bc82a5eab69b5d4b712d74956c0a3387396 100644 (file)
--- 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 5e3d407cb086209c718c5dc7a405f564dbabcea0..862c5bd9276a68b3207048a1f7b7aa60ec008449 100644 (file)
--- 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 fc9ef86568f5bf57a628bab121500eac287acdd4..fa81660b340a6bd74313c62cb15b0785d362682c 100644 (file)
--- 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 724112b3a29a14b1332a95898f06367029201b49..19855ba207e65355ebc32896fa0ba9f5ff0791b4 100644 (file)
--- 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 b054099f0a365a60a3217064605b28a65d88bce8..114a5ed2dbde26df7e1ba2996b161c59a8b1dbdc 100644 (file)
--- 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 d0dfb88682d4bea9e0179136c25e03f9035a8b29..5fbebbde7fb0dc6dbe54d82bf9ef9ae3fa753f46 100644 (file)
--- 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 c289664f935afe86f49eb005ea2b6f4fba355c77..cef9f8c5e6a42121b63a3d5b6a9c9a11b2c1e356 100644 (file)
--- 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 ee2d956d7ecbef6751f80c5981dcfc0bb0ec3632..4f038931c30ea64665a803ddf64b182e89db678c 100644 (file)
--- 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 880d8e294707351b39aa47477447241e22875d13..78a643ec2db22bc3ab5d4dda6fadfc0180e4c790 100644 (file)
--- 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 297ad6b9c8de09291afe4226f47fa2ecf1191c66..104d2e6d4c10a0f284342b9c9beedda7ff7529e7 100644 (file)
--- 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 2efcc47df86071f9a70f517eb24c6c7194840248..e71386a886ad2f4107877986fec42c554c8f4c40 100644 (file)
--- 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 8093ac85f3c659d78dbcb1ec5dca836d6077c36f..b117b6cbebd31382c4a63335e0fa746815585936 100644 (file)
--- 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 2efcc47df86071f9a70f517eb24c6c7194840248..e71386a886ad2f4107877986fec42c554c8f4c40 100644 (file)
--- 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 8e31e4e83ba49c503870a6d330523a9cc540e8c2..08969c773db735cb0da0367dba68caccfee97093 100644 (file)
--- 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 80dc73edc212198fb6e50f92e670ce8fd42dde8f..dbabf55f74d499bf9dc78742866fda0af2ffe80b 100644 (file)
--- 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 b26016ecb655c36d2087fffeb6ee5d7176652071..a59d837cc6fd27ee2d7ed0df0e4eeab1593a7034 100644 (file)
--- 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 cba9199f3f1d401b53a832d5562f58df5bee48e7..e6931451630fba67434c1e2c9335fbbcb45f4f87 100644 (file)
--- 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 198c2e6ce0f6b9f2ffa86fcad04cd82c3f653656..3056c2827f731c977d217c799176c4305e654c7d 100644 (file)
--- 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 1a1b4f2b70d751127be1174250939220878c565d..65d8f8d0003c8ecc96f38a8f38bd5c214f68375b 100644 (file)
--- 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 6560d6a84f7638acc120a4e17041231234108bc2..1e787378d1c91e514cc04c6b28506351ce036b91 100644 (file)
--- 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 303107514f8b70afb2803ded2023860a8ecad2b0..9382155e71833ee795364a56793ecc986e53b385 100644 (file)
--- 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 239e9e693fd58f16b49600cd6eaec7dbcf3cc84c..d9b821bfe2185a29e3efccc2d5f386daf3cc0397 100644 (file)
--- 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 62b6ef9040fe213d8025957061ef7e2d27dd0b8d..f4941bc67bf1373f33bc4d62699ee20d98754212 100644 (file)
--- 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 be70336738ad53c601997432a703c0cd520eb8cf..52d61603aa4148eca4d09e898c8415cbce016ae5 100644 (file)
--- 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 a95825e57cc47c81c32dac3610210e512c4f6a48..9a40b0b0b42908b306a0ae3c416e08be1cf35e47 100644 (file)
--- 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 02e4bf2ccb2c5a5d5f9cfdf0d0fff662fe3c7c61..df14a1e1b05f34bf9256378d0d2ff0c33151717f 100644 (file)
--- 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 425c7dfedd1b6e3365265856795d9c8e1d96e682..45df55365e0fb1eb052e52897115576279e509ad 100644 (file)
--- 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 1e19106341ec2bbc377a637dd896f31ffa604909..7fc1c0f02704a21c1b309eb5d6c40f4ac18ee681 100644 (file)
--- 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 81413fe58f8f232bfe38e9716367c02bc4fc45ee..63a5e1f9d8fb8230d639ebcb29c41e3d68233593 100644 (file)
--- 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 23e59182f6adbcd234b7c8ce6509b22bad4922e9..892438f4c93b9654293111c51d993b2f6fd44770 100644 (file)
--- 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 23e59182f6adbcd234b7c8ce6509b22bad4922e9..892438f4c93b9654293111c51d993b2f6fd44770 100644 (file)
--- 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 b1e477ebe54539b04d12d609d6cb2c408c6183cf..2e97312d91bcd35fe49da0e3a667812e8f7a7926 100644 (file)
--- 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 b074e4f6ca3681c1c627810ceb36fe447e541246..11e5fbe4899ade946956a78b5419af63c10ba286 100644 (file)
--- 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 b1e477ebe54539b04d12d609d6cb2c408c6183cf..2e97312d91bcd35fe49da0e3a667812e8f7a7926 100644 (file)
--- 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 b1e477ebe54539b04d12d609d6cb2c408c6183cf..2e97312d91bcd35fe49da0e3a667812e8f7a7926 100644 (file)
--- 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 853ec24ba91466f8cb33f35d37ae73d2af39d800..4773d23725aaafa1d5fd2f32dce5a5f7ae23e09b 100644 (file)
--- 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 fb17c41c1dcf93b196e20b5cbba1040dfa8c571b..cdf0461180007ddbeea16fd1441c78e8b19a00be 100644 (file)
--- 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 a9af42aa3b570fb647317bffb4aef6b4b275a2d5..415f28e6fe7160fa4496217c5ed6bb43856408d4 100644 (file)
--- 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 76a40b7fa76807ee2eb4f30ec36141f41e3271be..bee743c23aac44de69dadb9096c863cacc3fb876 100644 (file)
--- 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 5cd283838aa09dddcbaa012e016103c5e8718633..937fcfe6f55dce2bdcce9e22642476238e062b93 100644 (file)
--- 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 97e793382fccddc39deace3505b7f3b512be2042..7fde19f283059ede59e8f126e6d9bee486d206a3 100644 (file)
--- 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 f244533f4d96ffeb6035f5fbf47cce6cfe30ce45..c3b3e1bd8f3a50469f368744ecb72eef59eea12d 100644 (file)
--- 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 d7b02ffa4d929e6cd665f6342d0487c21ff818c3..b4bcc666d20abda315e13548c53fbe27277d420d 100644 (file)
--- 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 2094f3ea7a37fc806ac0c652e23935682af197bd..55c47518534f523d7f2acf77cc0e49566a6dbcb2 100644 (file)
--- 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 c798a3e6a10447da93a222520d4f1959963e801a..f14f64bfa050f9726ea6b641683e8f7217545b10 100644 (file)
--- 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 3e7bc87d5dc4938a2ced3af94d9bdbf811fb2f4b..47e7302a1b9f22ae21aa8ce69e6b2c78381a49de 100644 (file)
--- 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 088aa4c07b05a52310b27c28cd09d291d434e588..f8ce1a0185c758011c36cd0ae06feb45f0f8b809 100644 (file)
--- 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 73cf4733ee663602eb4e3169bc55afc87df14476..9263d1741b16805a960ea878ed96891d3dc13aac 100644 (file)
--- 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 d6f07fafdb025b1f8ca9289e3ec4f2fbc8c5243a..ecd671c9ccbb858f2f74fd79397fba8a287a1266 100644 (file)
--- 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 2ddc55eced0aa617145c5c439e5693243c636e40..b1daa12c444057095d2acd819f882644269769ba 100644 (file)
--- 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 9e50b5a70e959db188d3b762d13da475db8e16c6..786bcb02a5446074dcfcfe5d18e82a191b0a8337 100644 (file)
--- 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 598c7711ba3dec2b1d71aeaff102e3b0ddd3859a..87d9a5524c90f95f0167120f06066c08db7b2c68 100644 (file)
--- 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 3f20a0fd249471f7ae6deef4a4c79e3c083b0c68..1ffa7412d6889ce7a5239e84248fb9fd3407f267 100644 (file)
--- 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 76289dfb74f71f874729a0a26e1bdeff3ec28933..12355888104b46a69fa539aad7bdd22f862319b0 100644 (file)
--- 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 6746736443b0cca4ffe212a85d0a803ae57114c6..7f5b192f86cd3aa308fbb80744f1d500ccb8851d 100644 (file)
--- 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 6c6abcd33beaed2401b547d09e5b3ce2bbdf4338..791b34f864adc90aa9208675ad7c2c526327ba1c 100644 (file)
--- 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 192d885210f001189bc64c65a874efb778a038ff..b088bd16d72b88d5d5d4f02e56b88460a7f8cb81 100644 (file)
--- 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 6ce966f1d439c1a0414d97a866a17b4ef78c387d..26b341b05815f3cf3dd3d01f79dbb3330718bb99 100644 (file)
--- 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 c3a985cb46ff42cefd1f319d9d0679fe97efb1db..9ec7d39b8726cc1d154274314fd78af64e1a1587 100644 (file)
--- 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 8ae380770f8d15d452c006a36590ef8a98f3c0fc..a13c7346cdd4f1cc214a70aa3bc9078c09507444 100644 (file)
--- 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 1621779c03923d9daddd386b439c40ffc09536fd..ce6b0b394e0749dc044af788a1553dbd1913b114 100644 (file)
--- 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 e0a424d3be2b0aa686717349f28c4a0da23b0976..19561a1c021b97a1dc93c2d82b04781769b5acce 100644 (file)
--- 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 37a192ded0ad05ec8966da2ef2b232bbf4840705..ac5a1c5091567f1bcd2591508afd99bb5dccf8e7 100644 (file)
--- 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 e40969cb58695e415e2849a3c6321271a36d9e2d..c57ccc8d4730ee573a66b0dc4ccfefa22b9219de 100644 (file)
--- 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 bd0602b7fa08ad6ad1f8577b29125b29f5989b33..c1b787cdc47e1ed2abe12203d0b4c970d173764e 100644 (file)
--- 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 b940f05deef60ab588e672a21235005ee3c5e7da..46428b59e2c4754a4d5193ffbbca1b1680743ef5 100644 (file)
--- 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 b94b0c8aacfe162a839380498f051d32f6e0730a..2ff6af983220abe6ac421dc65d792e39e6d1da41 100644 (file)
--- 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 9d8db57981653904d40eaf9e7082b9a1064e944e..313920e9110e9c2d0169ef04cc71f73c7f29b19d 100644 (file)
--- 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 e1e28c33b9d58794b923b9eea8461a441115d60c..cdb804e9a0143b9203ec7f71de1f25ca59718128 100644 (file)
--- 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 2658bf8eccefddaa3cd8318537336fa2544cc0db..a903ada842788a9cd49c4ff4d6e3341595929f45 100644 (file)
--- 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 4ba8aa522f5559044eff2a12d1c0784188438408..f7faa2fc4e241fd65105067c4d12d5cfa76c9636 100644 (file)
--- 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 6be4d363259984afc98001698f6e5310bff41787..fa60ede67eb1f6ffb52b76b73982ba08b6e232e2 100644 (file)
--- 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>