Attachment 618426 Details for Bug 861309 – Allow USB disks to be connected to USB hub (qemu) (fix tests)

Allow USB disks to be connected to USB hub (qemu) (fix tests)

libvirt-0.10.2-qemu-early-usb-hub-append-tests-fix.patch (text/plain), 188.48 KB, created by Vladislav Bogdanov on 2012-09-28 06:20:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladislav Bogdanov

Created: 2012-09-28 06:20:27 UTC

Size: 188.48 KB

patch

obsolete

>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args	2012-09-26 09:04:34.375114934 +0000
>@@ -1,5 +1,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 -usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,\
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -device virtio-balloon-pci,id=balloon0,bus=pci.0,\
> addr=0x12
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args	2012-09-26 09:04:23.766146474 +0000
>@@ -1,5 +1,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 -usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,\
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -device virtio-balloon-pci,id=balloon0,bus=pci.0,\
> addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-bios.args b/tests/qemuxml2argvdata/qemuxml2argv-bios.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-bios.args	2012-04-24 03:51:25.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.args	2012-09-26 09:04:42.903174978 +0000
>@@ -2,6 +2,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> /usr/bin/qemu -S -M pc -bios /usr/share/seabios/bios.bin \
> -m 1024 -smp 1 -nodefaults -device sga \
> -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
>--hda /dev/HostVG/QEMUGuest1 -serial pty \
>--usb -device usb-tablet,id=input0 -vnc 127.0.0.1:0 \
>+-usb -hda /dev/HostVG/QEMUGuest1 -serial pty \
>+-device usb-tablet,id=input0 -vnc 127.0.0.1:0 \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args	2012-09-26 09:05:06.888350850 +0000
>@@ -1,10 +1,10 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \
> -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -nodefaults \
> -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
>--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,cache=off,\
>+-usb -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,cache=off,\
> bps=5000,iops=6000 -device \
> ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
> -drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-1,cache=off,\
> bps_rd=5000,bps_wr=5000,iops=7000 -device \
> ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
>--usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args	2012-09-26 09:05:26.218172695 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \
> -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -monitor \
> unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
>--hda /dev/HostVG/QEMUGuest1 -net none -serial \
>-none -parallel none -usb
>+-usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>+none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args	2012-09-26 09:05:15.438140765 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \
> -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -monitor \
> unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
>--hda /dev/HostVG/QEMUGuest1 -net none -serial \
>-none -parallel none -usb
>+-usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>+none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args	2012-09-26 09:06:04.364155600 +0000
>@@ -1,3 +1,3 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot d -cdrom /dev/cdrom -net none -serial none -parallel none -usb
>+-no-acpi -boot d -usb -cdrom /dev/cdrom -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args	2012-01-19 00:28:59.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args	2012-09-26 09:06:31.039159300 +0000
>@@ -9,6 +9,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> -monitor unix:/tmp/test-monitor,server,nowait \
> -no-acpi \
> -boot dnca \
>+-usb \
> -drive file=/tmp/vda.img,if=none,id=drive-virtio-disk0,boot=on \
> -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,id=virtio-disk0 \
> -drive file=/tmp/vdb.img,if=none,id=drive-virtio-disk1 \
>@@ -26,5 +27,4 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> -device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x3 \
> -net user,vlan=0,name=hostnet0 \
> -device virtio-net-pci,vlan=1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,addr=0x4 \
>--net user,vlan=1,name=hostnet1 \
>--usb
>+-net user,vlan=1,name=hostnet1
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args	2012-01-19 00:28:59.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args	2012-09-26 09:06:17.025099009 +0000
>@@ -8,6 +8,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> -nodefaults \
> -monitor unix:/tmp/test-monitor,server,nowait \
> -no-acpi \
>+-usb \
> -drive file=/tmp/vda.img,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 \
> -drive file=/tmp/vdb.img,if=none,id=drive-virtio-disk1 \
>@@ -26,5 +27,4 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> -device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x3,bootindex=2 \
> -net user,vlan=0,name=hostnet0 \
> -device virtio-net-pci,vlan=1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,addr=0x4 \
>--net user,vlan=1,name=hostnet1 \
>--usb
>+-net user,vlan=1,name=hostnet1
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args	2012-09-26 09:06:42.735187250 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot a -hda /dev/HostVG/QEMUGuest1 -fda /tmp/firmware.img -net none \
>--serial none -parallel none -usb
>+-no-acpi -boot a -usb -hda /dev/HostVG/QEMUGuest1 -fda /tmp/firmware.img -net none \
>+-serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-bootloader.args b/tests/qemuxml2argvdata/qemuxml2argv-bootloader.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-bootloader.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-bootloader.args	2012-09-26 11:25:44.416176542 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/xenner -S \
> -M xenner -m 214 -smp 1 -domid 6 -nographic -monitor unix:/tmp/test-monitor,\
>-server,nowait -no-acpi -bootloader /usr/bin/pygrub -cdrom /dev/cdrom -net none \
>--serial none -parallel none -usb
>+server,nowait -no-acpi -bootloader /usr/bin/pygrub -usb -cdrom /dev/cdrom -net none \
>+-serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args	2012-09-26 09:07:14.975107976 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot order=d,menu=off -cdrom /dev/cdrom -net none -serial none \
>--parallel none -usb
>+-no-acpi -boot order=d,menu=off -usb -cdrom /dev/cdrom -net none -serial none \
>+-parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args	2011-08-30 13:00:02.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args	2012-09-26 09:07:04.991145470 +0000
>@@ -8,7 +8,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> -monitor unix:/tmp/test-monitor,server,nowait \
> -no-acpi \
> -boot order=d,menu=off \
>+-usb \
> -drive file=/dev/cdrom,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 \
>--usb \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args	2012-09-21 02:02:13.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args	2012-09-26 09:06:58.430103605 +0000
>@@ -8,7 +8,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> -monitor unix:/tmp/test-monitor,server,nowait \
> -no-acpi \
> -boot menu=off \
>+-usb \
> -drive file=/dev/cdrom,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 \
>--usb \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args	2011-08-30 13:00:02.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args	2012-09-26 09:07:21.968146884 +0000
>@@ -8,7 +8,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> -monitor unix:/tmp/test-monitor,server,nowait \
> -no-acpi \
> -boot order=d,menu=on \
>+-usb \
> -drive file=/dev/cdrom,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 \
>--usb \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args	2012-09-26 09:07:32.065101708 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot order=dcna,menu=on -cdrom /dev/cdrom -net none -serial none \
>--parallel none -usb
>+-no-acpi -boot order=dcna,menu=on -usb -cdrom /dev/cdrom -net none -serial none \
>+-parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args	2012-09-26 09:07:40.735098515 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot n -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>-none -usb
>+-no-acpi -boot n -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>+none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args	2012-01-19 00:28:59.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args	2012-09-26 09:07:48.674098495 +0000
>@@ -7,6 +7,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> -nodefaults \
> -monitor unix:/tmp/test-monitor,server,nowait \
> -no-acpi \
>+-usb \
> -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=/root/boot.iso,if=none,media=cdrom,id=drive-ide0-1-0 \
>@@ -18,5 +19,4 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> -global isa-fdc.bootindexB=4 \
> -device 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=0x5
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args	2012-09-26 09:08:21.156100353 +0000
>@@ -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 -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 \
>+id=monitor,mode=readline -no-acpi -boot c -usb -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 \
>+guestfwd=tcp:10.0.2.1:4600,chardev=charchannel0,id=user-channel0 -device \
> virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args	2012-09-26 11:43:57.912352226 +0000
>@@ -1,9 +1,9 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \
> /usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefconfig -nodefaults \
> -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device \
>-virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa -hda \
>+virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa -usb -hda \
> /dev/HostVG/QEMUGuest1 -chardev spicevmc,id=charchannel0,name=vdagent -device \
> virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0\
>-,name=com.redhat.spice.0 -usb -spice port=5903,tls-port=5904,addr=127.0.0.1,\
>+,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 -device \
> virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args	2012-09-26 11:43:49.145403236 +0000
>@@ -1,8 +1,8 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \
> /usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefconfig -nodefaults \
> -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device \
>-virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa -hda \
>+virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa -usb -hda \
> /dev/HostVG/QEMUGuest1 -device spicevmc,bus=virtio-serial1.0,nr=3,id=channel0 \
>--usb -spice port=5903,tls-port=5904,addr=127.0.0.1,\
>+-spice port=5903,tls-port=5904,addr=127.0.0.1,\
> x509-dir=/etc/pki/libvirt-spice,tls-channel=main -device \
> virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args	2011-11-09 07:01:17.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args	2012-09-26 11:44:22.105107214 +0000
>@@ -2,8 +2,8 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> 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 -device \
>-virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa -hda \
>+virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa -usb -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,\
>+name=org.linux-kvm.port.foo -device virtio-balloon-pci,id=balloon0,\
> bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args	2011-11-09 07:01:17.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args	2012-09-26 11:44:15.210140704 +0000
>@@ -4,7 +4,7 @@ socket,id=charmonitor,path=/tmp/test-mon
> chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -device \
> 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=0x4 -hda \
>+virtio-serial-pci,id=virtio-serial2,bus=pci.0,addr=0x4 -usb -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,5 +17,5 @@ name=org.linux-kvm.port.wizz -chardev pt
> 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,\
>+name=org.linux-kvm.port.lla -device virtio-balloon-pci,id=balloon0,\
> bus=pci.0,addr=0x5
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args	2012-09-26 09:09:32.935104701 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test TZ=Europe/Paris \
> /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -rtc base=localtime -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
>+unix:/tmp/test-monitor,server,nowait -rtc base=localtime -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args	2012-09-26 09:09:45.192098883 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--localtime -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none \
>--parallel none -usb
>+-localtime -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none \
>+-parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args	2012-09-26 09:09:53.384164472 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>-none -usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>+none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args	2012-09-26 09:10:00.824105007 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -rtc \
>-base=2010-2-2T18:22:10 -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none \
>--serial none -parallel none -usb
>+base=2010-2-2T18:22:10 -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none \
>+-serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args	2012-09-26 09:10:30.284154577 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial pty -parallel \
>-none -usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial pty -parallel \
>+none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args	2012-09-26 09:10:10.105109739 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial pty -parallel \
>-none -usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial pty -parallel \
>+none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args	2012-09-26 09:10:22.313115874 +0000
>@@ -1,6 +1,6 @@
> 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 -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 \
>+id=monitor,mode=readline -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -chardev \
>+pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args	2011-11-09 07:01:17.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args	2012-09-26 11:45:11.199098737 +0000
>@@ -2,7 +2,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> 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 -device \
>-virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 -hda \
>+virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 -usb -hda \
> /dev/HostVG/QEMUGuest1 -chardev pty,id=charconsole0 -device virtconsole,\
>-chardev=charconsole0,id=console0 -usb -device virtio-balloon-pci,id=balloon0,\
>+chardev=charconsole0,id=console0 -device virtio-balloon-pci,id=balloon0,\
> bus=pci.0,addr=0x4
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args	2011-11-09 07:01:17.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args	2012-09-26 11:44:53.547099038 +0000
>@@ -2,11 +2,11 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> 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 -device \
>-virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 -hda \
>+virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 -usb -hda \
> /dev/HostVG/QEMUGuest1 -chardev pty,id=charserial0 \
> -device isa-serial,chardev=charserial0,id=serial0 -chardev pty,id=charconsole1 \
> -device virtconsole,chardev=charconsole1,id=console1 -chardev \
> pty,id=charconsole2 -device virtconsole,chardev=charconsole2,id=console2 \
> -chardev pty,id=charconsole3 -device virtconsole,chardev=charconsole3,\
>-id=console3 -usb -device virtio-balloon-pci,id=balloon0,\
>+id=console3 -device virtio-balloon-pci,id=balloon0,\
> bus=pci.0,addr=0x4
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args	2012-07-18 14:28:01.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args	2012-09-26 11:45:02.797098839 +0000
>@@ -3,7 +3,7 @@ s390-virtio -m 214 -smp 1 -nographic -no
> socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon \
> chardev=charmonitor,id=monitor,mode=readline -no-acpi \
> -boot c -device virtio-serial-s390,id=virtio-serial0 \
>--drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
>+-usb -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
> -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0 \
> -chardev pty,id=charconsole0 \
>--device virtconsole,chardev=charconsole0,id=console0 -usb
>+-device virtconsole,chardev=charconsole0,id=console0
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args	2012-09-14 06:51:43.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args	2012-09-26 09:11:14.060115049 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test ./qemu.sh -S -M pc \
> -cpu qemu32,-kvm_pv_eoi -m 214 -smp 6 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -boot n -net none -serial none \
>--parallel none -usb
>+unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial none \
>+-parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args	2012-09-14 06:51:43.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args	2012-09-26 09:11:23.500110219 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test ./qemu.sh -S -M pc \
> -cpu qemu32,+kvm_pv_eoi -m 214 -smp 6 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -boot n -net none -serial none \
>--parallel none -usb
>+unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial none \
>+-parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args	2012-09-26 09:11:32.989108554 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test ./qemu.sh -S -M pc \
> -cpu qemu64,-svm,-lm,-nx,-syscall,-clflush,-pse36,-mca -m 214 -smp 6 \
>--nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -net \
>-none -serial none -parallel none -usb
>+-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \
>+none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args	2012-09-26 09:11:51.358155809 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test ./qemu.sh -S -M pc \
> -cpu core2duo,+lahf_lm,+3dnowext,+xtpr,+ds_cpl,+tm,+ht,+ds,-nx -m 214 -smp 6 \
>--nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -net \
>-none -serial none -parallel none -usb
>+-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \
>+none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args	2012-01-19 00:28:59.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args	2012-09-26 09:11:42.364100064 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test ./qemu.sh -S -M pc \
> -cpu core2duo,+lahf_lm,+3dnowext,+xtpr,+ds_cpl,+tm,+ht,+ds,-nx -m 214 -smp 6 \
>--nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -net \
>-none -serial none -parallel none -usb
>+-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \
>+none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args	2012-01-19 00:28:59.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args	2012-09-26 09:12:04.417100061 +0000
>@@ -13,7 +13,7 @@ LOGNAME=test \
> -monitor unix:/tmp/test-monitor,server,nowait \
> -no-acpi \
> -boot n \
>+-usb \
> -net none \
> -serial none \
>--parallel none \
>--usb
>+-parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args	2012-02-01 04:57:11.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args	2012-09-26 09:12:13.807164871 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test ./qemu.sh -S -M pc \
> -cpu host,-kvmclock -enable-kvm -m 214 -smp 6 \
>--nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -net \
>-none -serial none -parallel none -usb
>+-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \
>+none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args	2012-01-19 00:28:59.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args	2012-09-26 09:12:32.955100263 +0000
>@@ -13,7 +13,7 @@ LOGNAME=test \
> -monitor unix:/tmp/test-monitor,server,nowait \
> -no-acpi \
> -boot n \
>+-usb \
> -net none \
> -serial none \
>--parallel none \
>--usb
>+-parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args	2012-01-19 00:28:59.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args	2012-09-26 09:12:22.623176790 +0000
>@@ -13,7 +13,7 @@ LOGNAME=test \
> -monitor unix:/tmp/test-monitor,server,nowait \
> -no-acpi \
> -boot n \
>+-usb \
> -net none \
> -serial none \
>--parallel none \
>--usb
>+-parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args	2012-01-19 00:28:59.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args	2012-09-26 09:12:40.801101258 +0000
>@@ -13,7 +13,7 @@ LOGNAME=test \
> -monitor unix:/tmp/test-monitor,server,nowait \
> -no-acpi \
> -boot n \
>+-usb \
> -net none \
> -serial none \
>--parallel none \
>--usb
>+-parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args	2012-02-01 04:57:11.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args	2012-09-26 09:12:48.898137687 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test ./qemu.sh -S -M pc \
> -cpu core2duo,-kvmclock -enable-kvm -m 214 -smp 6 \
>--nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -net \
>-none -serial none -parallel none -usb
>+-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \
>+none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args	2012-09-26 09:13:04.210109807 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test ./qemu.sh -S -M pc \
> -cpu core2duo,+lahf_lm,+xtpr,+cx16,+tm2,+est,+vmx,+ds_cpl,+pbe,+tm,+ht,+ss,\
> +acpi,+ds -m 214 -smp 6 -nographic -monitor unix:/tmp/test-monitor,server,\
>-nowait -no-acpi -boot n -net none -serial none -parallel none -usb
>+nowait -no-acpi -boot n -usb -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args	2012-09-26 09:13:13.221106490 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test ./qemu.sh -S -M pc \
> -cpu core2duo,+lahf_lm,+xtpr,+cx16,+tm2,+est,+vmx,+ds_cpl,+pbe,+tm,+ht,+ss,\
> +acpi,+ds,-lm,-nx,-syscall -m 214 -smp 6 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -net none -serial none \
>--parallel none -usb
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net none -serial none \
>+-parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args	2011-11-29 06:51:16.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args	2012-09-26 09:13:22.242113588 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test ./qemu.sh -S -M pc \
> -m 214 -smp 16 -numa node,nodeid=0,cpus=0-7,mem=107 \
> -numa node,nodeid=1,cpus=8-15,mem=107 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -net none -serial none \
>--parallel none -usb
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net none -serial none \
>+-parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args	2011-11-29 06:51:16.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args	2012-09-26 09:13:30.595151828 +0000
>@@ -2,5 +2,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> -m 214 -smp 16,sockets=2,cores=4,threads=2 \
> -numa node,nodeid=0,cpus=0-7,mem=107 \
> -numa node,nodeid=1,cpus=8-15,mem=107 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -net none -serial none \
>--parallel none -usb
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net none -serial none \
>+-parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args	2012-09-26 09:13:42.934099892 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test ./qemu.sh -S -M pc \
> -cpu core2duo,+lahf_lm,+3dnowext,+xtpr,+est,+vmx,+ds_cpl,+tm,+ht,+acpi,+ds,-nx \
> -m 214 -smp 6 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot n -net none -serial none -parallel none -usb
>+-no-acpi -boot n -usb -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args	2012-09-26 09:13:51.508107449 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test ./qemu.sh -S -M pc \
> -m 214 -smp 6,sockets=3,cores=2,threads=1 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -net none -serial none \
>--parallel none -usb
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net none -serial none \
>+-parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args	2012-09-26 09:14:02.083099936 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test ./qemu.sh -S -M pc \
> -cpu core2duo -m 214 -smp 6,sockets=1,cores=2,threads=3 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -net none -serial none \
>--parallel none -usb
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net none -serial none \
>+-parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args	2012-09-26 09:14:10.056148105 +0000
>@@ -1,3 +1,3 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test ./qemu.sh -S -M pc \
> -m 214 -smp 6 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot n -net none -serial none -parallel none -usb
>+-no-acpi -boot n -usb -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-cputune.args b/tests/qemuxml2argvdata/qemuxml2argv-cputune.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-cputune.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune.args	2012-09-26 09:14:17.318099193 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \
> -name QEMUGuest1 -S -M pc -m 214 -smp 2 -nographic \
>--monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
>--hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
>+-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
>+-hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args	2012-09-26 09:14:27.991098550 +0000
>@@ -1,6 +1,6 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
>+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
> format=qcow2,cache=none,aio=native -drive file=/dev/HostVG/QEMUGuest2,if=ide,\
> media=cdrom,bus=1,unit=0,format=raw,aio=threads -net none -serial none \
>--parallel none -usb
>+-parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args	2012-09-06 07:26:26.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args	2012-09-26 09:14:40.663135224 +0000
>@@ -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 \
>+-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
> -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1 \
> -device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
> -drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2 \
> -device ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,\
> logical_block_size=512,physical_block_size=512 \
>--usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
>+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args	2012-09-26 09:15:15.400099699 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -cdrom /root/boot.iso -net none \
>--serial none -parallel none -usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -cdrom /root/boot.iso -net none \
>+-serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args	2012-09-26 09:14:50.984104664 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \
>-if=ide,media=cdrom,bus=1,unit=0 -net none -serial none -parallel none -usb
>+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \
>+if=ide,media=cdrom,bus=1,unit=0 -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args	2012-04-24 03:51:25.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args	2012-09-26 09:15:07.481098489 +0000
>@@ -1,10 +1,10 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
> /usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \
>--monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot dc \
>+-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot dc -usb \
> -drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \
> -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 \
> -drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.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 \
> -drive if=none,media=cdrom,id=drive-ide0-1-1 \
> -device ide-drive,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 \
>--usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args	2012-04-24 03:51:25.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args	2012-09-26 09:14:58.056099175 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none \
>--serial none -parallel none -usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none \
>+-serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args	2012-01-19 00:28:59.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args	2012-09-26 11:41:27.937406725 +0000
>@@ -2,10 +2,10 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> /usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nodefaults \
> -monitor unix:/tmp/test-monitor,server,nowait -no-acpi \
> -boot dc -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
>--drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,copy-on-read=on \
>+-usb -drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,copy-on-read=on \
> -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 \
> -drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.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 \
> -device virtio-net-pci,tx=bh,vlan=0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3 \
>--net user,vlan=0,name=hostnet0 -serial pty -usb -vnc 127.0.0.1:-809 -std-vga \
>+-net user,vlan=0,name=hostnet0 -serial pty -vnc 127.0.0.1:-809 -std-vga \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args	2012-09-26 09:15:36.154115444 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot d -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \
>+-no-acpi -boot d -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \
> file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0 -net none -serial \
>-none -parallel none -usb
>+none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args	2012-09-26 09:15:43.770169709 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \
>+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \
> file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0 -net none -serial \
>-none -parallel none -usb
>+none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args	2011-09-13 07:37:21.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args	2012-09-26 09:15:52.667108165 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
>+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
> format=qcow2,cache=directsync -drive file=/dev/HostVG/QEMUGuest2,if=ide,\
>-media=cdrom,bus=1,unit=0,format=raw -net none -serial none -parallel none -usb
>+media=cdrom,bus=1,unit=0,format=raw -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args	2011-10-15 01:17:36.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args	2012-09-26 09:16:01.116099047 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
>+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
> format=qcow2,cache=unsafe -drive file=/dev/HostVG/QEMUGuest2,if=ide,\
>-media=cdrom,bus=1,unit=0,format=raw -net none -serial none -parallel none -usb
>+media=cdrom,bus=1,unit=0,format=raw -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args	2012-09-26 09:16:08.845100112 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
>+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
> format=qcow2,cache=off -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,\
>-bus=1,unit=0,format=raw -net none -serial none -parallel none -usb
>+bus=1,unit=0,format=raw -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args	2012-09-26 09:17:15.121384556 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
>+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
> format=qcow2,cache=on -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,\
>-bus=1,unit=0,format=raw -net none -serial none -parallel none -usb
>+bus=1,unit=0,format=raw -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args	2012-09-26 09:17:22.623388661 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
>+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
> format=qcow2,cache=off -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,\
>-bus=1,unit=0,format=raw -net none -serial none -parallel none -usb
>+bus=1,unit=0,format=raw -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args	2012-09-26 09:17:30.255152211 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
>+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
> format=qcow2,cache=none -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,\
>-bus=1,unit=0,format=raw -net none -serial none -parallel none -usb
>+bus=1,unit=0,format=raw -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args	2012-09-26 09:17:38.046147612 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
>+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
> format=qcow2,cache=writeback -drive file=/dev/HostVG/QEMUGuest2,if=ide,\
>-media=cdrom,bus=1,unit=0,format=raw -net none -serial none -parallel none -usb
>+media=cdrom,bus=1,unit=0,format=raw -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args	2012-09-26 09:17:46.321099529 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
>+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
> format=qcow2,cache=writethrough -drive file=/dev/HostVG/QEMUGuest2,if=ide,\
>-media=cdrom,bus=1,unit=0,format=raw -net none -serial none -parallel none -usb
>+media=cdrom,bus=1,unit=0,format=raw -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args	2011-11-09 07:01:17.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args	2012-09-26 09:17:54.485109040 +0000
>@@ -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 \
> -monitor control,unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
>+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
> format=qcow2,cache=off,werror=enospc -drive \
> file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw -net \
>-none -serial none -parallel none -usb
>+none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args	2011-11-09 07:01:17.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args	2012-09-26 09:18:02.002100702 +0000
>@@ -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 \
> -monitor control,unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
>+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
> format=qcow2,cache=off,werror=stop,rerror=stop -drive \
> file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw -net \
>-none -serial none -parallel none -usb
>+none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args	2011-11-09 07:01:17.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args	2012-09-26 09:18:10.233099842 +0000
>@@ -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 \
> -monitor control,unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
>+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
> format=qcow2,cache=off,werror=report,rerror=ignore -drive \
> file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw -net \
>-none -serial none -parallel none -usb
>+none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args	2012-09-26 09:18:18.802105031 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=fat:/var/somefiles,if=ide,bus=0,unit=0 -net none \
>--serial none -parallel none -usb
>+-no-acpi -boot c -usb -drive file=fat:/var/somefiles,if=ide,bus=0,unit=0 -net none \
>+-serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args	2012-09-26 09:18:26.751100185 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
>+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
> format=qcow2 -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,\
>-unit=0,format=raw -net none -serial none -parallel none -usb
>+unit=0,format=raw -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args	2012-09-26 09:18:32.787146445 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \
>+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \
> file=nbd:example.org:6000,if=virtio,format=raw -net none -serial none \
>--parallel none -usb
>+-parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args	2012-09-03 02:37:05.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args	2012-09-26 09:18:59.092173428 +0000
>@@ -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 -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -drive \
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -drive \
> file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \
> 'file=rbd:pool/image:auth_supported=none:\
> mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;\
> mon3.example.org\:6322,\
>-if=virtio,format=raw' -net none -serial none -parallel none -usb
>+if=virtio,format=raw' -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args	2012-09-03 02:37:05.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args	2012-09-26 09:18:41.604192017 +0000
>@@ -1,6 +1,6 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
> /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -drive \
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -drive \
> file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \
> 'file=rbd:pool/image:\
> id=myname:\
>@@ -8,4 +8,4 @@ key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJ
> auth_supported=cephx\;none:\
> mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;\
> mon3.example.org\:6322,\
>-if=virtio,format=raw' -net none -serial none -parallel none -usb
>+if=virtio,format=raw' -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args	2011-11-29 06:51:16.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args	2012-09-26 09:18:51.155100022 +0000
>@@ -1,6 +1,6 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test CEPH_ARGS=-m \
> mon1.example.org:6321,mon2.example.org:6322,mon3.example.org:6322 \
> /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -drive \
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -drive \
> file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive file=rbd:pool/image,\
>-if=virtio,format=raw -net none -serial none -parallel none -usb
>+if=virtio,format=raw -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args	2012-04-24 03:51:25.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args	2012-09-26 09:19:08.885150374 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=/dev/HostVG/QEMU,,Guest,,,,1,if=ide,bus=0,unit=0 \
>+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMU,,Guest,,,,1,if=ide,bus=0,unit=0 \
> -drive file=sheepdog:example.org:6000:image,,with,,commas,if=virtio,format=raw \
>--net none -serial none -parallel none -usb
>+-net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args	2011-08-30 13:00:02.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args	2012-09-26 09:19:34.182173291 +0000
>@@ -8,11 +8,11 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> -nodefaults \
> -monitor unix:/tmp/test-monitor,server,nowait \
> -no-acpi \
>+-usb \
> -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,bootindex=2 \
> -drive file=/dev/HostVG/QEMUGuest2,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/fd0,if=none,id=drive-fdc0-0-0 \
> -global isa-fdc.driveA=drive-fdc0-0-0 \
>--global isa-fdc.bootindexA=3 \
>--usb
>+-global isa-fdc.bootindexA=3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args	2012-09-26 09:19:48.695099537 +0000
>@@ -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 -drive \
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -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=/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,\
>+drive=drive-ide0-1-0,id=ide0-1-0 -device virtio-balloon-pci,id=balloon0,\
> bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args	2012-09-26 09:19:56.008100020 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \
>+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \
> file=/dev/sr0,if=ide,media=cdrom,bus=1,unit=0,readonly=on -net none -serial \
>-none -parallel none -usb
>+none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args	2012-09-26 09:20:03.607101400 +0000
>@@ -1,6 +1,6 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
>+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
> format=qcow2,serial=XYZXYZXYZYXXYZYZYXYZY,cache=off -drive \
> file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw -net \
>-none -serial none -parallel none -usb
>+none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args	2012-09-26 09:20:49.066116792 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -fda /dev/fd0 -fdb \
>-/tmp/firmware.img -net none -serial none -parallel none -usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -fda /dev/fd0 -fdb \
>+/tmp/firmware.img -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args	2012-04-24 03:51:25.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args	2012-09-26 09:20:39.431097991 +0000
>@@ -1,10 +1,10 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
> /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefaults \
>--monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
>+-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
> -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=/dev/fd0,if=none,id=drive-fdc0-0-0 \
> -global isa-fdc.driveA=drive-fdc0-0-0 \
> -drive if=none,id=drive-fdc0-0-1 \
> -global isa-fdc.driveB=drive-fdc0-0-1 \
>--usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args	2012-04-24 03:51:25.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args	2012-09-26 09:20:29.463110747 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -fda /dev/fd0 \
>--net none -serial none -parallel none -usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -fda /dev/fd0 \
>+-net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args	2012-08-22 03:19:44.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args	2012-09-26 09:20:56.538155343 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
>+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\
> cyls=16383,heads=16,secs=63,trans=lba \
>--net none -serial none -parallel none -usb
>+-net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args	2012-04-24 03:51:25.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args	2012-09-26 09:21:04.174108953 +0000
>@@ -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 \
>+-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
> -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1 \
> -device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
> -drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2 \
> -device ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 \
>--usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
>+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args	2012-09-18 07:20:17.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args	2012-09-26 09:21:11.529102418 +0000
>@@ -1,6 +1,6 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
> /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefaults \
>--monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
>+-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
> -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1,serial=WD-WMAP9A966149 \
> -device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,wwn=5000c50015ea71ad \
>--usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args	2012-01-19 00:28:59.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args	2012-09-26 11:41:00.945362643 +0000
>@@ -2,10 +2,10 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> /usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nodefaults \
> -monitor unix:/tmp/test-monitor,server,nowait -no-acpi \
> -boot dc -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
>--drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \
>+-usb -drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \
> -device virtio-blk-pci,ioeventfd=on,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 \
> -drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.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 \
> -device virtio-net-pci,tx=bh,ioeventfd=off,vlan=0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3 \
>--net user,vlan=0,name=hostnet0 -serial pty -usb -vnc 127.0.0.1:-809 -std-vga \
>+-net user,vlan=0,name=hostnet0 -serial pty -vnc 127.0.0.1:-809 -std-vga \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args	2012-09-26 09:21:33.148176567 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -hdb /dev/HostVG/QEMUGuest2 -hdc \
>-/tmp/data.img -hdd /tmp/logs.img -net none -serial none -parallel none -usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -hdb /dev/HostVG/QEMUGuest2 -hdc \
>+/tmp/data.img -hdd /tmp/logs.img -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args	2012-01-19 00:28:59.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args	2012-09-26 09:21:47.438099272 +0000
>@@ -8,6 +8,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> -monitor unix:/tmp/test-monitor,server,nowait \
> -no-acpi \
> -boot c \
>+-usb \
> -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=/dev/HostVG/QEMUGuest2,if=none,media=cdrom,id=drive-ide0-1-0 \
>@@ -16,5 +17,4 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0 \
> -drive file=/tmp/logs.img,if=none,id=drive-virtio-disk1 \
> -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
>--usb \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args	2011-11-09 07:01:17.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args	2012-09-26 11:40:34.176109067 +0000
>@@ -1,6 +1,6 @@
> 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 ahci,id=ahci0,\
>-bus=pci.0,addr=0x3 -drive file=/dev/HostVG/QEMUGuest1,if=none,\
>+bus=pci.0,addr=0x3 -usb -drive file=/dev/HostVG/QEMUGuest1,if=none,\
> id=drive-sata0-0-0 -device ide-drive,bus=ahci0.0,drive=drive-sata0-0-0,\
>-id=sata0-0-0 -usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
>+id=sata0-0-0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args	2012-09-26 11:28:32.660098833 +0000
>@@ -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=0x3 -drive file=/dev/HostVG/QEMUGuest1,if=none,\
>+bus=pci.0,addr=0x3 -usb -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 \
>+scsi-disk,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args	2012-09-26 11:28:24.154103504 +0000
>@@ -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=0x3 -drive file=/dev/HostVG/QEMUGuest1,if=none,\
>+bus=pci.0,addr=0x3 -usb -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 \
>+scsi-disk,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args	2012-04-24 03:51:25.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args	2012-09-26 11:39:39.386099907 +0000
>@@ -5,6 +5,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> -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 \
>+-usb \
> -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-1-0 \
> -device scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,id=scsi0-0-1-0 \
> -drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi0-0-0-0 \
>@@ -13,4 +14,4 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=1,drive=drive-scsi0-0-0-1,id=scsi0-0-0-1 \
> -drive file=/tmp/scsidisk.img,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 \
>--usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7
>+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args	2012-09-18 07:20:17.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args	2012-09-26 11:40:13.533416146 +0000
>@@ -3,8 +3,9 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
> -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
> -device lsi,id=scsi1,bus=pci.0,addr=0x4 \
>+-usb \
> -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-1-0 \
> -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=5000c50015ea71ac \
> -drive file=/dev/HostVG/QEMUGuest2,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,wwn=5000c50015ea71ad \
>--usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
>+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args	2012-04-24 03:51:25.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args	2012-09-26 11:42:23.573206791 +0000
>@@ -3,8 +3,9 @@ pc -m 214 -smp 1 -nographic -nodefaults 
> -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
> -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
> -device lsi,id=scsi1,bus=pci.0,addr=0x4 \
>+-usb \
> -drive file=/dev/HostVG/QEMUGuest1,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=/dev/HostVG/QEMUGuest2,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 \
>--usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
>+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args	2012-03-01 15:03:14.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args	2012-09-26 11:28:43.995103561 +0000
>@@ -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-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 -drive file=/dev/HostVG/QEMUGuest1,\
>+virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 -usb -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-4-0 -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,\
>-drive=drive-scsi0-0-4-0,id=scsi0-0-4-0 -usb -device virtio-balloon-pci,\
>+drive=drive-scsi0-0-4-0,id=scsi0-0-4-0 -device virtio-balloon-pci,\
> id=balloon0,bus=pci.0,addr=0x4
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args	2012-09-26 11:29:18.764098631 +0000
>@@ -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 spapr-vscsi,id=scsi0,\
>-reg=0x2000 -drive file=/dev/HostVG/QEMUGuest1,if=none,\
>+reg=0x2000 -usb -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-3-0 \
> -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=3,lun=0,drive=drive-scsi0-0-3-0,id=scsi0-0-3-0 \
>--usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args	2011-09-13 07:37:21.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args	2012-09-26 09:23:40.658104492 +0000
>@@ -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 -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c \
>+-no-acpi -boot c -usb \
> -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=qcow2,cache=none \
> -drive file=/dev/HostVG/QEMUGuest3,if=ide,bus=2,unit=0,format=qcow2,cache=none \
> -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \
>--net none -serial none -parallel none -usb
>+-net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args	2012-09-26 09:24:15.398100122 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -usbdevice disk:/tmp/usbdisk.img \
>--net none -serial none -parallel none -usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -usbdevice disk:/tmp/usbdisk.img \
>+-net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args	2012-09-26 09:23:58.259099040 +0000
>@@ -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 -drive \
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -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=0x3
>+id=usb-disk0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args	2012-09-26 09:24:33.765100581 +0000
>@@ -1,6 +1,6 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \
>+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \
> file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0 -drive \
> file=/tmp/data.img,if=virtio -drive file=/tmp/logs.img,if=virtio -net none \
>--serial none -parallel none -usb
>+-serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args	2012-07-18 14:28:01.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args	2012-09-26 09:24:25.031103098 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \
> -M s390-virtio -m 214 -smp 1 -nographic -nodefaults \
>--monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
>+-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
> -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
>--device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0 -usb
>+-device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args	2012-09-26 09:24:41.684154674 +0000
>@@ -1,6 +1,6 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \
>+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \
> file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0 -drive \
> file=/tmp/data.img,if=xen,index=0 -drive file=/tmp/logs.img,if=xen,index=6 \
>--net none -serial none -parallel none -usb
>+-net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args	2012-09-26 09:24:56.887099248 +0000
>@@ -3,8 +3,8 @@ LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/
> -smp 1,sockets=1,cores=1,threads=1 -uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
> -nographic -nodefconfig -nodefaults -chardev socket,id=monitor,\
> path=//var/lib/libvirt/qemu/encryptdisk.monitor,server,nowait -mon \
>-chardev=monitor,mode=readline -rtc base=utc -no-acpi -boot c -drive \
>+chardev=monitor,mode=readline -rtc base=utc -no-acpi -boot c -usb -drive \
> file=/storage/guest_disks/encryptdisk,if=none,id=drive-virtio-disk0,boot=on,\
> format=qcow2 -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,\
>-drive=drive-virtio-disk0,id=virtio-disk0 -usb -device virtio-balloon-pci,\
>+drive=drive-virtio-disk0,id=virtio-disk0 -device virtio-balloon-pci,\
> id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args	2012-09-14 06:51:43.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args	2012-09-26 09:25:08.439354795 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test ./qemu.sh -S -M pc \
> -cpu qemu32,-kvm_pv_eoi -m 214 -smp 6 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -boot n -net none -serial \
>-none -parallel none -usb
>+unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial \
>+none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args	2012-09-14 06:51:43.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args	2012-09-26 09:25:21.254100656 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test ./qemu.sh -S -M pc \
> -cpu qemu32,+kvm_pv_eoi -m 214 -smp 6 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -boot n -net none -serial \
>-none -parallel none -usb
>+unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial \
>+none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args	2012-01-19 00:28:59.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args	2012-09-26 11:41:57.699152853 +0000
>@@ -2,10 +2,10 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> /usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nodefaults \
> -monitor unix:/tmp/test-monitor,server,nowait -no-acpi \
> -boot dc -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
>--drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \
>+-usb -drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \
> -device virtio-blk-pci,event_idx=on,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 \
> -drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.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 \
> -device virtio-net-pci,event_idx=off,vlan=0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3 \
>--net user,vlan=0,name=hostnet0 -serial pty -usb -vnc 127.0.0.1:-809 -std-vga \
>+-net user,vlan=0,name=hostnet0 -serial pty -vnc 127.0.0.1:-809 -std-vga \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args	2012-09-26 09:25:42.458100222 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot a -drive file=fat:floppy:/var/somefiles,if=floppy,unit=0 -net \
>-none -serial none -parallel none -usb
>+-no-acpi -boot a -usb -drive file=fat:floppy:/var/somefiles,if=floppy,unit=0 -net \
>+none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args	2012-01-19 00:28:59.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args	2012-09-26 09:25:52.746102838 +0000
>@@ -1,6 +1,6 @@
> 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 \
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -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=0x3 \
>@@ -10,4 +10,4 @@ mount_tag=/import/from/host2,bus=pci.0,a
> -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 \
>--usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6
>+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args	2012-09-26 09:26:07.659099470 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
> XAUTHORITY=/root/.Xauthority DISPLAY=:0.1 /usr/bin/qemu -S -M pc -m 214 -smp 1 \
>--monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -std-vga
>+-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -std-vga
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args	2012-09-26 09:26:01.002105467 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
> XAUTHORITY=/root/.Xauthority DISPLAY=:0.1 /usr/bin/qemu -S -M pc -m 214 -smp 1 \
>--monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -full-screen
>+-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -full-screen
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args	2012-04-24 03:51:25.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args	2012-09-26 11:43:05.193222571 +0000
>@@ -2,7 +2,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> /usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefconfig -nodefaults \
> -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
> -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
>--hda /dev/HostVG/QEMUGuest1 -chardev spicevmc,id=charchannel0,name=vdagent \
>+-usb -hda /dev/HostVG/QEMUGuest1 -chardev spicevmc,id=charchannel0,name=vdagent \
> -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=com.redhat.spice.0 \
>--usb -spice port=5903,tls-port=5904,addr=127.0.0.1,agent-mouse=off,x509-dir=/etc/pki/libvirt-spice,tls-channel=main \
>+-spice port=5903,tls-port=5904,addr=127.0.0.1,agent-mouse=off,x509-dir=/etc/pki/libvirt-spice,tls-channel=main \
> -vga cirrus -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args	2012-09-26 09:27:37.376098138 +0000
>@@ -1,7 +1,7 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \
> /usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefaults -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -usb -spice port=5903,tls-port=5904,addr=127.0.0.1,\
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -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 -vga \
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args	2011-06-02 07:18:38.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args	2012-09-26 09:26:29.228114936 +0000
>@@ -1,7 +1,7 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \
> /usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefaults -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -usb -spice port=5903,tls-port=5904,addr=127.0.0.1,\
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -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 -vga \
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args	2012-09-26 09:26:42.061099856 +0000
>@@ -1,7 +1,7 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \
> /usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefaults -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -usb -spice port=5903,tls-port=5904,addr=127.0.0.1,\
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -spice port=5903,tls-port=5904,addr=127.0.0.1,\
> x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs -vga \
> qxl -global qxl-vga.vram_size=33554432 -device qxl,id=video1,vram_size=67108864,bus=pci.0,addr=0x4 \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args	2012-04-24 03:51:25.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args	2012-09-26 11:43:17.623114212 +0000
>@@ -3,13 +3,13 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> +est,+vmx,+ds_cpl,+pbe,+tm,+ht,+ss,+acpi,+ds \
> -m 1024 -smp 2 -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \
> -boot dc -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
>--drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \
>+-usb -drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \
> -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 \
> -drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.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 \
> -device rtl8139,vlan=0,id=net0,mac=52:54:00:71:70:89,bus=pci.0,addr=0x7 \
> -net tap,script=/etc/qemu-ifup,vlan=0,name=hostnet0 -serial pty \
>--usb -device usb-tablet,id=input0 \
>+-device usb-tablet,id=input0 \
> -spice port=5900,x509-dir=/etc/pki/libvirt-spice -vga std \
> -device AC97,id=sound0,bus=pci.0,addr=0x3 \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args	2012-09-03 02:37:05.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args	2012-09-26 09:28:13.550098605 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
> /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor unix:/tmp/test-monitor,server,\
>-nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none \
>--parallel none -usb -vnc '[2001:1:2:3:4:5:1234:1234]:3'
>+nowait -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none \
>+-parallel none -vnc '[2001:1:2:3:4:5:1234:1234]:3'
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args	2012-09-26 09:27:47.694101600 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
> SASL_CONF_DIR=/root/.sasl2 QEMU_AUDIO_DRV=none /usr/bin/qemu -S -M pc -m 214 \
>--smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc \
>+-smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -vnc \
> 127.0.0.1:3,sasl -vga cirrus
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args	2012-09-26 09:27:56.128166642 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
> /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor unix:/tmp/test-monitor,server,\
>-nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none \
>--parallel none -usb -vnc unix:/tmp/foo.socket
>+nowait -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none \
>+-parallel none -vnc unix:/tmp/foo.socket
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args	2012-09-26 09:28:04.945098498 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
> SASL_CONF_DIR=/root/.sasl2 QEMU_AUDIO_DRV=none /usr/bin/qemu -S -M pc -m 214 \
>--smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc \
>+-smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -vnc \
> 127.0.0.1:3,tls,x509verify=/etc/pki/tls/qemu,sasl
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args	2012-09-26 09:28:31.059106416 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest2 -net none -serial none -parallel \
>-none -usb -pcidevice host=06:12.5
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest2 -net none -serial none -parallel \
>+none -pcidevice host=06:12.5
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args	2012-09-26 09:28:22.289143165 +0000
>@@ -1,5 +1,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/QEMUGuest2 -usb -device pci-assign,host=06:12.5,id=hostdev0,\
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest2 -device pci-assign,host=06:12.5,id=hostdev0,\
> bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args	2012-09-26 09:28:46.722099340 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>-none -usb -usbdevice host:14.6
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>+none -usbdevice host:14.6
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args	2012-09-26 09:28:39.648104228 +0000
>@@ -1,5 +1,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 -usb -device usb-host,hostbus=14,hostaddr=6,id=hostdev0 \
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -device usb-host,hostbus=14,hostaddr=6,id=hostdev0 \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args	2012-09-26 09:28:53.521152251 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -mem-prealloc -mem-path /dev/hugepages/libvirt/qemu -smp 1 \
>--nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
>+-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args	2011-09-13 07:37:21.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args	2012-09-26 09:29:04.821099082 +0000
>@@ -1 +1 @@
>-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-mouse,id=input0,bus=usb.0,port=4 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>+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 -usb -hda /dev/HostVG/QEMUGuest1 -device usb-mouse,id=input0,bus=usb.0,port=4 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args	2012-09-26 09:29:13.813100330 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>-none -usb -usbdevice mouse
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>+none -usbdevice mouse
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args	2012-09-26 09:29:30.721098805 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>-none -usb -usbdevice tablet
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>+none -usbdevice tablet
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-input-xen.args b/tests/qemuxml2argvdata/qemuxml2argv-input-xen.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-input-xen.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-input-xen.args	2012-09-26 11:25:54.768133049 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
> /usr/bin/xenner -S -M xenner -m 214 -smp 1 -domid 6 -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -bootloader /foo -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc \
>+unix:/tmp/test-monitor,server,nowait -no-acpi -bootloader /foo -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -vnc \
> 127.0.0.1:3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args	2012-02-01 04:57:11.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args	2012-09-26 09:29:51.269149835 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/kvm -S -M pc \
> -cpu qemu32,-kvmclock -m 214 -smp 6 \
>--nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -net \
>-none -serial none -parallel none -usb
>+-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \
>+none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-lease.args b/tests/qemuxml2argvdata/qemuxml2argv-lease.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-lease.args	2011-06-02 12:06:20.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-lease.args	2012-09-26 09:29:58.613107050 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \
> -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -cdrom /root/boot.iso -net none \
>--serial none -parallel none -usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -cdrom /root/boot.iso -net none \
>+-serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args	2012-09-26 09:30:05.855116113 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
> /usr/bin/qemu-system-x86_64 -S -M pc-0.11 -m 214 -smp 1 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args	2012-09-26 09:30:13.946148271 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/kvm -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>-none -usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>+none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args	2012-09-21 02:02:13.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args	2012-09-26 09:30:21.365183495 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \
> -S -machine pc,dump-guest-core=off -m 214 -smp 1 -nographic \
>--monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
>+-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
> -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>-none -parallel none -usb
>+none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args	2012-09-21 02:02:13.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args	2012-09-26 09:30:28.562100500 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \
> -S -machine pc,dump-guest-core=on -m 214 -smp 1 -nographic \
>--monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
>+-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
> -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>-none -parallel none -usb
>+none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-memtune.args b/tests/qemuxml2argvdata/qemuxml2argv-memtune.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-memtune.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-memtune.args	2012-09-26 09:30:35.194168526 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \
> -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
> -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>-none -parallel none -usb
>+none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-metadata.args b/tests/qemuxml2argvdata/qemuxml2argv-metadata.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-metadata.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-metadata.args	2012-09-26 09:30:41.449097589 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \
> -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
> -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>-none -parallel none -usb
>+none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-migrate.args b/tests/qemuxml2argvdata/qemuxml2argv-migrate.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-migrate.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-migrate.args	2012-09-26 09:30:49.013111034 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>-none -usb -incoming tcp:10.0.0.1:5000
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>+none -incoming tcp:10.0.0.1:5000
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-minimal.args b/tests/qemuxml2argvdata/qemuxml2argv-minimal.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-minimal.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal.args	2012-09-26 09:04:02.872099930 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \
> -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -monitor \
> unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
>--hda /dev/HostVG/QEMUGuest1 -net none -serial \
>-none -parallel none -usb
>+-usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>+none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args	2012-07-18 14:28:01.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args	2012-09-26 09:30:55.866107682 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \
> -name QEMUGuest1 -S -M s390-virtio -m 214 -smp 1 -nographic \
> -monitor unix:/tmp/test-monitor,server,nowait -no-acpi \
>--boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>-none -parallel none -usb
>+-boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>+none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args	2012-09-26 09:31:08.042194568 +0000
>@@ -1,3 +1,3 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
>+-boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args	2012-09-06 07:26:26.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args	2012-09-26 09:31:15.739168315 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \
> -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -global PIIX4_PM.disable_s3=1 -boot c -hda /dev/HostVG/QEMUGuest1 \
>--net none -serial none -parallel none -usb
>+-no-acpi -global PIIX4_PM.disable_s3=1 -boot c -usb -hda /dev/HostVG/QEMUGuest1 \
>+-net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args	2012-09-06 07:26:26.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args	2012-09-26 09:31:42.616205770 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \
> -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -global PIIX4_PM.disable_s3=1 -global PIIX4_PM.disable_s4=1 -boot c \
>--hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
>+-no-acpi -global PIIX4_PM.disable_s3=1 -global PIIX4_PM.disable_s4=1 -boot c -usb \
>+-hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args	2012-09-06 07:26:26.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args	2012-09-26 09:31:49.288107459 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \
> -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -global PIIX4_PM.disable_s4=0 -boot c -hda /dev/HostVG/QEMUGuest1 \
>--net none -serial none -parallel none -usb
>+-no-acpi -global PIIX4_PM.disable_s4=0 -boot c -usb -hda /dev/HostVG/QEMUGuest1 \
>+-net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args	2012-09-26 09:31:55.660170517 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-reboot -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none \
>--parallel none -usb
>+-no-reboot -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none \
>+-parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args	2012-09-26 09:32:02.155100511 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \
> -name QEMUGuest1 -S -M pc -m 214 -smp 1 \
> -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
>--nographic -monitor unix:/tmp/test-monitor,server,nowait -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
>+-nographic -monitor unix:/tmp/test-monitor,server,nowait -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args b/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args	2011-10-15 01:17:36.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args	2012-09-26 09:32:12.378099863 +0000
>@@ -1,5 +1,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 -chardev socket,\
> id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,\
>-id=monitor,mode=control -no-acpi -boot c -hda /dev/hda1 -usb -device \
>+id=monitor,mode=control -no-acpi -boot c -usb -hda /dev/hda1 -device \
> virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args b/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args	2011-10-15 01:17:36.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args	2012-09-26 11:47:30.541402809 +0000
>@@ -10,6 +10,6 @@ pc -m 214 -smp 1 -nographic -nodefconfig
> -device lsi,id=scsi6,bus=pci.0,addr=0x4.0x5 \
> -device lsi,id=scsi7,bus=pci.0,addr=0x4.0x6 \
> -device lsi,id=scsi8,bus=pci.0,addr=0x4.0x7 \
>--drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0 \
>+-usb -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=0x5
>+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-net-client.args b/tests/qemuxml2argvdata/qemuxml2argv-net-client.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-net-client.args	2012-01-19 00:28:59.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-client.args	2012-09-26 09:32:35.759100944 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net nic,\
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net nic,\
> macaddr=52:54:00:8c:b9:05,vlan=0 -net socket,connect=192.168.0.1:5558,vlan=0 \
>--serial none -parallel none -usb
>+-serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args	2012-09-26 09:33:52.740099837 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net nic,\
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net nic,\
> macaddr=00:11:22:33:44:55,vlan=0 -net tap,script=/etc/qemu-ifup,vlan=0 -serial \
>-none -parallel none -usb
>+none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args	2012-09-26 09:33:38.659098905 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net nic,\
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net nic,\
> macaddr=00:11:22:33:44:55,vlan=0 -net tap,ifname=nic02,script=/etc/qemu-ifup,\
>-vlan=0 -serial none -parallel none -usb
>+vlan=0 -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args	2012-09-26 09:33:45.763161782 +0000
>@@ -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 -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net nic,\
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net nic,\
> macaddr=00:11:22:33:44:55,vlan=0,name=net0 -net tap,script=/etc/qemu-ifup,\
> vlan=0,name=hostnet0 -net nic,macaddr=00:11:22:33:44:56,vlan=1,model=e1000,\
> name=net1 -net tap,script=/etc/qemu-ifup,vlan=1,name=hostnet1 -serial none \
>--parallel none -usb
>+-parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args	2012-04-24 03:51:25.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args	2012-09-26 09:34:02.356099569 +0000
>@@ -1,6 +1,6 @@
> 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 \
>+-usb -hda /dev/HostVG/QEMUGuest1 \
> -device pci-assign,host=03:07.1,id=hostdev0,bus=pci.0,addr=0x3 \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args	2012-01-19 00:28:59.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args	2012-09-26 09:34:11.265147619 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net nic,\
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net nic,\
> macaddr=52:54:00:8c:b9:05,vlan=0 -net socket,mcast=192.0.0.1:5558,vlan=0 \
>--serial none -parallel none -usb
>+-serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-net-server.args b/tests/qemuxml2argvdata/qemuxml2argv-net-server.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-net-server.args	2012-01-19 00:28:59.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-server.args	2012-09-26 09:34:19.125099779 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net nic,\
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net nic,\
> macaddr=52:54:00:8c:b9:05,vlan=0 -net socket,listen=192.168.0.1:5558,vlan=0 \
>--serial none -parallel none -usb
>+-serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-net-user.args b/tests/qemuxml2argvdata/qemuxml2argv-net-user.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-net-user.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-user.args	2012-09-26 09:34:29.156107827 +0000
>@@ -1,5 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net nic,\
>-macaddr=00:11:22:33:44:55,vlan=0 -net user,vlan=0 -serial none -parallel none \
>--usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net nic,\
>+macaddr=00:11:22:33:44:55,vlan=0 -net user,vlan=0 -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args	2012-09-26 09:35:06.166104825 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net nic,\
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net nic,\
> macaddr=00:11:22:33:44:55,vlan=0,model=virtio -net user,vlan=0 -serial none \
>--parallel none -usb
>+-parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args	2012-09-26 09:34:38.869100371 +0000
>@@ -1,6 +1,6 @@
> 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 \
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -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=0x3 -net user,vlan=0,name=hostnet0 -usb \
>+mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 -net user,vlan=0,name=hostnet0 \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args	2012-09-26 09:34:47.989100642 +0000
>@@ -1,6 +1,6 @@
> 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 \
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -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=0x3 -usb -device \
>+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
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args	2012-07-18 14:28:01.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args	2012-09-26 09:34:55.519099234 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \
> -M s390-virtio -m 214 -smp 1 -nographic -nodefaults \
>--monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
>+-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
> -device virtio-net-s390,vlan=0,id=net0,mac=00:11:22:33:44:55 \
>--net user,vlan=0,name=hostnet0 -usb
>+-net user,vlan=0,name=hostnet0
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-nographics.args b/tests/qemuxml2argvdata/qemuxml2argv-nographics.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-nographics.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics.args	2012-09-26 09:35:31.833100298 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>-none -usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>+none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args	2012-09-26 09:35:24.517150476 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>-none -usb -vga none
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>+none -vga none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args b/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args	2011-10-15 01:17:36.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args	2012-09-26 09:35:12.647198483 +0000
>@@ -16,6 +16,6 @@ LOGNAME=test \
> -no-shutdown \
> -no-acpi \
> -boot c \
>--hda /dev/hda1 \
> -usb \
>+-hda /dev/hda1 \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-numad.args b/tests/qemuxml2argvdata/qemuxml2argv-numad.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-numad.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-numad.args	2012-09-26 09:36:39.266110128 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 2 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args	2012-09-26 09:35:39.125100453 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 2 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args	2012-09-26 09:36:00.859098592 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 2 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args	2012-09-26 09:36:23.485098440 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 2 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args	2012-09-26 09:36:30.989099963 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 2 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args	2011-08-30 13:00:02.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args	2012-09-26 09:37:07.278099166 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 2 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args	2012-06-05 13:54:52.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args	2012-09-26 09:37:18.957100454 +0000
>@@ -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 -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 \
>+id=monitor,mode=readline -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 \
> -chardev parport,id=charparallel0,path=/dev/parport0 -device \
>-isa-parallel,chardev=charparallel0,id=parallel0 -usb -device \
>+isa-parallel,chardev=charparallel0,id=parallel0 -device \
> virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args	2012-09-26 09:37:34.424357337 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>-tcp:127.0.0.1:9999,server,nowait -usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>+tcp:127.0.0.1:9999,server,nowait
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args	2012-09-26 09:37:27.004109830 +0000
>@@ -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 -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 \
>+id=monitor,mode=readline -no-acpi -boot c -usb -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 \
>+isa-parallel,chardev=charparallel0,id=parallel0 -device \
> virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args	2012-02-01 04:57:11.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args	2012-09-26 09:37:44.815139106 +0000
>@@ -1,12 +1,12 @@
> 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 \
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
> /dev/HostVG/QEMUGuest2 \
> -device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,addr=0x3,rombar=1 \
> -net user,vlan=0,name=hostnet0 \
> -device virtio-net-pci,vlan=1,id=net1,mac=52:54:00:24:a5:9e,bus=pci.0,addr=0x4,\
> romfile=/etc/fake/bootrom.bin -net user,vlan=1,name=hostnet1 \
>--usb -device pci-assign,host=06:12.5,id=hostdev0,bus=pci.0,addr=0x5,rombar=0 \
>+-device pci-assign,host=06:12.5,id=hostdev0,bus=pci.0,addr=0x5,rombar=0 \
> -device pci-assign,host=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
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args	2012-01-19 00:28:59.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args	2012-09-26 09:37:57.753350948 +0000
>@@ -1 +1 @@
>-LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu-system-ppc64 -S -M pseries -m 512 -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 -chardev pty,id=charserial0 -device spapr-vty,chardev=charserial0,reg=0x30000000 -usb
>+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu-system-ppc64 -S -M pseries -m 512 -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 -usb -chardev pty,id=charserial0 -device spapr-vty,chardev=charserial0,reg=0x30000000
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args	2012-03-01 15:03:14.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args	2012-09-26 11:48:05.814099396 +0000
>@@ -4,9 +4,9 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c \
> -device spapr-vscsi,id=scsi0,reg=0x2000 \
> -device spapr-vscsi,id=scsi1,reg=0x3000 \
>--drive file=/tmp/scsidisk.img,if=none,id=drive-scsi1-0-0-0 \
>+-usb -drive file=/tmp/scsidisk.img,if=none,id=drive-scsi1-0-0-0 \
> -device scsi-disk,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,id=scsi1-0-0-0 \
> -chardev pty,id=charserial0 \
> -device spapr-vty,chardev=charserial0,reg=0x30000000 \
> -chardev pty,id=charserial1 \
>--device spapr-vty,chardev=charserial1,reg=0x30001000 -usb
>+-device spapr-vty,chardev=charserial1,reg=0x30001000
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args	2012-03-01 15:03:14.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args	2012-09-26 11:47:59.253109182 +0000
>@@ -4,9 +4,9 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c \
> -device spapr-vscsi,id=scsi0,reg=0x2000 \
> -device spapr-vscsi,id=scsi1,reg=0x30000000 \
>--drive file=/tmp/scsidisk.img,if=none,id=drive-scsi1-0-0-0 \
>+-usb -drive file=/tmp/scsidisk.img,if=none,id=drive-scsi1-0-0-0 \
> -device scsi-disk,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,id=scsi1-0-0-0 \
> -chardev pty,id=charserial0 \
> -device spapr-vty,chardev=charserial0,reg=0x20000000 \
> -chardev pty,id=charserial1 \
>--device spapr-vty,chardev=charserial1,reg=0x30001000 -usb
>+-device spapr-vty,chardev=charserial1,reg=0x30001000
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args	2012-09-03 02:37:05.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args	2012-09-26 09:38:42.480101393 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test NS=ns BAR='' \
> /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -unknown \
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -unknown \
> parameter
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args	2012-09-26 09:38:26.353146684 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>-none -usb -unknown parameter
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>+none -unknown parameter
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args	2012-09-21 02:02:13.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args	2012-09-26 09:38:53.717100091 +0000
>@@ -1,3 +1,3 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \
> -m 214 -smp 6 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot order=n,reboot-timeout=-1 -net none -serial none -parallel none -usb
>+-no-acpi -boot order=n,reboot-timeout=-1 -usb -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args	2012-09-21 02:02:13.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args	2012-09-26 09:39:06.420098851 +0000
>@@ -1,3 +1,3 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \
> -m 214 -smp 6 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot order=n,reboot-timeout=128 -net none -serial none -parallel none -usb
>+-no-acpi -boot order=n,reboot-timeout=128 -usb -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args	2012-09-26 09:39:13.760145979 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>-none -usb -incoming stdio
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>+none -incoming stdio
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args	2012-09-26 09:39:27.781098212 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>-none -usb -incoming exec:cat
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>+none -incoming exec:cat
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args	2012-09-26 09:39:21.076131165 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>-none -usb -incoming fd:7
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>+none -incoming fd:7
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args	2012-09-26 09:39:48.505168152 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \
> -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
> -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>-none -parallel none -usb
>+none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args	2012-09-26 09:39:34.549111190 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \
> -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
> -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>-none -parallel none -usb
>+none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args	2012-09-26 09:39:41.573151031 +0000
>@@ -1,6 +1,6 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \
> -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
> -hda /dev/HostVG/QEMUGuest1 \
> -hdb /dev/HostVG/QEMUGuest2 -net none -serial \
>-none -parallel none -usb
>+none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args	2012-09-26 09:39:57.127099924 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \
> -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
> -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>-none -parallel none -usb
>+none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args	2012-09-26 09:40:11.477099795 +0000
>@@ -1,6 +1,6 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \
> -name QEMUGuest1 -S -M \
> pc -m 214 -smp 1 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
> -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>-none -parallel none -usb
>+none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args	2012-09-26 09:40:04.838105381 +0000
>@@ -1,5 +1,5 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \
> -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic \
> -monitor unix:/tmp/test-monitor,\
>-server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>-none -parallel none -usb
>+server,nowait -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>+none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args	2012-09-26 09:40:30.515151979 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial /dev/ttyS2 \
>--parallel none -usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial /dev/ttyS2 \
>+-parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args	2012-09-26 09:40:23.400099580 +0000
>@@ -1,6 +1,6 @@
> 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 -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 \
>+id=monitor,mode=readline -no-acpi -boot c -usb -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=0x3
>+id=serial0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args	2012-09-26 09:40:48.425100508 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>-file:/tmp/serial.log -parallel none -usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>+file:/tmp/serial.log -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args	2012-09-26 09:40:41.221164006 +0000
>@@ -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 -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 \
>+id=monitor,mode=readline -no-acpi -boot c -usb -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,\
>+chardev=charserial0,id=serial0 -device virtio-balloon-pci,id=balloon0,\
> bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args	2012-09-26 09:41:06.861100274 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial pty -serial \
>-file:/tmp/serial.log -parallel none -usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial pty -serial \
>+file:/tmp/serial.log -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args	2012-09-26 09:40:59.658098465 +0000
>@@ -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 -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 \
>+id=monitor,mode=readline -no-acpi -boot c -usb -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,\
>+chardev=charserial1,id=serial1 -device virtio-balloon-pci,id=balloon0,\
> bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args	2012-09-26 09:41:22.648099488 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial pty -parallel \
>-none -usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial pty -parallel \
>+none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args	2012-09-26 09:41:15.560098850 +0000
>@@ -1,6 +1,6 @@
> 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 -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 \
>+id=monitor,mode=readline -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -chardev \
>+pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args	2012-09-26 09:41:55.580157152 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>-tcp:127.0.0.1:9999 -parallel none -usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>+tcp:127.0.0.1:9999 -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args	2012-09-26 09:41:31.352100146 +0000
>@@ -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 -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 \
>+id=monitor,mode=readline -no-acpi -boot c -usb -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,\
>+chardev=charserial0,id=serial0 -device virtio-balloon-pci,id=balloon0,\
> bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args	2012-09-26 09:41:48.552099077 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>-telnet:127.0.0.1:9999,server,nowait -parallel none -usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>+telnet:127.0.0.1:9999,server,nowait -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args	2012-09-26 09:41:40.632098935 +0000
>@@ -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 -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 \
>+id=monitor,mode=readline -no-acpi -boot c -usb -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,\
>+isa-serial,chardev=charserial0,id=serial0 -device virtio-balloon-pci,\
> id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args	2011-08-30 13:00:02.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args	2012-09-26 09:42:12.652098502 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>-udp:127.0.0.1:9998@127.0.0.1:9999 -serial udp::9999@:0 -parallel none -usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>+udp:127.0.0.1:9998@127.0.0.1:9999 -serial udp::9999@:0 -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args	2011-08-30 13:00:02.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args	2012-09-26 09:42:04.207098874 +0000
>@@ -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 -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 \
>+id=monitor,mode=readline -no-acpi -boot c -usb -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 \
> -chardev udp,id=charserial1,host=,port=9999,localaddr=,localport=0 \
>--device isa-serial,chardev=charserial1,id=serial1 -usb -device \
>+-device isa-serial,chardev=charserial1,id=serial1 -device \
> virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args	2012-09-26 09:42:32.879099537 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>-unix:/tmp/serial.sock -parallel none -usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \
>+unix:/tmp/serial.sock -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args	2012-09-26 09:42:25.550098582 +0000
>@@ -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 -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 \
>+id=monitor,mode=readline -no-acpi -boot c -usb -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,\
>+chardev=charserial0,id=serial0 -device virtio-balloon-pci,id=balloon0,\
> bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args	2012-09-26 09:42:47.649208915 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial vc -parallel \
>-none -usb
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial vc -parallel \
>+none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args	2012-09-26 09:42:41.097145001 +0000
>@@ -1,6 +1,6 @@
> 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 -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 \
>+id=monitor,mode=readline -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -chardev \
>+vc,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args	2012-09-26 11:46:22.097159168 +0000
>@@ -2,6 +2,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> 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 -device \
>-usb-ccid,id=ccid0 -device \
>-ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 -usb \
>+usb-ccid,id=ccid0 -usb -device \
>+ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args	2012-09-26 11:46:43.332192040 +0000
>@@ -2,6 +2,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> 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 -device \
>-usb-ccid,id=ccid0 -device \
>-ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 -usb \
>+usb-ccid,id=ccid0 -usb -device \
>+ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args	2012-09-26 11:46:36.561101437 +0000
>@@ -2,7 +2,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> 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 -device \
>-usb-ccid,id=ccid0 -device \
>+usb-ccid,id=ccid0 -usb -device \
> ccid-card-emulated,backend=certificates,cert1=cert1,cert2=cert2,cert3=cert3\
>-,database=/etc/pki/nssdb,id=smartcard0,bus=ccid0.0 -usb -device \
>+,database=/etc/pki/nssdb,id=smartcard0,bus=ccid0.0 -device \
> virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args	2012-09-26 11:46:53.107099606 +0000
>@@ -2,6 +2,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> 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 -device \
>-usb-ccid,id=ccid0 -chardev spicevmc,id=charsmartcard0,name=smartcard \
>+usb-ccid,id=ccid0 -usb -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=0x3
>+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args	2012-09-26 11:47:07.936111641 +0000
>@@ -2,7 +2,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> 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 -device \
>-usb-ccid,id=ccid0 -chardev \
>+usb-ccid,id=ccid0 -usb -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=0x3
>+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args	2012-09-03 02:37:05.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args	2012-09-26 09:43:44.930099664 +0000
>@@ -3,5 +3,5 @@ pc -m 214 -smp 1 -smbios 'type=0,vendor=
> -smbios 'type=1,manufacturer=Fedora,product=Virt-Manager,version=0.8.2-3.fc14,\
> serial=32dfcb37-5af1-552b-357c-be8c3aa38310,\
> uuid=c7a5fdbd-edaf-9455-926a-d65c16db1809,sku=1234567890,family=Red Hat' \
>--nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
>+-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-smp.args b/tests/qemuxml2argvdata/qemuxml2argv-smp.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-smp.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-smp.args	2012-09-26 09:43:51.922147410 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1,maxcpus=2,sockets=2,cores=1,threads=1 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-sound.args b/tests/qemuxml2argvdata/qemuxml2argv-sound.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-sound.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-sound.args	2012-09-26 09:44:13.572100416 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>-none -usb -soundhw pcspk,es1370,sb16,ac97
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>+none -soundhw pcspk,es1370,sb16,ac97
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args	2012-06-04 02:08:04.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args	2012-09-26 09:44:05.088100459 +0000
>@@ -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 -hda \
>-/dev/HostVG/QEMUGuest1 -usb -soundhw pcspk -device ES1370,id=sound1,bus=pci.0,\
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -soundhw pcspk -device ES1370,id=sound1,bus=pci.0,\
> 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 \
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args	2012-02-01 04:57:11.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args	2012-09-26 11:42:40.085111748 +0000
>@@ -2,10 +2,10 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=
> /usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nodefaults \
> -monitor unix:/tmp/test-monitor,server,nowait -no-acpi \
> -boot dc -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
>--drive file=/dev/sdfake,if=none,id=drive-virtio-disk0 \
>+-usb -drive file=/dev/sdfake,if=none,id=drive-virtio-disk0 \
> -device virtio-blk-pci,scsi=on,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 \
> -drive file=/dev/sdfake2,if=none,id=drive-virtio-disk1 \
> -device virtio-blk-pci,scsi=on,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
> -device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3 \
>--net user,vlan=0,name=hostnet0 -serial pty -usb -vnc 127.0.0.1:-809 -std-vga \
>+-net user,vlan=0,name=hostnet0 -serial pty -vnc 127.0.0.1:-809 -std-vga \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args	2012-09-26 09:46:30.668107206 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>-none -usb -watchdog ib700 -watchdog-action poweroff
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>+none -watchdog ib700 -watchdog-action poweroff
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args	2012-09-26 09:46:12.873354161 +0000
>@@ -1,5 +1,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 -usb -device ib700,id=watchdog0 -watchdog-action \
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -device ib700,id=watchdog0 -watchdog-action \
> poweroff -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
>diff -urNp a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args
>--- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args	2011-05-11 10:25:39.000000000 +0000
>+++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args	2012-09-26 09:46:21.020361962 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
> pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
>--no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>-none -usb -watchdog ib700 -watchdog-action pause
>+-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \
>+none -watchdog ib700 -watchdog-action pause
>diff -urNp a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args
>--- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args	2011-11-09 07:01:17.000000000 +0000
>+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args	2012-09-26 11:54:07.671144892 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
> /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb ARGUMENT
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none ARGUMENT
>diff -urNp a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args
>--- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args	2011-11-09 07:01:17.000000000 +0000
>+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args	2012-09-26 11:53:51.785099100 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
> /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb ARGUMENT
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none ARGUMENT
>diff -urNp a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args
>--- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args	2011-11-09 07:01:17.000000000 +0000
>+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args	2012-09-26 11:53:59.514155026 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
> /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb ARGUMENT
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none ARGUMENT
>diff -urNp a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args
>--- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args	2011-11-09 07:01:17.000000000 +0000
>+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args	2012-09-26 11:54:41.864102959 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
> /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none
>diff -urNp a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args
>--- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args	2011-11-09 07:01:17.000000000 +0000
>+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args	2012-09-26 11:54:25.660099947 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
> /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb ARGUMENT
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none ARGUMENT
>diff -urNp a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args
>--- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args	2011-11-09 07:01:17.000000000 +0000
>+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args	2012-09-26 11:54:18.282156696 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
> /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb ARGUMENT
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none ARGUMENT
>diff -urNp a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args
>--- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args	2011-11-09 07:01:17.000000000 +0000
>+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args	2012-09-26 11:54:33.452099442 +0000
>@@ -1,4 +1,4 @@
> LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
> /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \
>-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \
>-/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb ARGUMENT
>+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
>+/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none ARGUMENT

Actions: View

Attachments on bug 861309: 618424 | 618425 | 618426