11:18 a.m.
* tests/qemuxml2argvdata/qemuxml2argv-*.args: Reflect reserved VGA
port change.
---
Pushing under the build-breaker rule - the fix was pretty straightforward.
.../qemuxml2argv-balloon-device-auto.args | 2 +-
.../qemuxml2argvdata/qemuxml2argv-boot-order.args | 6 +++---
.../qemuxml2argv-channel-guestfwd.args | 2 +-
.../qemuxml2argv-channel-virtio-auto.args | 6 +++---
.../qemuxml2argv-channel-virtio.args | 2 +-
.../qemuxml2argv-console-compat-chardev.args | 2 +-
.../qemuxml2argv-console-virtio.args | 4 ++--
.../qemuxml2argv-disk-drive-readonly-disk.args | 2 +-
.../qemuxml2argv-disk-scsi-device-auto.args | 4 ++--
.../qemuxml2argv-disk-scsi-device.args | 4 ++--
.../qemuxml2argv-disk-usb-device.args | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-fs9p.args | 4 ++--
.../qemuxml2argv-hostdev-pci-address-device.args | 2 +-
.../qemuxml2argv-hostdev-usb-address-device.args | 2 +-
.../qemuxml2argv-net-virtio-device.args | 4 ++--
.../qemuxml2argv-net-virtio-netdev.args | 4 ++--
.../qemuxml2argv-parallel-tcp-chardev.args | 2 +-
.../qemuxml2argv-serial-dev-chardev.args | 2 +-
.../qemuxml2argv-serial-file-chardev.args | 2 +-
.../qemuxml2argv-serial-many-chardev.args | 2 +-
.../qemuxml2argv-serial-pty-chardev.args | 2 +-
.../qemuxml2argv-serial-tcp-chardev.args | 2 +-
.../qemuxml2argv-serial-tcp-telnet-chardev.args | 2 +-
.../qemuxml2argv-serial-udp-chardev.args | 2 +-
.../qemuxml2argv-serial-unix-chardev.args | 2 +-
.../qemuxml2argv-serial-vc-chardev.args | 2 +-
.../qemuxml2argv-smartcard-controller.args | 2 +-
.../qemuxml2argv-smartcard-host-certificates.args | 2 +-
.../qemuxml2argv-smartcard-host.args | 2 +-
...emuxml2argv-smartcard-passthrough-spicevmc.args | 2 +-
.../qemuxml2argv-smartcard-passthrough-tcp.args | 2 +-
.../qemuxml2argv-sound-device.args | 6 +++---
.../qemuxml2argv-watchdog-device.args | 2 +-
33 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args
b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args
index b23d08d..0b07f47 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args
@@ -2,4 +2,4 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S
-M \
pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \
unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
/dev/HostVG/QEMUGuest1 -usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,\
-addr=0x2
+addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args
b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args
index 296f004..23249f3 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args
@@ -3,11 +3,11 @@ pc -m 214 -smp 1 -nographic -nodefaults -monitor
unix:/tmp/test-monitor,server,\
nowait -no-acpi -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 -drive \
file=sheepdog:example.org:6000:image,if=none,id=drive-virtio-disk0 -device \
-virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,\
+virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,\
bootindex=3 -drive file=/root/boot.iso,if=none,media=cdrom,id=drive-ide0-1-0 \
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\
bootindex=1 -drive file=/dev/null,if=none,id=drive-fdc0-0-1 -global \
isa-fdc.driveB=drive-fdc0-0-1 -global isa-fdc.bootindexB=4 -device \
-virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2,\
+virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3,\
bootindex=2 -net user,vlan=0,name=hostnet0 -usb -device virtio-balloon-pci,\
-id=balloon0,bus=pci.0,addr=0x4
+id=balloon0,bus=pci.0,addr=0x5
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args
b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args
index f2796f1..665fb1e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args
@@ -4,4 +4,4 @@ id=charmonitor,path=/tmp/test-monitor,server,nowait -mon
chardev=charmonitor,\
id=monitor,mode=readline -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -chardev \
pipe,id=charchannel0,path=/tmp/guestfwd -netdev user,\
guestfwd=tcp:10.0.2.1:4600,chardev=charchannel0,id=user-channel0 -usb -device \
-virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
+virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args
b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args
index 3c9f43d..e3fbc24 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args
@@ -1,9 +1,9 @@
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \
unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device \
-virtio-serial-pci,id=virtio-serial0,max_ports=16,vectors=4,bus=pci.0,addr=0x2 \
+virtio-serial-pci,id=virtio-serial0,max_ports=16,vectors=4,bus=pci.0,addr=0x3 \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa -device \
-virtio-serial-pci,id=virtio-serial2,bus=pci.0,addr=0x3 -hda \
+virtio-serial-pci,id=virtio-serial2,bus=pci.0,addr=0x4 -hda \
/dev/HostVG/QEMUGuest1 -chardev pty,id=charchannel0 -device virtserialport,\
bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,\
name=org.linux-kvm.port.0 -chardev pty,id=charchannel1 -device virtserialport,\
@@ -17,4 +17,4 @@
virtserialport,bus=virtio-serial1.0,nr=4,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 -usb -device virtio-balloon-pci,id=balloon0,\
-bus=pci.0,addr=0x4
+bus=pci.0,addr=0x5
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args
b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args
index 4e2d33e..5356bcc 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args
@@ -5,4 +5,4 @@ virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa -hda \
/dev/HostVG/QEMUGuest1 -chardev pty,id=charchannel0 -device virtserialport,\
bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,\
name=org.linux-kvm.port.foo -usb -device virtio-balloon-pci,id=balloon0,\
-bus=pci.0,addr=0x2
+bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args
b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args
index dd4a8d4..4a6202e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args
@@ -3,4 +3,4 @@ pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -chardev socket,\
id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,\
id=monitor,mode=readline -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -chardev \
pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args
b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args
index a896c81..7e852ff 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args
@@ -1,7 +1,7 @@
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \
unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device \
-virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 -hda \
+virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 -hda \
/dev/HostVG/QEMUGuest1 -chardev pty,id=charconsole0 -device virtconsole,\
chardev=charconsole0,id=console0 -usb -device virtio-balloon-pci,id=balloon0,\
-bus=pci.0,addr=0x3
+bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args
b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args
index f885776..af3a7d4 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args
@@ -5,4 +5,4 @@ file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 -device ide-drive,\
bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 -drive file=/dev/sr0,if=none,\
media=cdrom,id=drive-ide0-1-0,readonly=on -device ide-drive,bus=ide.1,unit=0,\
drive=drive-ide0-1-0,id=ide0-1-0 -usb -device virtio-balloon-pci,id=balloon0,\
-bus=pci.0,addr=0x2
+bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args
b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args
index ae7cffd..0efa768 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args
@@ -1,8 +1,8 @@
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \
unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device lsi,id=scsi0,\
-bus=pci.0,addr=0x2 -drive file=/dev/HostVG/QEMUGuest1,if=none,\
+bus=pci.0,addr=0x3 -drive file=/dev/HostVG/QEMUGuest1,if=none,\
id=drive-ide0-0-0 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,\
id=ide0-0-0 -drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0 -device \
scsi-disk,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args
b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args
index ae7cffd..0efa768 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args
@@ -1,8 +1,8 @@
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \
unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device lsi,id=scsi0,\
-bus=pci.0,addr=0x2 -drive file=/dev/HostVG/QEMUGuest1,if=none,\
+bus=pci.0,addr=0x3 -drive file=/dev/HostVG/QEMUGuest1,if=none,\
id=drive-ide0-0-0 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,\
id=ide0-0-0 -drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0 -device \
scsi-disk,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args
b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args
index e036a4d..b6d90c6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args
@@ -4,4 +4,4 @@ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -drive \
file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 -device ide-drive,\
bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 -drive file=/tmp/usbdisk.img,\
if=none,id=drive-usb-disk0 -device usb-storage,drive=drive-usb-disk0,\
-id=usb-disk0 -usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
+id=usb-disk0 -usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args
b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args
index 237bad3..6487fec 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args
@@ -3,5 +3,5 @@ pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \
unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
/dev/HostVG/QEMUGuest1 -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=0x2 -usb -device virtio-balloon-pci,\
-id=balloon0,bus=pci.0,addr=0x3
+mount_tag=/import/from/host,bus=pci.0,addr=0x3 -usb -device virtio-balloon-pci,\
+id=balloon0,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args
b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args
index d30c1e1..3a890ae 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args
@@ -2,4 +2,4 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S
-M \
pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \
unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
/dev/HostVG/QEMUGuest2 -usb -device pci-assign,host=06:12.5,id=hostdev0,\
-bus=pci.0,addr=0x2 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args
b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args
index 890c069..d655d2d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args
@@ -2,4 +2,4 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S
-M \
pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \
unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
/dev/HostVG/QEMUGuest1 -usb -device usb-host,hostbus=14,hostaddr=6,id=hostdev0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args
b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args
index 843c3e9..b9c0941 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args
@@ -2,5 +2,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S
-M \
pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \
unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
/dev/HostVG/QEMUGuest1 -device virtio-net-pci,tx=bh,vlan=0,id=net0,\
-mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 -net user,vlan=0,name=hostnet0 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 -net user,vlan=0,name=hostnet0 -usb \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args
b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args
index fe479cc..09c817c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args
@@ -2,5 +2,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S
-M \
pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \
unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
/dev/HostVG/QEMUGuest1 -netdev user,id=hostnet0 -device virtio-net-pci,\
-netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 -usb -device \
-virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
+netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 -usb -device \
+virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args
b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args
index 9260a3b..5d37f81 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args
@@ -4,4 +4,4 @@ id=charmonitor,path=/tmp/test-monitor,server,nowait -mon
chardev=charmonitor,\
id=monitor,mode=readline -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -chardev \
socket,id=charparallel0,host=127.0.0.1,port=9999,server,nowait -device \
isa-parallel,chardev=charparallel0,id=parallel0 -usb -device \
-virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
+virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args
b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args
index bbcc138..a85504f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args
@@ -3,4 +3,4 @@ pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -chardev socket,\
id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,\
id=monitor,mode=readline -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -chardev \
tty,id=charserial0,path=/dev/ttyS2 -device isa-serial,chardev=charserial0,\
-id=serial0 -usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
+id=serial0 -usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args
b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args
index 3ca5c9b..cd3b964 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args
@@ -4,4 +4,4 @@ id=charmonitor,path=/tmp/test-monitor,server,nowait -mon
chardev=charmonitor,\
id=monitor,mode=readline -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -chardev \
file,id=charserial0,path=/tmp/serial.log -device isa-serial,\
chardev=charserial0,id=serial0 -usb -device virtio-balloon-pci,id=balloon0,\
-bus=pci.0,addr=0x2
+bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args
b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args
index 71de5a5..f341a86 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args
@@ -5,4 +5,4 @@ id=monitor,mode=readline -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1
-chardev \
pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -chardev \
file,id=charserial1,path=/tmp/serial.log -device isa-serial,\
chardev=charserial1,id=serial1 -usb -device virtio-balloon-pci,id=balloon0,\
-bus=pci.0,addr=0x2
+bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args
b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args
index dd4a8d4..4a6202e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args
@@ -3,4 +3,4 @@ pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -chardev socket,\
id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,\
id=monitor,mode=readline -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -chardev \
pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args
b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args
index d8059b5..7b770c2 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args
@@ -4,4 +4,4 @@ id=charmonitor,path=/tmp/test-monitor,server,nowait -mon
chardev=charmonitor,\
id=monitor,mode=readline -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -chardev \
socket,id=charserial0,host=127.0.0.1,port=9999 -device isa-serial,\
chardev=charserial0,id=serial0 -usb -device virtio-balloon-pci,id=balloon0,\
-bus=pci.0,addr=0x2
+bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args
b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args
index 7a4a163..bcdcff1 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args
@@ -4,4 +4,4 @@ id=charmonitor,path=/tmp/test-monitor,server,nowait -mon
chardev=charmonitor,\
id=monitor,mode=readline -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -chardev \
socket,id=charserial0,host=127.0.0.1,port=9999,telnet,server,nowait -device \
isa-serial,chardev=charserial0,id=serial0 -usb -device virtio-balloon-pci,\
-id=balloon0,bus=pci.0,addr=0x2
+id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args
b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args
index 7525110..362d860 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args
@@ -4,4 +4,4 @@ id=charmonitor,path=/tmp/test-monitor,server,nowait -mon
chardev=charmonitor,\
id=monitor,mode=readline -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -chardev \
udp,id=charserial0,host=127.0.0.1,port=9998,localaddr=127.0.0.1,localport=9999 \
-device isa-serial,chardev=charserial0,id=serial0 -usb -device \
-virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
+virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args
b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args
index 79f4ba6..60c5b94 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args
@@ -4,4 +4,4 @@ id=charmonitor,path=/tmp/test-monitor,server,nowait -mon
chardev=charmonitor,\
id=monitor,mode=readline -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -chardev \
socket,id=charserial0,path=/tmp/serial.sock -device isa-serial,\
chardev=charserial0,id=serial0 -usb -device virtio-balloon-pci,id=balloon0,\
-bus=pci.0,addr=0x2
+bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args
b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args
index 55ca1ab..b878010 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args
@@ -3,4 +3,4 @@ pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -chardev socket,\
id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,\
id=monitor,mode=readline -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -chardev \
vc,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args
b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args
index a0ee85e..e30b6ae 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args
@@ -4,4 +4,4 @@ socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon \
chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -device \
usb-ccid,id=ccid0 -device \
ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args
b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args
index 46bf38a..0b2142f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args
@@ -5,4 +5,4 @@ chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -device \
usb-ccid,id=ccid0 -device \
ccid-card-emulated,backend=certificates,cert1=cert1,cert2=cert2,cert3=cert3\
,database=/etc/pki/nssdb,id=smartcard0,bus=ccid0.0 -usb -device \
-virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
+virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args
b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args
index a0ee85e..e30b6ae 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args
@@ -4,4 +4,4 @@ socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon \
chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -device \
usb-ccid,id=ccid0 -device \
ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args
b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args
index 8408a3e..4a3ecf5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args
@@ -4,4 +4,4 @@ socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon \
chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -device \
usb-ccid,id=ccid0 -chardev spicevmc,id=charsmartcard0,name=smartcard \
-device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \
--usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
+-usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args
b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args
index 159ca87..73fc5f5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args
@@ -5,4 +5,4 @@ chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -device \
usb-ccid,id=ccid0 -chardev \
socket,id=charsmartcard0,host=127.0.0.1,port=2001,server,nowait \
-device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \
--usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
+-usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args
b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args
index 9e1be52..0a09c41 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args
@@ -2,7 +2,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S
-M \
pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \
unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
/dev/HostVG/QEMUGuest1 -usb -soundhw pcspk -device ES1370,id=sound1,bus=pci.0,\
-addr=0x2 -device sb16,id=sound2 -device AC97,id=sound3,bus=pci.0,addr=0x3 \
--device intel-hda,id=sound4,bus=pci.0,addr=0x4 -device hda-duplex,\
+addr=0x3 -device sb16,id=sound2 -device AC97,id=sound3,bus=pci.0,addr=0x4 \
+-device intel-hda,id=sound4,bus=pci.0,addr=0x5 -device hda-duplex,\
id=sound4-codec0,bus=sound4.0,cad=0 -device virtio-balloon-pci,id=balloon0,\
-bus=pci.0,addr=0x5
+bus=pci.0,addr=0x6
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args
b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args
index 1913eeb..14224bb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args
@@ -2,4 +2,4 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S
-M \
pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \
unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
/dev/HostVG/QEMUGuest1 -usb -device ib700,id=watchdog0 -watchdog-action \
-poweroff -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
+poweroff -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
--
1.7.4