Check the QEMU version and refuse to work with QEMU versions older than 0.12.0. This is approximately the vintage of QEMU that is available in RHEL-6 era distros. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 7 ++ tests/qemuhelpdata/kvm-74 | 111 --------------------- tests/qemuhelpdata/kvm-83-rhel56 | 141 -------------------------- tests/qemuhelpdata/kvm-86 | 170 ------------------------------- tests/qemuhelpdata/qemu-0.10.5 | 141 -------------------------- tests/qemuhelpdata/qemu-0.9.1 | 102 ------------------- tests/qemuhelpdata/qemu-kvm-0.10.5 | 155 ----------------------------- tests/qemuhelpdata/qemu-kvm-0.11.0-rc2 | 177 --------------------------------- tests/qemuhelptest.c | 163 ------------------------------ 9 files changed, 7 insertions(+), 1160 deletions(-) delete mode 100644 tests/qemuhelpdata/kvm-74 delete mode 100644 tests/qemuhelpdata/kvm-83-rhel56 delete mode 100644 tests/qemuhelpdata/kvm-86 delete mode 100644 tests/qemuhelpdata/qemu-0.10.5 delete mode 100644 tests/qemuhelpdata/qemu-0.9.1 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.10.5 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.11.0-rc2 diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7bc7e92..c888547 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1458,6 +1458,13 @@ int virQEMUCapsParseHelpStr(const char *qemu, *version = (major * 1000 * 1000) + (minor * 1000) + micro; + if (*version < 12000) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("QEMU version >= 0.12.00 is required, but %d.%d.%d found"), + major, minor, micro); + goto cleanup; + } + /* Refuse to parse -help output for QEMU releases >= 1.2.0 that should be * using QMP probing. */ diff --git a/tests/qemuhelpdata/kvm-74 b/tests/qemuhelpdata/kvm-74 deleted file mode 100644 index f44932d..0000000 --- a/tests/qemuhelpdata/kvm-74 +++ /dev/null @@ -1,111 +0,0 @@ -QEMU PC emulator version 0.9.1 (kvm-74), Copyright (c) 2003-2008 Fabrice Bellard -usage: qemu [options] [disk_image] - -'disk_image' is a raw hard image image for IDE hard disk 0 - -Standard options: --M machine select emulated machine (-M ? for list) --cpu cpu select CPU (-cpu ? for list) --fda/-fdb file use 'file' as floppy disk 0/1 image --hda/-hdb file use 'file' as IDE hard disk 0/1 image --hdc/-hdd file use 'file' as IDE hard disk 2/3 image --cdrom file use 'file' as IDE cdrom image (cdrom is ide1 master) --drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i] - [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off] - [,cache=on|off][,format=f][,boot=on|off] - use 'file' as a drive image --mtdblock file use 'file' as on-board Flash memory image --sd file use 'file' as SecureDigital card image --pflash file use 'file' as a parallel flash image --boot [a|c|d|n] boot on floppy (a), hard disk (c), CD-ROM (d), or network (n) --snapshot write to temporary files instead of disk image files --no-frame open SDL window without a frame and window decorations --alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt) --no-quit disable SDL window close capability --no-fd-bootchk disable boot signature checking for floppy disks --m megs set virtual RAM size to megs MB [default=128] --smp n set the number of CPUs to 'n' [default=1] --nographic disable graphical output and redirect serial I/Os to console --portrait rotate graphical output 90 deg left (only PXA LCD) --k language use keyboard layout (for example "fr" for French) --audio-help print list of audio drivers and their options --soundhw c1,... enable audio support - and only specified sound cards (comma separated list) - use -soundhw ? to get the list of supported cards - use -soundhw all to enable all of them --localtime set the real time clock to local time [default=utc] --full-screen start in full screen --win2k-hack use it when installing Windows 2000 to avoid a disk full bug --usb enable the USB driver (will be the default soon) --usbdevice name add the host or guest USB device 'name' --name string set the name of the guest - -Network options: --net nic[,vlan=n][,macaddr=addr][,model=type] - create a new Network Interface Card and connect it to VLAN 'n' --net user[,vlan=n][,hostname=host] - connect the user mode network stack to VLAN 'n' and send - hostname 'host' to DHCP clients --net tap[,vlan=n][,fd=h][,ifname=name][,script=file][,downscript=dfile] - connect the host TAP network interface to VLAN 'n' and use the - network scripts 'file' (default=/etc/qemu-ifup) - and 'dfile' (default=/etc/qemu-ifdown); - use '[down]script=no' to disable script execution; - use 'fd=h' to connect to an already opened TAP interface --net socket[,vlan=n][,fd=h][,listen=[host]:port][,connect=host:port] - connect the vlan 'n' to another VLAN using a socket connection --net socket[,vlan=n][,fd=h][,mcast=maddr:port] - connect the vlan 'n' to multicast maddr and port --net none use it alone to have zero network devices; if no -net option - is provided, the default is '-net nic -net user' - --tftp dir allow tftp access to files in dir [-net user] --bootp file advertise file in BOOTP replies --smb dir allow SMB access to files in 'dir' [-net user] --redir [tcp|udp]:host-port:[guest-host]:guest-port - redirect TCP or UDP connections from host to guest [-net user] - -Linux boot specific: --kernel bzImage use 'bzImage' as kernel image --append cmdline use 'cmdline' as kernel command line --initrd file use 'file' as initial ram disk - -Debug/Expert options: --monitor dev redirect the monitor to char device 'dev' --serial dev redirect the serial port to char device 'dev' --parallel dev redirect the parallel port to char device 'dev' --pidfile file Write PID to 'file' --S freeze CPU at startup (use 'c' to start execution) --s wait gdb connection to port --p port set gdb connection port [default=1234] --d item1,... output log to /tmp/qemu.log (use -d ? for a list of log items) --hdachs c,h,s[,t] force hard disk 0 physical geometry and the optional BIOS - translation (t=none or lba) (usually qemu can guess them) --L path set the directory for the BIOS, VGA BIOS and keymaps --no-kvm disable KVM hardware virtualization --no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC --no-kvm-pit disable KVM kernel mode PIT --std-vga simulate a standard VGA card with VESA Bochs Extensions - (default is CL-GD5446 PCI VGA) --no-acpi disable ACPI --no-reboot exit instead of rebooting --no-shutdown stop before shutdown --loadvm [tag|id] start right away with a saved state (loadvm in monitor) --vnc display start a VNC server on display --daemonize daemonize QEMU after initializing --tdf inject timer interrupts that got lost --kvm-shadow-memory megs set the amount of shadow pages to be allocated --mem-path set the path to hugetlbfs/tmpfs mounted directory, also enables allocation of guest memory with huge pages --option-rom rom load a file, rom, into the option ROM space --clock force the use of the given methods for timer alarm. - To see what timers are available use -clock ? --startdate select initial date of the clock --icount [N|auto] - Enable virtual instruction counter with 2^N clock ticks per instruction - -During emulation, the following keys are useful: -ctrl-alt-f toggle full screen -ctrl-alt-n switch to virtual console 'n' -ctrl-alt toggle mouse and keyboard grab - -When using -nographic, press 'ctrl-a h' to get some help. diff --git a/tests/qemuhelpdata/kvm-83-rhel56 b/tests/qemuhelpdata/kvm-83-rhel56 deleted file mode 100644 index b2cefa9..0000000 --- a/tests/qemuhelpdata/kvm-83-rhel56 +++ /dev/null @@ -1,141 +0,0 @@ -QEMU PC emulator version 0.9.1 (kvm-83-maint-snapshot-20090205), Copyright (c) 2003-2008 Fabrice Bellard -usage: qemu [options] [disk_image] - -'disk_image' is a raw hard image image for IDE hard disk 0 - -Standard options: --M machine select emulated machine (-M ? for list) --cpu cpu select CPU (-cpu ? for list) --fda/-fdb file use 'file' as floppy disk 0/1 image --hda/-hdb file use 'file' as IDE hard disk 0/1 image --hdc/-hdd file use 'file' as IDE hard disk 2/3 image --cdrom file use 'file' as IDE cdrom image (cdrom is ide1 master) --drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i] - [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off] - [,cache=writethrough|writeback|none|unsafe][,format=f][,serial=s] - [,boot=on|off][,readonly=on|off] - use 'file' as a drive image --mtdblock file use 'file' as on-board Flash memory image --sd file use 'file' as SecureDigital card image --pflash file use 'file' as a parallel flash image --boot [a|c|d|n] boot on floppy (a), hard disk (c), CD-ROM (d), or network (n) --snapshot write to temporary files instead of disk image files --no-frame open SDL window without a frame and window decorations --alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt) --no-quit disable SDL window close capability --no-fd-bootchk disable boot signature checking for floppy disks --m megs set virtual RAM size to megs MB [default=128] --smp n set the number of CPUs to 'n' [default=1] --nographic disable graphical output and redirect serial I/Os to console --portrait rotate graphical output 90 deg left (only PXA LCD) --k language use keyboard layout (for example "fr" for French) --audio-help print list of audio drivers and their options --soundhw c1,... enable audio support - and only specified sound cards (comma separated list) - use -soundhw ? to get the list of supported cards - use -soundhw all to enable all of them --vga [std|cirrus] - select video card type --localtime set the real time clock to local time [default=utc] --full-screen start in full screen --win2k-hack use it when installing Windows 2000 to avoid a disk full bug --rtc-td-hack use it to fix time drift in Windows ACPI HAL --usb enable the USB driver (will be the default soon) --usbdevice name add the host or guest USB device 'name' --name string set the name of the guest --uuid %08x-%04x-%04x-%04x-%012x specify machine UUID --notify event enable async-notifications for event --qxl <num>[,ram=megs] - use 'num' qxl display devices, each with RAM size of 'megs' MB - [default=64] --spice <args> use spice --spice-help show spice usage - -Network options: --net nic[,vlan=n][,macaddr=addr][,model=type][,name=str] - create a new Network Interface Card and connect it to VLAN 'n' --net user[,vlan=n][,name=str][,hostname=host] - connect the user mode network stack to VLAN 'n' and send - hostname 'host' to DHCP clients --net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile] - connect the host TAP network interface to VLAN 'n' and use the - network scripts 'file' (default=/etc/qemu-ifup) - and 'dfile' (default=/etc/qemu-ifdown); - use '[down]script=no' to disable script execution; - use 'fd=h' to connect to an already opened TAP interface --net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port] - connect the vlan 'n' to another VLAN using a socket connection --net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port] - connect the vlan 'n' to multicast maddr and port --net none use it alone to have zero network devices; if no -net option - is provided, the default is '-net nic -net user' - --tftp dir allow tftp access to files in dir [-net user] --bootp file advertise file in BOOTP replies --redir [tcp|udp]:host-port:[guest-host]:guest-port - redirect TCP or UDP connections from host to guest [-net user] - -Linux boot specific: --kernel bzImage use 'bzImage' as kernel image --append cmdline use 'cmdline' as kernel command line --initrd file use 'file' as initial ram disk - -Debug/Expert options: --monitor dev redirect the monitor to char device 'dev' --vmchannel di:DI,dev redirect the hypercall device with device id DI, to char device 'dev' --serial dev redirect the serial port to char device 'dev' --parallel dev redirect the parallel port to char device 'dev' --pidfile file Write PID to 'file' --S freeze CPU at startup (use 'c' to start execution) --s wait gdb connection to port --p port set gdb connection port [default=1234] --d item1,... output log to /tmp/qemu.log (use -d ? for a list of log items) --hdachs c,h,s[,t] force hard disk 0 physical geometry and the optional BIOS - translation (t=none or lba) (usually qemu can guess them) --L path set the directory for the BIOS, VGA BIOS and keymaps --no-kvm disable KVM hardware virtualization --no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC --no-kvm-pit disable KVM kernel mode PIT --no-kvm-pit-reinjection disable KVM kernel mode PIT interrupt reinjection --pcidevice host=bus:dev.func[,dma=none][,name=string] - expose a PCI device to the guest OS. - dma=none: don't perform any dma translations (default is to use an iommu) - 'string' is used in log output. --no-acpi disable ACPI --no-hpet disable HPET --balloon none disable balloon device --balloon virtio - enable virtio balloon device (default) --acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,data=file1[:file2]...] - ACPI table description --smbios file=binary - Load SMBIOS entry from binary file --smbios type=0[,vendor=str][,version=str][,date=str][,release=%d.%d] - Specify SMBIOS type 0 fields --smbios type=1[,manufacturer=str][,product=str][,version=str][,serial=str] - [,uuid=uuid][,sku=str][,family=str] - Specify SMBIOS type 1 fields --no-reboot exit instead of rebooting --no-shutdown stop before shutdown --loadvm [tag|id] start right away with a saved state (loadvm in monitor) --vnc display start a VNC server on display --daemonize daemonize QEMU after initializing --tdf inject timer interrupts that got lost --kvm-shadow-memory megs set the amount of shadow pages to be allocated --mem-path set the path to hugetlbfs/tmpfs mounted directory, also - enables allocation of guest memory with huge pages --mem-prealloc toggles preallocation of -mem-path backed physical memory - at startup. Default is enabled. --option-rom rom load a file, rom, into the option ROM space --clock force the use of the given methods for timer alarm. - To see what timers are available use -clock ? --startdate select initial date of the clock --icount [N|auto] - Enable virtual instruction counter with 2^N clock ticks per instruction - -During emulation, the following keys are useful: -ctrl-alt-f toggle full screen -ctrl-alt-n switch to virtual console 'n' -ctrl-alt toggle mouse and keyboard grab - -When using -nographic, press 'ctrl-a h' to get some help. diff --git a/tests/qemuhelpdata/kvm-86 b/tests/qemuhelpdata/kvm-86 deleted file mode 100644 index 1687cab..0000000 --- a/tests/qemuhelpdata/kvm-86 +++ /dev/null @@ -1,170 +0,0 @@ -QEMU PC emulator version 0.10.50 (qemu-kvm-devel-86), Copyright (c) 2003-2008 Fabrice Bellard -usage: qemu [options] [disk_image] - -'disk_image' is a raw hard image image for IDE hard disk 0 - -Standard options: --h or -help display this help and exit --version display version information and exit --M machine select emulated machine (-M ? for list) --cpu cpu select CPU (-cpu ? for list) --smp n set the number of CPUs to 'n' [default=1] --numa node[,mem=size][,cpus=cpu[-cpu]][,nodeid=node] --fda/-fdb file use 'file' as floppy disk 0/1 image --hda/-hdb file use 'file' as IDE hard disk 0/1 image --hdc/-hdd file use 'file' as IDE hard disk 2/3 image --cdrom file use 'file' as IDE cdrom image (cdrom is ide1 master) --drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i] - [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off] - [,cache=writethrough|writeback|none][,format=f][,serial=s] - [,boot=on|off] - use 'file' as a drive image --mtdblock file use 'file' as on-board Flash memory image --sd file use 'file' as SecureDigital card image --pflash file use 'file' as a parallel flash image --boot [a|c|d|n] boot on floppy (a), hard disk (c), CD-ROM (d), or network (n) --snapshot write to temporary files instead of disk image files --m megs set virtual RAM size to megs MB [default=128] --k language use keyboard layout (for example 'fr' for French) --audio-help print list of audio drivers and their options --soundhw c1,... enable audio support - and only specified sound cards (comma separated list) - use -soundhw ? to get the list of supported cards - use -soundhw all to enable all of them --usb enable the USB driver (will be the default soon) --usbdevice name add the host or guest USB device 'name' --name string set the name of the guest --uuid %08x-%04x-%04x-%04x-%012x - specify machine UUID - -Display options: --nographic disable graphical output and redirect serial I/Os to console --no-frame open SDL window without a frame and window decorations --alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt) --no-quit disable SDL window close capability --sdl enable SDL --portrait rotate graphical output 90 deg left (only PXA LCD) --vga [std|cirrus|vmware|xenfb|none] - select video card type --full-screen start in full screen --vnc display start a VNC server on display - -i386 target only: --win2k-hack use it when installing Windows 2000 to avoid a disk full bug --rtc-td-hack use it to fix time drift in Windows ACPI HAL --no-fd-bootchk disable boot signature checking for floppy disks --no-acpi disable ACPI --no-hpet disable HPET --acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,data=file1[:file2]...] - ACPI table description --smbios file=binary - Load SMBIOS entry from binary file --smbios type=0[,vendor=str][,version=str][,date=str][,release=%d.%d] - Specify SMBIOS type 0 fields --smbios type=1[,manufacturer=str][,product=str][,version=str][,serial=str] - [,uuid=uuid][,sku=str][,family=str] - Specify SMBIOS type 1 fields - -Network options: --net nic[,vlan=n][,macaddr=addr][,model=type][,name=str] - create a new Network Interface Card and connect it to VLAN 'n' --net user[,vlan=n][,name=str][,hostname=host] - connect the user mode network stack to VLAN 'n' and send - hostname 'host' to DHCP clients --net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile] - connect the host TAP network interface to VLAN 'n' and use the - network scripts 'file' (default=/etc/qemu-ifup) - and 'dfile' (default=/etc/qemu-ifdown); - use '[down]script=no' to disable script execution; - use 'fd=h' to connect to an already opened TAP interface --net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port] - connect the vlan 'n' to another VLAN using a socket connection --net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port] - connect the vlan 'n' to multicast maddr and port --net dump[,vlan=n][,file=f][,len=n] - dump traffic on vlan 'n' to file 'f' (max n bytes per packet) --net none use it alone to have zero network devices; if no -net option - is provided, the default is '-net nic -net user' --tftp dir allow tftp access to files in dir [-net user] --bootp file advertise file in BOOTP replies --smb dir allow SMB access to files in 'dir' [-net user] --redir [tcp|udp]:host-port:[guest-host]:guest-port - redirect TCP or UDP connections from host to guest [-net user] - --bt hci,null dumb bluetooth HCI - doesn't respond to commands --bt hci,host[:id] - use host's HCI with the given name --bt hci[,vlan=n] - emulate a standard HCI in virtual scatternet 'n' --bt vhci[,vlan=n] - add host computer to virtual scatternet 'n' using VHCI --bt device:dev[,vlan=n] - emulate a bluetooth device 'dev' in scatternet 'n' - -Linux boot specific: --kernel bzImage use 'bzImage' as kernel image --append cmdline use 'cmdline' as kernel command line --initrd file use 'file' as initial ram disk - -Debug/Expert options: --serial dev redirect the serial port to char device 'dev' --parallel dev redirect the parallel port to char device 'dev' --monitor dev redirect the monitor to char device 'dev' --pidfile file write PID to 'file' --singlestep always run in singlestep mode --S freeze CPU at startup (use 'c' to start execution) --gdb dev wait for gdb connection on 'dev' --s shorthand for -gdb tcp::1234 --d item1,... output log to /tmp/qemu.log (use -d ? for a list of log items) --hdachs c,h,s[,t] - force hard disk 0 physical geometry and the optional BIOS - translation (t=none or lba) (usually qemu can guess them) --L path set the directory for the BIOS, VGA BIOS and keymaps --bios file set the filename for the BIOS --no-reboot exit instead of rebooting --no-shutdown stop before shutdown --loadvm [tag|id] - start right away with a saved state (loadvm in monitor) --daemonize daemonize QEMU after initializing --option-rom rom load a file, rom, into the option ROM space --clock force the use of the given methods for timer alarm. - To see what timers are available use -clock ? --localtime set the real time clock to local time [default=utc] --startdate select initial date of the clock --icount [N|auto] - enable virtual instruction counter with 2^N clock ticks per - instruction --watchdog i6300esb|ib700 - enable virtual hardware watchdog [default=none] --watchdog-action reset|shutdown|poweroff|pause|debug|none - action when watchdog fires [default=reset] --echr chr set terminal escape character instead of ctrl-a --virtioconsole c - set virtio console --show-cursor show cursor --tb-size n set TB size --incoming p prepare for incoming migration, listen on port p --chroot dir Chroot to dir just before starting the VM. --runas user Change to user id user just before starting the VM. --no-kvm disable KVM hardware virtualization --no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC --no-kvm-pit disable KVM kernel mode PIT --no-kvm-pit-reinjection disable KVM kernel mode PIT interrupt reinjection --pcidevice host=bus:dev.func[,dma=none][,name=string] - expose a PCI device to the guest OS. - dma=none: don't perform any dma translations (default is to use an iommu) - 'string' is used in log output. --enable-nesting enable support for running a VM inside the VM (AMD only) --nvram FILE provide ia64 nvram contents --tdf enable guest time drift compensation --kvm-shadow-memory MEGABYTES - allocate MEGABYTES for kvm mmu shadowing --mempath FILE provide backing storage for guest RAM --mem-prealloc preallocate guest memory (use with -mempath) - -During emulation, the following keys are useful: -ctrl-alt-f toggle full screen -ctrl-alt-n switch to virtual console 'n' -ctrl-alt toggle mouse and keyboard grab - -When using -nographic, press 'ctrl-a h' to get some help. diff --git a/tests/qemuhelpdata/qemu-0.10.5 b/tests/qemuhelpdata/qemu-0.10.5 deleted file mode 100644 index 2a8363b..0000000 --- a/tests/qemuhelpdata/qemu-0.10.5 +++ /dev/null @@ -1,141 +0,0 @@ -QEMU PC emulator version 0.10.5, Copyright (c) 2003-2008 Fabrice Bellard -usage: qemu [options] [disk_image] - -'disk_image' is a raw hard image image for IDE hard disk 0 - -Standard options: --h or -help display this help and exit --M machine select emulated machine (-M ? for list) --cpu cpu select CPU (-cpu ? for list) --smp n set the number of CPUs to 'n' [default=1] --fda/-fdb file use 'file' as floppy disk 0/1 image --hda/-hdb file use 'file' as IDE hard disk 0/1 image --hdc/-hdd file use 'file' as IDE hard disk 2/3 image --cdrom file use 'file' as IDE cdrom image (cdrom is ide1 master) --drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i] - [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off] - [,cache=writethrough|writeback|none][,format=f][,serial=s] - use 'file' as a drive image --mtdblock file use 'file' as on-board Flash memory image --sd file use 'file' as SecureDigital card image --pflash file use 'file' as a parallel flash image --boot [a|c|d|n] boot on floppy (a), hard disk (c), CD-ROM (d), or network (n) --snapshot write to temporary files instead of disk image files --m megs set virtual RAM size to megs MB [default=128] --k language use keyboard layout (for example "fr" for French) --audio-help print list of audio drivers and their options --soundhw c1,... enable audio support - and only specified sound cards (comma separated list) - use -soundhw ? to get the list of supported cards - use -soundhw all to enable all of them --usb enable the USB driver (will be the default soon) --usbdevice name add the host or guest USB device 'name' --name string set the name of the guest --uuid %08x-%04x-%04x-%04x-%012x - specify machine UUID - -Display options: --nographic disable graphical output and redirect serial I/Os to console --curses use a curses/ncurses interface instead of SDL --no-frame open SDL window without a frame and window decorations --alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt) --no-quit disable SDL window close capability --sdl enable SDL --portrait rotate graphical output 90 deg left (only PXA LCD) --vga [std|cirrus|vmware|none] - select video card type --full-screen start in full screen --vnc display start a VNC server on display - -Network options: --net nic[,vlan=n][,macaddr=addr][,model=type][,name=str] - create a new Network Interface Card and connect it to VLAN 'n' --net user[,vlan=n][,name=str][,hostname=host] - connect the user mode network stack to VLAN 'n' and send - hostname 'host' to DHCP clients --net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile] - connect the host TAP network interface to VLAN 'n' and use the - network scripts 'file' (default=/etc/qemu-ifup) - and 'dfile' (default=/etc/qemu-ifdown); - use '[down]script=no' to disable script execution; - use 'fd=h' to connect to an already opened TAP interface --net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port] - connect the vlan 'n' to another VLAN using a socket connection --net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port] - connect the vlan 'n' to multicast maddr and port --net none use it alone to have zero network devices; if no -net option - is provided, the default is '-net nic -net user' --tftp dir allow tftp access to files in dir [-net user] --bootp file advertise file in BOOTP replies --smb dir allow SMB access to files in 'dir' [-net user] --redir [tcp|udp]:host-port:[guest-host]:guest-port - redirect TCP or UDP connections from host to guest [-net user] - --bt hci,null dumb bluetooth HCI - doesn't respond to commands --bt hci,host[:id] - use host's HCI with the given name --bt hci[,vlan=n] - emulate a standard HCI in virtual scatternet 'n' --bt vhci[,vlan=n] - add host computer to virtual scatternet 'n' using VHCI --bt device:dev[,vlan=n] - emulate a bluetooth device 'dev' in scatternet 'n' - - -i386 target only: --win2k-hack use it when installing Windows 2000 to avoid a disk full bug --rtc-td-hack use it to fix time drift in Windows ACPI HAL --no-fd-bootchk disable boot signature checking for floppy disks --no-acpi disable ACPI --no-hpet disable HPET --acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,data=file1[:file2]...] - ACPI table description -Linux boot specific: --kernel bzImage use 'bzImage' as kernel image --append cmdline use 'cmdline' as kernel command line --initrd file use 'file' as initial ram disk - -Debug/Expert options: --serial dev redirect the serial port to char device 'dev' --parallel dev redirect the parallel port to char device 'dev' --monitor dev redirect the monitor to char device 'dev' --pidfile file write PID to 'file' --S freeze CPU at startup (use 'c' to start execution) --s wait gdb connection to port --p port set gdb connection port [default=1234] --d item1,... output log to /tmp/qemu.log (use -d ? for a list of log items) --hdachs c,h,s[,t] - force hard disk 0 physical geometry and the optional BIOS - translation (t=none or lba) (usually qemu can guess them) --L path set the directory for the BIOS, VGA BIOS and keymaps --bios file set the filename for the BIOS --kernel-kqemu enable KQEMU full virtualization (default is user mode only) --no-kqemu disable KQEMU kernel module usage --enable-kvm enable KVM full virtualization support --no-reboot exit instead of rebooting --no-shutdown stop before shutdown --loadvm [tag|id] - start right away with a saved state (loadvm in monitor) --daemonize daemonize QEMU after initializing --option-rom rom load a file, rom, into the option ROM space --clock force the use of the given methods for timer alarm. - To see what timers are available use -clock ? --localtime set the real time clock to local time [default=utc] --startdate select initial date of the clock --icount [N|auto] - enable virtual instruction counter with 2^N clock ticks per instruction --echr chr set terminal escape character instead of ctrl-a --virtioconsole c - set virtio console --show-cursor show cursor --tb-size n set TB size --incoming p prepare for incoming migration, listen on port p --chroot dir Chroot to dir just before starting the VM. --runas user Change to user id user just before starting the VM. - -During emulation, the following keys are useful: -ctrl-alt-f toggle full screen -ctrl-alt-n switch to virtual console 'n' -ctrl-alt toggle mouse and keyboard grab - -When using -nographic, press 'ctrl-a h' to get some help. diff --git a/tests/qemuhelpdata/qemu-0.9.1 b/tests/qemuhelpdata/qemu-0.9.1 deleted file mode 100644 index 0eaeaec..0000000 --- a/tests/qemuhelpdata/qemu-0.9.1 +++ /dev/null @@ -1,102 +0,0 @@ -QEMU PC emulator version 0.9.1, Copyright (c) 2003-2008 Fabrice Bellard -usage: qemu [options] [disk_image] - -'disk_image' is a raw hard image image for IDE hard disk 0 - -Standard options: --M machine select emulated machine (-M ? for list) --cpu cpu select CPU (-cpu ? for list) --fda/-fdb file use 'file' as floppy disk 0/1 image --hda/-hdb file use 'file' as IDE hard disk 0/1 image --hdc/-hdd file use 'file' as IDE hard disk 2/3 image --cdrom file use 'file' as IDE cdrom image (cdrom is ide1 master) --drive [file=file][,if=type][,bus=n][,unit=m][,media=d][index=i] - [,cyls=c,heads=h,secs=s[,trans=t]][snapshot=on|off] [,cache=on|off] - use 'file' as a drive image --mtdblock file use 'file' as on-board Flash memory image --sd file use 'file' as SecureDigital card image --pflash file use 'file' as a parallel flash image --boot [a|c|d|n] boot on floppy (a), hard disk (c), CD-ROM (d), or network (n) --snapshot write to temporary files instead of disk image files --no-frame open SDL window without a frame and window decorations --alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt) --no-quit disable SDL window close capability --no-fd-bootchk disable boot signature checking for floppy disks --m megs set virtual RAM size to megs MB [default=128] --smp n set the number of CPUs to 'n' [default=1] --nographic disable graphical output and redirect serial I/Os to console --portrait rotate graphical output 90 deg left (only PXA LCD) --k language use keyboard layout (for example "fr" for French) --audio-help print list of audio drivers and their options --soundhw c1,... enable audio support - and only specified sound cards (comma separated list) - use -soundhw ? to get the list of supported cards - use -soundhw all to enable all of them --localtime set the real time clock to local time [default=utc] --full-screen start in full screen --win2k-hack use it when installing Windows 2000 to avoid a disk full bug --usb enable the USB driver (will be the default soon) --usbdevice name add the host or guest USB device 'name' --name string set the name of the guest - -Network options: --net nic[,vlan=n][,macaddr=addr][,model=type] - create a new Network Interface Card and connect it to VLAN 'n' --net user[,vlan=n][,hostname=host] - connect the user mode network stack to VLAN 'n' and send - hostname 'host' to DHCP clients --net tap[,vlan=n][,fd=h][,ifname=name][,script=file][,downscript=dfile] - connect the host TAP network interface to VLAN 'n' and use the - network scripts 'file' (default=/etc/qemu-ifup) - and 'dfile' (default=/etc/qemu-ifdown); - use '[down]script=no' to disable script execution; - use 'fd=h' to connect to an already opened TAP interface --net socket[,vlan=n][,fd=h][,listen=[host]:port][,connect=host:port] - connect the vlan 'n' to another VLAN using a socket connection --net socket[,vlan=n][,fd=h][,mcast=maddr:port] - connect the vlan 'n' to multicast maddr and port --net none use it alone to have zero network devices; if no -net option - is provided, the default is '-net nic -net user' - --tftp dir allow tftp access to files in dir [-net user] --bootp file advertise file in BOOTP replies --smb dir allow SMB access to files in 'dir' [-net user] --redir [tcp|udp]:host-port:[guest-host]:guest-port - redirect TCP or UDP connections from host to guest [-net user] - -Linux boot specific: --kernel bzImage use 'bzImage' as kernel image --append cmdline use 'cmdline' as kernel command line --initrd file use 'file' as initial ram disk - -Debug/Expert options: --monitor dev redirect the monitor to char device 'dev' --serial dev redirect the serial port to char device 'dev' --parallel dev redirect the parallel port to char device 'dev' --pidfile file Write PID to 'file' --S freeze CPU at startup (use 'c' to start execution) --s wait gdb connection to port --p port set gdb connection port [default=1234] --d item1,... output log to /tmp/qemu.log (use -d ? for a list of log items) --hdachs c,h,s[,t] force hard disk 0 physical geometry and the optional BIOS - translation (t=none or lba) (usually qemu can guess them) --L path set the directory for the BIOS, VGA BIOS and keymaps --kernel-kqemu enable KQEMU full virtualization (default is user mode only) --no-kqemu disable KQEMU kernel module usage --std-vga simulate a standard VGA card with VESA Bochs Extensions - (default is CL-GD5446 PCI VGA) --no-acpi disable ACPI --no-reboot exit instead of rebooting --loadvm file start right away with a saved state (loadvm in monitor) --vnc display start a VNC server on display --daemonize daemonize QEMU after initializing --option-rom rom load a file, rom, into the option ROM space --clock force the use of the given methods for timer alarm. - To see what timers are available use -clock help - -During emulation, the following keys are useful: -ctrl-alt-f toggle full screen -ctrl-alt-n switch to virtual console 'n' -ctrl-alt toggle mouse and keyboard grab - -When using -nographic, press 'ctrl-a h' to get some help. diff --git a/tests/qemuhelpdata/qemu-kvm-0.10.5 b/tests/qemuhelpdata/qemu-kvm-0.10.5 deleted file mode 100644 index 29d6f83..0000000 --- a/tests/qemuhelpdata/qemu-kvm-0.10.5 +++ /dev/null @@ -1,155 +0,0 @@ -QEMU PC emulator version 0.10.5 (qemu-kvm-0.10.5), Copyright (c) 2003-2008 Fabrice Bellard -usage: qemu [options] [disk_image] - -'disk_image' is a raw hard image image for IDE hard disk 0 - -Standard options: --h or -help display this help and exit --M machine select emulated machine (-M ? for list) --cpu cpu select CPU (-cpu ? for list) --smp n set the number of CPUs to 'n' [default=1] --fda/-fdb file use 'file' as floppy disk 0/1 image --hda/-hdb file use 'file' as IDE hard disk 0/1 image --hdc/-hdd file use 'file' as IDE hard disk 2/3 image --cdrom file use 'file' as IDE cdrom image (cdrom is ide1 master) --drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i] - [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off] - [,cache=writethrough|writeback|none][,format=f][,serial=s] - [,boot=on|off] - use 'file' as a drive image --mtdblock file use 'file' as on-board Flash memory image --sd file use 'file' as SecureDigital card image --pflash file use 'file' as a parallel flash image --boot [a|c|d|n] boot on floppy (a), hard disk (c), CD-ROM (d), or network (n) --snapshot write to temporary files instead of disk image files --m megs set virtual RAM size to megs MB [default=128] --k language use keyboard layout (for example "fr" for French) --audio-help print list of audio drivers and their options --soundhw c1,... enable audio support - and only specified sound cards (comma separated list) - use -soundhw ? to get the list of supported cards - use -soundhw all to enable all of them --usb enable the USB driver (will be the default soon) --usbdevice name add the host or guest USB device 'name' --name string set the name of the guest --uuid %08x-%04x-%04x-%04x-%012x - specify machine UUID - -Display options: --nographic disable graphical output and redirect serial I/Os to console --no-frame open SDL window without a frame and window decorations --alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt) --no-quit disable SDL window close capability --sdl enable SDL --portrait rotate graphical output 90 deg left (only PXA LCD) --vga [std|cirrus|vmware|none] - select video card type --full-screen start in full screen --vnc display start a VNC server on display --name string set the name of the guest --uuid %08x-%04x-%04x-%04x-%012x specify machine UUID - -Network options: --net nic[,vlan=n][,macaddr=addr][,model=type][,name=str] - create a new Network Interface Card and connect it to VLAN 'n' --net user[,vlan=n][,name=str][,hostname=host] - connect the user mode network stack to VLAN 'n' and send - hostname 'host' to DHCP clients --net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile] - connect the host TAP network interface to VLAN 'n' and use the - network scripts 'file' (default=/etc/qemu-ifup) - and 'dfile' (default=/etc/qemu-ifdown); - use '[down]script=no' to disable script execution; - use 'fd=h' to connect to an already opened TAP interface --net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port] - connect the vlan 'n' to another VLAN using a socket connection --net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port] - connect the vlan 'n' to multicast maddr and port --net none use it alone to have zero network devices; if no -net option - is provided, the default is '-net nic -net user' --tftp dir allow tftp access to files in dir [-net user] --bootp file advertise file in BOOTP replies --smb dir allow SMB access to files in 'dir' [-net user] --redir [tcp|udp]:host-port:[guest-host]:guest-port - redirect TCP or UDP connections from host to guest [-net user] - --bt hci,null dumb bluetooth HCI - doesn't respond to commands --bt hci,host[:id] - use host's HCI with the given name --bt hci[,vlan=n] - emulate a standard HCI in virtual scatternet 'n' --bt vhci[,vlan=n] - add host computer to virtual scatternet 'n' using VHCI --bt device:dev[,vlan=n] - emulate a bluetooth device 'dev' in scatternet 'n' - - -i386 target only: --win2k-hack use it when installing Windows 2000 to avoid a disk full bug --rtc-td-hack use it to fix time drift in Windows ACPI HAL --no-fd-bootchk disable boot signature checking for floppy disks --no-acpi disable ACPI --no-hpet disable HPET --acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,data=file1[:file2]...] - ACPI table description -Linux boot specific: --kernel bzImage use 'bzImage' as kernel image --append cmdline use 'cmdline' as kernel command line --initrd file use 'file' as initial ram disk - -Debug/Expert options: --serial dev redirect the serial port to char device 'dev' --parallel dev redirect the parallel port to char device 'dev' --monitor dev redirect the monitor to char device 'dev' --pidfile file write PID to 'file' --S freeze CPU at startup (use 'c' to start execution) --s wait gdb connection to port --p port set gdb connection port [default=1234] --d item1,... output log to /tmp/qemu.log (use -d ? for a list of log items) --hdachs c,h,s[,t] - force hard disk 0 physical geometry and the optional BIOS - translation (t=none or lba) (usually qemu can guess them) --L path set the directory for the BIOS, VGA BIOS and keymaps --bios file set the filename for the BIOS --no-kvm disable KVM hardware virtualization --no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC --no-kvm-pit disable KVM kernel mode PIT --no-kvm-pit-reinjection disable KVM kernel mode PIT interrupt reinjection --enable-nesting enable support for running a VM inside the VM (AMD only) --pcidevice host=bus:dev.func[,dma=none][,name=string] - expose a PCI device to the guest OS. - dma=none: don't perform any dma translations (default is to use an iommu) - 'string' is used in log output. --no-reboot exit instead of rebooting --no-shutdown stop before shutdown --loadvm [tag|id] - start right away with a saved state (loadvm in monitor) --daemonize daemonize QEMU after initializing --tdf inject timer interrupts that got lost --kvm-shadow-memory megs set the amount of shadow pages to be allocated --mem-path set the path to hugetlbfs/tmpfs mounted directory, also - enables allocation of guest memory with huge pages --mem-prealloc toggles preallocation of -mem-path backed physical memory - at startup. Default is enabled. --option-rom rom load a file, rom, into the option ROM space --clock force the use of the given methods for timer alarm. - To see what timers are available use -clock ? --localtime set the real time clock to local time [default=utc] --startdate select initial date of the clock --icount [N|auto] - enable virtual instruction counter with 2^N clock ticks per instruction --echr chr set terminal escape character instead of ctrl-a --virtioconsole c - set virtio console --show-cursor show cursor --tb-size n set TB size --incoming p prepare for incoming migration, listen on port p --chroot dir Chroot to dir just before starting the VM. --runas user Change to user id user just before starting the VM. - -During emulation, the following keys are useful: -ctrl-alt-f toggle full screen -ctrl-alt-n switch to virtual console 'n' -ctrl-alt toggle mouse and keyboard grab - -When using -nographic, press 'ctrl-a h' to get some help. diff --git a/tests/qemuhelpdata/qemu-kvm-0.11.0-rc2 b/tests/qemuhelpdata/qemu-kvm-0.11.0-rc2 deleted file mode 100644 index 0eb0b76..0000000 --- a/tests/qemuhelpdata/qemu-kvm-0.11.0-rc2 +++ /dev/null @@ -1,177 +0,0 @@ -QEMU PC emulator version 0.10.92 (qemu-kvm-0.11.0-rc2), Copyright (c) 2003-2008 Fabrice Bellard -usage: qemu [options] [disk_image] - -'disk_image' is a raw hard image image for IDE hard disk 0 - -Standard options: --h or -help display this help and exit --version display version information and exit --M machine select emulated machine (-M ? for list) --cpu cpu select CPU (-cpu ? for list) --smp n set the number of CPUs to 'n' [default=1] --numa node[,mem=size][,cpus=cpu[-cpu]][,nodeid=node] --fda/-fdb file use 'file' as floppy disk 0/1 image --hda/-hdb file use 'file' as IDE hard disk 0/1 image --hdc/-hdd file use 'file' as IDE hard disk 2/3 image --cdrom file use 'file' as IDE cdrom image (cdrom is ide1 master) --drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i] - [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off] - [,cache=writethrough|writeback|none][,format=f][,serial=s] - [,addr=A] - [,boot=on|off] - use 'file' as a drive image --mtdblock file use 'file' as on-board Flash memory image --sd file use 'file' as SecureDigital card image --pflash file use 'file' as a parallel flash image --boot [order=drives][,once=drives][,menu=on|off] - 'drives': floppy (a), hard disk (c), CD-ROM (d), network (n) --snapshot write to temporary files instead of disk image files --m megs set virtual RAM size to megs MB [default=128] --k language use keyboard layout (for example 'fr' for French) --audio-help print list of audio drivers and their options --soundhw c1,... enable audio support - and only specified sound cards (comma separated list) - use -soundhw ? to get the list of supported cards - use -soundhw all to enable all of them --usb enable the USB driver (will be the default soon) --usbdevice name add the host or guest USB device 'name' --name string1[,process=string2] set the name of the guest - string1 sets the window title and string2 the process name (on Linux) --uuid %08x-%04x-%04x-%04x-%012x - specify machine UUID - -Display options: --nographic disable graphical output and redirect serial I/Os to console --curses use a curses/ncurses interface instead of SDL --no-frame open SDL window without a frame and window decorations --alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt) --no-quit disable SDL window close capability --sdl enable SDL --portrait rotate graphical output 90 deg left (only PXA LCD) --vga [std|cirrus|vmware|xenfb|none] - select video card type --full-screen start in full screen --vnc display start a VNC server on display - -i386 target only: --win2k-hack use it when installing Windows 2000 to avoid a disk full bug --rtc-td-hack use it to fix time drift in Windows ACPI HAL --no-fd-bootchk disable boot signature checking for floppy disks --no-acpi disable ACPI --no-hpet disable HPET --balloon none disable balloon device --balloon virtio[,addr=str] - enable virtio balloon device (default) --acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,data=file1[:file2]...] - ACPI table description --smbios file=binary - Load SMBIOS entry from binary file --smbios type=0[,vendor=str][,version=str][,date=str][,release=%d.%d] - Specify SMBIOS type 0 fields --smbios type=1[,manufacturer=str][,product=str][,version=str][,serial=str] - [,uuid=uuid][,sku=str][,family=str] - Specify SMBIOS type 1 fields - -Network options: --net nic[,vlan=n][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v] - create a new Network Interface Card and connect it to VLAN 'n' --net user[,vlan=n][,name=str][,net=addr[/mask]][,host=addr][,restrict=y|n] - [,hostname=host][,dhcpstart=addr][,dns=addr][,tftp=dir][,bootfile=f] - [,hostfwd=rule][,guestfwd=rule][,smb=dir[,smbserver=addr]] - connect the user mode network stack to VLAN 'n', configure its - DHCP server and enabled optional services --net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,sndbuf=nbytes] - connect the host TAP network interface to VLAN 'n' and use the - network scripts 'file' (default=/etc/qemu-ifup) - and 'dfile' (default=/etc/qemu-ifdown); - use '[down]script=no' to disable script execution; - use 'fd=h' to connect to an already opened TAP interface - use 'sndbuf=nbytes' to limit the size of the send buffer; the - default of 'sndbuf=1048576' can be disabled using 'sndbuf=0' --net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port] - connect the vlan 'n' to another VLAN using a socket connection --net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port] - connect the vlan 'n' to multicast maddr and port --net dump[,vlan=n][,file=f][,len=n] - dump traffic on vlan 'n' to file 'f' (max n bytes per packet) --net none use it alone to have zero network devices; if no -net option - is provided, the default is '-net nic -net user' - --bt hci,null dumb bluetooth HCI - doesn't respond to commands --bt hci,host[:id] - use host's HCI with the given name --bt hci[,vlan=n] - emulate a standard HCI in virtual scatternet 'n' --bt vhci[,vlan=n] - add host computer to virtual scatternet 'n' using VHCI --bt device:dev[,vlan=n] - emulate a bluetooth device 'dev' in scatternet 'n' - -Linux/Multiboot boot specific: --kernel bzImage use 'bzImage' as kernel image --append cmdline use 'cmdline' as kernel command line --initrd file use 'file' as initial ram disk - -Debug/Expert options: --serial dev redirect the serial port to char device 'dev' --parallel dev redirect the parallel port to char device 'dev' --monitor dev redirect the monitor to char device 'dev' --pidfile file write PID to 'file' --singlestep always run in singlestep mode --S freeze CPU at startup (use 'c' to start execution) --gdb dev wait for gdb connection on 'dev' --s shorthand for -gdb tcp::1234 --d item1,... output log to /tmp/qemu.log (use -d ? for a list of log items) --hdachs c,h,s[,t] - force hard disk 0 physical geometry and the optional BIOS - translation (t=none or lba) (usually qemu can guess them) --L path set the directory for the BIOS, VGA BIOS and keymaps --bios file set the filename for the BIOS --enable-kvm enable KVM full virtualization support --no-reboot exit instead of rebooting --no-shutdown stop before shutdown --loadvm [tag|id] - start right away with a saved state (loadvm in monitor) --daemonize daemonize QEMU after initializing --option-rom rom load a file, rom, into the option ROM space --clock force the use of the given methods for timer alarm. - To see what timers are available use -clock ? --localtime set the real time clock to local time [default=utc] --startdate select initial date of the clock --icount [N|auto] - enable virtual instruction counter with 2^N clock ticks per - instruction --watchdog i6300esb|ib700 - enable virtual hardware watchdog [default=none] --watchdog-action reset|shutdown|poweroff|pause|debug|none - action when watchdog fires [default=reset] --echr chr set terminal escape character instead of ctrl-a --virtioconsole c - set virtio console --show-cursor show cursor --tb-size n set TB size --incoming p prepare for incoming migration, listen on port p --chroot dir Chroot to dir just before starting the VM. --runas user Change to user id user just before starting the VM. --no-kvm disable KVM hardware virtualization --no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC --no-kvm-pit disable KVM kernel mode PIT --no-kvm-pit-reinjection disable KVM kernel mode PIT interrupt reinjection --pcidevice host=bus:dev.func[,dma=none][,name=string] - expose a PCI device to the guest OS. - dma=none: don't perform any dma translations (default is to use an iommu) - 'string' is used in log output. --enable-nesting enable support for running a VM inside the VM (AMD only) --nvram FILE provide ia64 nvram contents --tdf enable guest time drift compensation --kvm-shadow-memory MEGABYTES - allocate MEGABYTES for kvm mmu shadowing --mem-path FILE provide backing storage for guest RAM --mem-prealloc preallocate guest memory (use with -mempath) - -During emulation, the following keys are useful: -ctrl-alt-f toggle full screen -ctrl-alt-n switch to virtual console 'n' -ctrl-alt toggle mouse and keyboard grab - -When using -nographic, press 'ctrl-a h' to get some help. diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 7b78537..9f4bfea 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -151,169 +151,6 @@ mymain(void) # define DO_TEST(name, version, is_kvm, kvm_version, ...) \ DO_TEST_FULL(name, version, is_kvm, kvm_version, VIR_ERR_OK, __VA_ARGS__) - DO_TEST("qemu-0.9.1", 9001, 0, 0, - QEMU_CAPS_KQEMU, - QEMU_CAPS_VNC_COLON, - QEMU_CAPS_NO_REBOOT, - QEMU_CAPS_DRIVE, - QEMU_CAPS_NAME, - QEMU_CAPS_NO_ACPI, - QEMU_CAPS_VNC); - DO_TEST("kvm-74", 9001, 1, 74, - QEMU_CAPS_VNC_COLON, - QEMU_CAPS_NO_REBOOT, - QEMU_CAPS_DRIVE, - QEMU_CAPS_DRIVE_BOOT, - QEMU_CAPS_NAME, - QEMU_CAPS_VNET_HDR, - QEMU_CAPS_MIGRATE_KVM_STDIO, - QEMU_CAPS_KVM, - QEMU_CAPS_DRIVE_FORMAT, - QEMU_CAPS_MEM_PATH, - QEMU_CAPS_TDF, - QEMU_CAPS_NO_SHUTDOWN, - QEMU_CAPS_NO_ACPI, - QEMU_CAPS_VNC); - DO_TEST("kvm-83-rhel56", 9001, 1, 83, - QEMU_CAPS_VNC_COLON, - QEMU_CAPS_NO_REBOOT, - QEMU_CAPS_DRIVE, - QEMU_CAPS_DRIVE_BOOT, - QEMU_CAPS_NAME, - QEMU_CAPS_UUID, - QEMU_CAPS_VNET_HDR, - QEMU_CAPS_MIGRATE_QEMU_TCP, - QEMU_CAPS_MIGRATE_QEMU_EXEC, - QEMU_CAPS_DRIVE_CACHE_V2, - QEMU_CAPS_DRIVE_CACHE_UNSAFE, - QEMU_CAPS_KVM, - QEMU_CAPS_DRIVE_FORMAT, - QEMU_CAPS_DRIVE_SERIAL, - QEMU_CAPS_VGA, - QEMU_CAPS_PCIDEVICE, - QEMU_CAPS_MEM_PATH, - QEMU_CAPS_BALLOON, - QEMU_CAPS_RTC_TD_HACK, - QEMU_CAPS_NO_HPET, - QEMU_CAPS_NO_KVM_PIT, - QEMU_CAPS_TDF, - QEMU_CAPS_DRIVE_READONLY, - QEMU_CAPS_SMBIOS_TYPE, - QEMU_CAPS_SPICE, - QEMU_CAPS_NO_SHUTDOWN, - QEMU_CAPS_NO_ACPI, - QEMU_CAPS_VNC); - DO_TEST("qemu-0.10.5", 10005, 0, 0, - QEMU_CAPS_KQEMU, - QEMU_CAPS_VNC_COLON, - QEMU_CAPS_NO_REBOOT, - QEMU_CAPS_DRIVE, - QEMU_CAPS_NAME, - QEMU_CAPS_UUID, - QEMU_CAPS_MIGRATE_QEMU_TCP, - QEMU_CAPS_MIGRATE_QEMU_EXEC, - QEMU_CAPS_DRIVE_CACHE_V2, - QEMU_CAPS_DRIVE_FORMAT, - QEMU_CAPS_DRIVE_SERIAL, - QEMU_CAPS_VGA, - QEMU_CAPS_0_10, - QEMU_CAPS_ENABLE_KVM, - QEMU_CAPS_SDL, - QEMU_CAPS_RTC_TD_HACK, - QEMU_CAPS_NO_HPET, - QEMU_CAPS_VGA_NONE, - QEMU_CAPS_NO_SHUTDOWN, - QEMU_CAPS_NO_ACPI, - QEMU_CAPS_VNC); - DO_TEST("qemu-kvm-0.10.5", 10005, 1, 0, - QEMU_CAPS_VNC_COLON, - QEMU_CAPS_NO_REBOOT, - QEMU_CAPS_DRIVE, - QEMU_CAPS_DRIVE_BOOT, - QEMU_CAPS_NAME, - QEMU_CAPS_UUID, - QEMU_CAPS_VNET_HDR, - QEMU_CAPS_MIGRATE_QEMU_TCP, - QEMU_CAPS_MIGRATE_QEMU_EXEC, - QEMU_CAPS_DRIVE_CACHE_V2, - QEMU_CAPS_KVM, - QEMU_CAPS_DRIVE_FORMAT, - QEMU_CAPS_DRIVE_SERIAL, - QEMU_CAPS_VGA, - QEMU_CAPS_0_10, - QEMU_CAPS_PCIDEVICE, - QEMU_CAPS_MEM_PATH, - QEMU_CAPS_SDL, - QEMU_CAPS_RTC_TD_HACK, - QEMU_CAPS_NO_HPET, - QEMU_CAPS_NO_KVM_PIT, - QEMU_CAPS_TDF, - QEMU_CAPS_NESTING, - QEMU_CAPS_VGA_NONE, - QEMU_CAPS_NO_SHUTDOWN, - QEMU_CAPS_NO_ACPI, - QEMU_CAPS_VNC); - DO_TEST("kvm-86", 10050, 1, 0, - QEMU_CAPS_VNC_COLON, - QEMU_CAPS_NO_REBOOT, - QEMU_CAPS_DRIVE, - QEMU_CAPS_DRIVE_BOOT, - QEMU_CAPS_NAME, - QEMU_CAPS_UUID, - QEMU_CAPS_VNET_HDR, - QEMU_CAPS_MIGRATE_QEMU_TCP, - QEMU_CAPS_MIGRATE_QEMU_EXEC, - QEMU_CAPS_DRIVE_CACHE_V2, - QEMU_CAPS_KVM, - QEMU_CAPS_DRIVE_FORMAT, - QEMU_CAPS_DRIVE_SERIAL, - QEMU_CAPS_VGA, - QEMU_CAPS_0_10, - QEMU_CAPS_PCIDEVICE, - QEMU_CAPS_SDL, - QEMU_CAPS_RTC_TD_HACK, - QEMU_CAPS_NO_HPET, - QEMU_CAPS_NO_KVM_PIT, - QEMU_CAPS_TDF, - QEMU_CAPS_NESTING, - QEMU_CAPS_SMBIOS_TYPE, - QEMU_CAPS_VGA_NONE, - QEMU_CAPS_NO_SHUTDOWN, - QEMU_CAPS_NO_ACPI, - QEMU_CAPS_VNC); - DO_TEST("qemu-kvm-0.11.0-rc2", 10092, 1, 0, - QEMU_CAPS_VNC_COLON, - QEMU_CAPS_NO_REBOOT, - QEMU_CAPS_DRIVE, - QEMU_CAPS_DRIVE_BOOT, - QEMU_CAPS_NAME, - QEMU_CAPS_UUID, - QEMU_CAPS_VNET_HDR, - QEMU_CAPS_MIGRATE_QEMU_TCP, - QEMU_CAPS_MIGRATE_QEMU_EXEC, - QEMU_CAPS_DRIVE_CACHE_V2, - QEMU_CAPS_KVM, - QEMU_CAPS_DRIVE_FORMAT, - QEMU_CAPS_DRIVE_SERIAL, - QEMU_CAPS_VGA, - QEMU_CAPS_0_10, - QEMU_CAPS_PCIDEVICE, - QEMU_CAPS_MEM_PATH, - QEMU_CAPS_ENABLE_KVM, - QEMU_CAPS_BALLOON, - QEMU_CAPS_SDL, - QEMU_CAPS_RTC_TD_HACK, - QEMU_CAPS_NO_HPET, - QEMU_CAPS_NO_KVM_PIT, - QEMU_CAPS_TDF, - QEMU_CAPS_BOOT_MENU, - QEMU_CAPS_NESTING, - QEMU_CAPS_NAME_PROCESS, - QEMU_CAPS_SMBIOS_TYPE, - QEMU_CAPS_VGA_NONE, - QEMU_CAPS_NO_SHUTDOWN, - QEMU_CAPS_NO_ACPI, - QEMU_CAPS_VNC); DO_TEST("qemu-0.12.1", 12001, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, -- 2.5.0

On 11/09/2015 09:24 AM, Daniel P. Berrange wrote: Question for the entire series: anywhere that libvirt 1.2.21 has a capability set, and a running domain, the XML for that domain tracks the capability name; if we then upgrade to libvirt 1.3.0 that does not even track the capability, won't trying to parse the XML will throw up its hands about an unknown capability? Do we need to revisit how we are handling deletion of capabilities to make sure it does not interfere with libvirtd upgrades while managing a running domain? -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On Wed, Nov 11, 2015 at 08:11:16AM +0100, Jiri Denemark wrote: Yeah, that's exactly why I didn't delete any of the capability flags from the enum, just renamed the constant to show it shouldn't be used in the code. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

As of QEMU 0.11.0 the 'info chardev' monitor command can be used to report on allocated chardev paths, so we can drop support for parsing QEMU stderr to locate the PTY paths. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/qemu/qemu_process.c | 204 +----------------------------------------------- 1 file changed, 3 insertions(+), 201 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 524072c..69a0f97 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -52,7 +52,6 @@ #include "virhook.h" #include "virfile.h" #include "virpidfile.h" -#include "c-ctype.h" #include "nodeinfo.h" #include "domain_audit.h" #include "domain_nwfilter.h" @@ -1675,76 +1674,6 @@ qemuProcessReadLog(int fd, char *buf, int buflen, int off, bool skipchar) return off; } -typedef int qemuProcessLogHandleOutput(virDomainObjPtr vm, - const char *output, - int fd); - -/* - * Returns -1 for error, 0 on success - */ -static int -qemuProcessReadLogOutput(virDomainObjPtr vm, - int fd, - char *buf, - size_t buflen, - qemuProcessLogHandleOutput func, - const char *what, - int timeout) -{ - int retries = (timeout*10); - int got = 0; - int ret = -1; - - buf[0] = '\0'; - - while (retries) { - ssize_t func_ret; - bool isdead; - - func_ret = func(vm, buf, fd); - - isdead = kill(vm->pid, 0) == -1 && errno == ESRCH; - - got = qemuProcessReadLog(fd, buf, buflen, got, false); - if (got < 0) { - virReportSystemError(errno, - _("Failure while reading %s log output"), - what); - goto cleanup; - } - - if (got == buflen-1) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Out of space while reading %s log output: %s"), - what, buf); - goto cleanup; - } - - if (isdead) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Process exited while reading %s log output: %s"), - what, buf); - goto cleanup; - } - - if (func_ret <= 0) { - ret = func_ret; - goto cleanup; - } - - usleep(100*1000); - retries--; - } - - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Timed out while reading %s log output: %s"), - what, buf); - - cleanup: - return ret; -} - - /* * Read domain log and probably overwrite error if there's one in * the domain log file. This function exists to cover the small @@ -1809,54 +1738,6 @@ qemuProcessReadChildErrors(virQEMUDriverPtr driver, } -/* - * Look at a chunk of data from the QEMU stdout logs and try to - * find a TTY device, as indicated by a line like - * - * char device redirected to /dev/pts/3 - * - * Returns -1 for error, 0 success, 1 continue reading - */ -static int -qemuProcessExtractTTYPath(const char *haystack, - size_t *offset, - char **path) -{ - static const char needle[] = "char device redirected to"; - char *tmp, *dev; - - VIR_FREE(*path); - /* First look for our magic string */ - if (!(tmp = strstr(haystack + *offset, needle))) - return 1; - tmp += sizeof(needle); - dev = tmp; - - /* - * And look for first whitespace character and nul terminate - * to mark end of the pty path - */ - while (*tmp) { - if (c_isspace(*tmp)) { - if (VIR_STRNDUP(*path, dev, tmp - dev) < 0) - return -1; - - /* ... now further update offset till we get EOL */ - *offset = tmp - haystack; - return 0; - } - tmp++; - } - - /* - * We found a path, but didn't find any whitespace, - * so it must be still incomplete - we should at - * least see a \n - indicate that we want to carry - * on trying again - */ - return 1; -} - static int qemuProcessLookupPTYs(virDomainDefPtr def, virQEMUCapsPtr qemuCaps, @@ -1954,72 +1835,6 @@ qemuProcessFindCharDevicePTYsMonitor(virDomainObjPtr vm, return 0; } -static int -qemuProcessFindCharDevicePTYs(virDomainObjPtr vm, - const char *output, - int fd ATTRIBUTE_UNUSED) -{ - size_t offset = 0; - int ret; - size_t i; - - /* The order in which QEMU prints out the PTY paths is - the order in which it procsses its serial and parallel - device args. This code must match that ordering.... */ - - /* first comes the serial devices */ - for (i = 0; i < vm->def->nserials; i++) { - virDomainChrDefPtr chr = vm->def->serials[i]; - if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { - if ((ret = qemuProcessExtractTTYPath(output, &offset, - &chr->source.data.file.path)) != 0) - return ret; - } - } - - /* then the parallel devices */ - for (i = 0; i < vm->def->nparallels; i++) { - virDomainChrDefPtr chr = vm->def->parallels[i]; - if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { - if ((ret = qemuProcessExtractTTYPath(output, &offset, - &chr->source.data.file.path)) != 0) - return ret; - } - } - - /* then the channel devices */ - for (i = 0; i < vm->def->nchannels; i++) { - virDomainChrDefPtr chr = vm->def->channels[i]; - if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { - if ((ret = qemuProcessExtractTTYPath(output, &offset, - &chr->source.data.file.path)) != 0) - return ret; - } - } - - for (i = 0; i < vm->def->nconsoles; i++) { - virDomainChrDefPtr chr = vm->def->consoles[i]; - /* For historical reasons, console[0] can be just an alias - * for serial[0]; That's why we need to update it as well */ - if (i == 0 && vm->def->nserials && - chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE && - chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL) { - if ((ret = virDomainChrSourceDefCopy(&chr->source, - &((vm->def->serials[0])->source))) != 0) - return ret; - } else { - if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY && - chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO) { - if ((ret = qemuProcessExtractTTYPath(output, &offset, - &chr->source.data.file.path)) != 0) - return ret; - } - } - } - - return 0; -} - static int qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr driver, @@ -2140,15 +1955,6 @@ qemuProcessWaitForMonitor(virQEMUDriverPtr driver, (logfd = qemuDomainOpenLog(driver, vm, pos)) < 0) return -1; - if (logfd != -1 && !virQEMUCapsUsedQMP(qemuCaps)) { - if (VIR_ALLOC_N(buf, buf_size) < 0) - goto closelog; - - if (qemuProcessReadLogOutput(vm, logfd, buf, buf_size, - qemuProcessFindCharDevicePTYs, - "console", 30) < 0) - goto closelog; - } VIR_DEBUG("Connect monitor to %p '%s'", vm, vm->def->name); if (qemuConnectMonitor(driver, vm, asyncJob, logfd) < 0) @@ -2180,20 +1986,16 @@ qemuProcessWaitForMonitor(virQEMUDriverPtr driver, virHashFree(info); if (pos != -1 && kill(vm->pid, 0) == -1 && errno == ESRCH) { - int len; /* VM is dead, any other error raised in the interim is probably * not as important as the qemu cmdline output */ - if (virQEMUCapsUsedQMP(qemuCaps)) { - if (VIR_ALLOC_N(buf, buf_size) < 0) - goto closelog; - } + if (VIR_ALLOC_N(buf, buf_size) < 0) + goto closelog; - len = strlen(buf); /* best effort seek - we need to reset to the original position, so that * a possible read of the fd in the monitor code doesn't influence this * error delivery option */ ignore_value(lseek(logfd, pos, SEEK_SET)); - qemuProcessReadLog(logfd, buf + len, buf_size - len - 1, 0, true); + qemuProcessReadLog(logfd, buf, buf_size - 1, 0, true); virReportError(VIR_ERR_INTERNAL_ERROR, _("process exited while connecting to monitor: %s"), buf); -- 2.5.0

The -no-reboot arg was added in QEMU 0.9.0, so the QEMU driver can now assume it is always present. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 3 --- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 16 +++++++--------- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 - tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 - tests/qemucaps2xmldata/all_1.6.0-1.caps | 1 - tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps | 1 - tests/qemuhelptest.c | 8 -------- tests/qemuxml2argvtest.c | 1 - tests/qemuxml2xmltest.c | 1 - tests/qemuxmlnstest.c | 1 - 16 files changed, 8 insertions(+), 33 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 55c310c..79d1692 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1093,8 +1093,6 @@ virQEMUCapsComputeCmdFlags(const char *help, virQEMUCapsSet(qemuCaps, QEMU_CAPS_KVM); if (strstr(help, "-enable-kvm")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_ENABLE_KVM); - if (strstr(help, "-no-reboot")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_REBOOT); if (strstr(help, "-name")) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_NAME); if (strstr(help, ",process=")) @@ -3216,7 +3214,6 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_REBOOT); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NAME); virQEMUCapsSet(qemuCaps, QEMU_CAPS_UUID); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index af30759..5b241b4 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -48,7 +48,7 @@ typedef enum { /* 0 */ X_QEMU_CAPS_KQEMU, /* Whether KQEMU is compiled in */ X_QEMU_CAPS_VNC_COLON, /* VNC takes or address + display */ - QEMU_CAPS_NO_REBOOT, /* Is the -no-reboot flag available */ + X_QEMU_CAPS_NO_REBOOT, /* Is the -no-reboot flag available */ QEMU_CAPS_DRIVE, /* Is the new -drive arg available */ QEMU_CAPS_DRIVE_BOOT, /* Does -drive support boot=on */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 25c7b78..15904a2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9774,15 +9774,13 @@ qemuBuildCommandLine(virConnectPtr conn, } } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_REBOOT)) { - /* Only add -no-reboot option if each event destroys domain */ - if (def->onReboot == VIR_DOMAIN_LIFECYCLE_DESTROY && - def->onPoweroff == VIR_DOMAIN_LIFECYCLE_DESTROY && - (def->onCrash == VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY || - def->onCrash == VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_DESTROY)) { - allowReboot = false; - virCommandAddArg(cmd, "-no-reboot"); - } + /* Only add -no-reboot option if each event destroys domain */ + if (def->onReboot == VIR_DOMAIN_LIFECYCLE_DESTROY && + def->onPoweroff == VIR_DOMAIN_LIFECYCLE_DESTROY && + (def->onCrash == VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY || + def->onCrash == VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_DESTROY)) { + allowReboot = false; + virCommandAddArg(cmd, "-no-reboot"); } /* If JSON monitor is enabled, we can receive an event diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps index 743951b..24a03e2 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='no-reboot'/> <flag name='drive'/> <flag name='name'/> <flag name='uuid'/> diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps index a3e9b4a..88b8dbc 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='no-reboot'/> <flag name='drive'/> <flag name='name'/> <flag name='uuid'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps index e1c0354..635f2c6 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='no-reboot'/> <flag name='drive'/> <flag name='name'/> <flag name='uuid'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps index 1ba18d6..5eb73c8 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='no-reboot'/> <flag name='drive'/> <flag name='name'/> <flag name='uuid'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index 738cbae..6f84a40 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='no-reboot'/> <flag name='drive'/> <flag name='name'/> <flag name='uuid'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps index 1c01523..55ae85f 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='no-reboot'/> <flag name='drive'/> <flag name='name'/> <flag name='uuid'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps index 3bf0e6c..1fa1d20 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps +++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='no-reboot'/> <flag name='drive'/> <flag name='name'/> <flag name='uuid'/> diff --git a/tests/qemucaps2xmldata/all_1.6.0-1.caps b/tests/qemucaps2xmldata/all_1.6.0-1.caps index 7a16aa7..8d55141 100644 --- a/tests/qemucaps2xmldata/all_1.6.0-1.caps +++ b/tests/qemucaps2xmldata/all_1.6.0-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='no-reboot'/> <flag name='drive'/> <flag name='name'/> <flag name='uuid'/> diff --git a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps index 74399fc..d091776 100644 --- a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps +++ b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='no-reboot'/> <flag name='drive'/> <flag name='name'/> <flag name='uuid'/> diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 91be08d..4edf6ec 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -152,7 +152,6 @@ mymain(void) DO_TEST_FULL(name, version, is_kvm, kvm_version, VIR_ERR_OK, __VA_ARGS__) DO_TEST("qemu-0.12.1", 12001, 0, 0, - QEMU_CAPS_NO_REBOOT, QEMU_CAPS_DRIVE, QEMU_CAPS_NAME, QEMU_CAPS_UUID, @@ -187,7 +186,6 @@ mymain(void) QEMU_CAPS_CPU_HOST, QEMU_CAPS_VNC); DO_TEST("qemu-kvm-0.12.1.2-rhel60", 12001, 1, 0, - QEMU_CAPS_NO_REBOOT, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_NAME, @@ -249,7 +247,6 @@ mymain(void) QEMU_CAPS_DEVICE_E1000, QEMU_CAPS_DEVICE_VIRTIO_NET); DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0, - QEMU_CAPS_NO_REBOOT, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_NAME, @@ -291,7 +288,6 @@ mymain(void) QEMU_CAPS_CPU_HOST, QEMU_CAPS_VNC); DO_TEST("qemu-kvm-0.13.0", 13000, 1, 0, - QEMU_CAPS_NO_REBOOT, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_NAME, @@ -365,7 +361,6 @@ mymain(void) QEMU_CAPS_DEVICE_E1000, QEMU_CAPS_DEVICE_VIRTIO_NET); DO_TEST("qemu-kvm-0.12.1.2-rhel61", 12001, 1, 0, - QEMU_CAPS_NO_REBOOT, QEMU_CAPS_DRIVE, QEMU_CAPS_NAME, QEMU_CAPS_UUID, @@ -434,7 +429,6 @@ mymain(void) QEMU_CAPS_DEVICE_E1000, QEMU_CAPS_DEVICE_VIRTIO_NET); DO_TEST("qemu-kvm-0.12.1.2-rhel62-beta", 12001, 1, 0, - QEMU_CAPS_NO_REBOOT, QEMU_CAPS_DRIVE, QEMU_CAPS_NAME, QEMU_CAPS_UUID, @@ -511,7 +505,6 @@ mymain(void) QEMU_CAPS_DEVICE_E1000, QEMU_CAPS_DEVICE_VIRTIO_NET); DO_TEST("qemu-1.0", 1000000, 0, 0, - QEMU_CAPS_NO_REBOOT, QEMU_CAPS_DRIVE, QEMU_CAPS_NAME, QEMU_CAPS_UUID, @@ -603,7 +596,6 @@ mymain(void) QEMU_CAPS_DEVICE_E1000, QEMU_CAPS_DEVICE_VIRTIO_NET); DO_TEST("qemu-1.1.0", 1001000, 0, 0, - QEMU_CAPS_NO_REBOOT, QEMU_CAPS_DRIVE, QEMU_CAPS_NAME, QEMU_CAPS_UUID, diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 9c92eff..3842bc6 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -292,7 +292,6 @@ static int testCompareXMLToArgvFiles(const char *xml, monitor_chr.data.nix.listen = true; virQEMUCapsSetList(extraFlags, - QEMU_CAPS_NO_REBOOT, QEMU_CAPS_NO_ACPI, QEMU_CAPS_LAST); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 2583e67..ab72e7d 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -114,7 +114,6 @@ static const char testStatusXMLPrefix[] = " <vcpu pid='3803519'/>\n" " </vcpus>\n" " <qemuCaps>\n" -" <flag name='no-reboot'/>\n" " <flag name='drive'/>\n" " <flag name='name'/>\n" " <flag name='uuid'/>\n" diff --git a/tests/qemuxmlnstest.c b/tests/qemuxmlnstest.c index 3e1b4aa..4d83f7a 100644 --- a/tests/qemuxmlnstest.c +++ b/tests/qemuxmlnstest.c @@ -86,7 +86,6 @@ static int testCompareXMLToArgvFiles(const char *xml, goto fail; virQEMUCapsSetList(extraFlags, - QEMU_CAPS_NO_REBOOT, QEMU_CAPS_NO_ACPI, QEMU_CAPS_LAST); -- 2.5.0

The QEMU argv -> virDomainDef conversion code was not handling -drive arguments using the floppy bus. This caused them to be added as hard disks instead. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/qemu/qemu_command.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b90a6b1..df1eb89 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -12036,6 +12036,9 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, } } else if (STREQ(values[i], "scsi")) { def->bus = VIR_DOMAIN_DISK_BUS_SCSI; + } else if (STREQ(values[i], "floppy")) { + def->bus = VIR_DOMAIN_DISK_BUS_FDC; + def->device = VIR_DOMAIN_DISK_DEVICE_FLOPPY; } else if (STREQ(values[i], "virtio")) { def->bus = VIR_DOMAIN_DISK_BUS_VIRTIO; } else if (STREQ(values[i], "xen")) { @@ -12205,6 +12208,8 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, ignore_value(VIR_STRDUP(def->dst, "vda")); } else if (def->bus == VIR_DOMAIN_DISK_BUS_XEN) { ignore_value(VIR_STRDUP(def->dst, "xvda")); + } else if (def->bus == VIR_DOMAIN_DISK_BUS_FDC) { + ignore_value(VIR_STRDUP(def->dst, "fda")); } else { ignore_value(VIR_STRDUP(def->dst, "hda")); } -- 2.5.0

The -name arg was added in QEMU 0.9.1, so the QEMU driver can assume it is always available. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 8 +--- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 16 +++---- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 - tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 - tests/qemucaps2xmldata/all_1.6.0-1.caps | 1 - tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps | 1 - tests/qemuhelptest.c | 8 ---- .../qemuxml2argv-aarch64-aavmf-virtio-mmio.args | 1 + .../qemuxml2argv-aarch64-cpu-passthrough.args | 1 + .../qemuxml2argvdata/qemuxml2argv-aarch64-gic.args | 1 + .../qemuxml2argv-aarch64-gicv3.args | 1 + .../qemuxml2argv-aarch64-kvm-32-on-64.args | 1 + .../qemuxml2argv-aarch64-mmio-default-pci.args | 1 + .../qemuxml2argv-aarch64-virt-default-nic.args | 1 + .../qemuxml2argv-aarch64-virt-virtio.args | 1 + .../qemuxml2argv-aarch64-virtio-pci.args | 1 + .../qemuxml2argv-arm-vexpressa9-basic.args | 1 + .../qemuxml2argv-arm-vexpressa9-nodevs.args | 1 + .../qemuxml2argv-arm-vexpressa9-virtio.args | 1 + .../qemuxml2argv-arm-virt-virtio.args | 1 + .../qemuxml2argv-balloon-device-auto.args | 1 + .../qemuxml2argv-balloon-device-period.args | 1 + .../qemuxml2argv-balloon-device.args | 1 + .../qemuxml2argvdata/qemuxml2argv-bios-nvram.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-bios.args | 1 + .../qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 1 + .../qemuxml2argv-boot-complex-bootindex.args | 1 + .../qemuxml2argv-boot-complex.args | 1 + .../qemuxml2argv-boot-floppy-q35.args | 1 + .../qemuxml2argvdata/qemuxml2argv-boot-floppy.args | 1 + ...xml2argv-boot-menu-disable-drive-bootindex.args | 1 + .../qemuxml2argv-boot-menu-disable-drive.args | 1 + .../qemuxml2argv-boot-menu-disable.args | 1 + ...qemuxml2argv-boot-menu-enable-with-timeout.args | 1 + .../qemuxml2argv-boot-menu-enable.args | 1 + .../qemuxml2argvdata/qemuxml2argv-boot-multi.args | 1 + .../qemuxml2argv-boot-network.args | 1 + .../qemuxml2argvdata/qemuxml2argv-boot-order.args | 1 + .../qemuxml2argvdata/qemuxml2argv-boot-strict.args | 1 + .../qemuxml2argv-bootindex-floppy-q35.args | 1 + .../qemuxml2argv-channel-guestfwd.args | 1 + .../qemuxml2argv-channel-spicevmc-old.args | 1 + .../qemuxml2argv-channel-spicevmc.args | 1 + .../qemuxml2argv-channel-virtio-auto.args | 1 + .../qemuxml2argv-channel-virtio-autoadd.args | 1 + .../qemuxml2argv-channel-virtio-autoassign.args | 1 + .../qemuxml2argv-channel-virtio-default.args | 1 + .../qemuxml2argv-channel-virtio-state.args | 1 + .../qemuxml2argv-channel-virtio-unix.args | 1 + .../qemuxml2argv-channel-virtio.args | 1 + .../qemuxml2argv-clock-catchup.args | 1 + .../qemuxml2argv-clock-france.args | 1 + .../qemuxml2argv-clock-hpet-off.args | 1 + ...muxml2argv-clock-localtime-basis-localtime.args | 1 + .../qemuxml2argv-clock-localtime.args | 1 + .../qemuxml2argv-clock-timer-hyperv-rtc.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args | 1 + .../qemuxml2argv-clock-variable.args | 1 + .../qemuxml2argv-console-compat-auto.args | 1 + .../qemuxml2argv-console-compat-chardev.args | 1 + .../qemuxml2argv-console-compat.args | 1 + .../qemuxml2argv-console-sclp.args | 1 + .../qemuxml2argv-console-virtio-ccw.args | 1 + .../qemuxml2argv-console-virtio-many.args | 1 + .../qemuxml2argv-console-virtio-s390.args | 1 + .../qemuxml2argv-console-virtio.args | 1 + .../qemuxml2argv-controller-order.args | 1 + .../qemuxml2argv-cpu-Haswell-noTSX.args | 1 + .../qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args | 1 + .../qemuxml2argv-cpu-Haswell2.args | 1 + .../qemuxml2argv-cpu-Haswell3.args | 1 + .../qemuxml2argv-cpu-eoi-disabled.args | 1 + .../qemuxml2argv-cpu-eoi-enabled.args | 1 + .../qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 1 + .../qemuxml2argv-cpu-exact2-nofallback.args | 1 + .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 1 + .../qemuxml2argv-cpu-fallback.args | 1 + .../qemuxml2argv-cpu-host-kvmclock.args | 1 + .../qemuxml2argv-cpu-host-model-fallback.args | 1 + .../qemuxml2argv-cpu-host-model-vendor.args | 1 + .../qemuxml2argv-cpu-host-model.args | 1 + ...qemuxml2argv-cpu-host-passthrough-features.args | 1 + .../qemuxml2argv-cpu-host-passthrough.args | 1 + .../qemuxml2argv-cpu-kvmclock.args | 1 + .../qemuxml2argv-cpu-minimum1.args | 1 + .../qemuxml2argv-cpu-minimum2.args | 1 + .../qemuxml2argv-cpu-numa-disjoint.args | 1 + .../qemuxml2argv-cpu-numa-no-memory-element.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args | 1 + .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 1 + .../qemuxml2argv-cpu-topology1.args | 1 + .../qemuxml2argv-cpu-topology2.args | 1 + .../qemuxml2argv-cpu-topology3.args | 1 + .../qemuxml2argv-cputune-numatune.args | 1 + .../qemuxml2argv-default-kvm-host-arch.args | 1 + .../qemuxml2argv-default-qemu-host-arch.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 1 + .../qemuxml2argv-disk-blockio.args | 1 + .../qemuxml2argv-disk-cdrom-empty.args | 1 + .../qemuxml2argv-disk-cdrom-network-ftp.args | 1 + .../qemuxml2argv-disk-cdrom-network-ftps.args | 1 + .../qemuxml2argv-disk-cdrom-network-http.args | 1 + .../qemuxml2argv-disk-cdrom-network-https.args | 1 + .../qemuxml2argv-disk-cdrom-network-tftp.args | 1 + ...qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 1 + .../qemuxml2argv-disk-cdrom-tray.args | 1 + .../qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 1 + .../qemuxml2argv-disk-copy_on_read.args | 1 + .../qemuxml2argv-disk-drive-boot-cdrom.args | 1 + .../qemuxml2argv-disk-drive-boot-disk.args | 1 + .../qemuxml2argv-disk-drive-cache-directsync.args | 1 + .../qemuxml2argv-disk-drive-cache-unsafe.args | 1 + .../qemuxml2argv-disk-drive-cache-v1-none.args | 1 + .../qemuxml2argv-disk-drive-cache-v1-wb.args | 1 + .../qemuxml2argv-disk-drive-cache-v1-wt.args | 1 + .../qemuxml2argv-disk-drive-cache-v2-none.args | 1 + .../qemuxml2argv-disk-drive-cache-v2-wb.args | 1 + .../qemuxml2argv-disk-drive-cache-v2-wt.args | 1 + .../qemuxml2argv-disk-drive-copy-on-read.args | 1 + .../qemuxml2argv-disk-drive-discard.args | 1 + ...uxml2argv-disk-drive-error-policy-enospace.args | 1 + .../qemuxml2argv-disk-drive-error-policy-stop.args | 1 + ...gv-disk-drive-error-policy-wreport-rignore.args | 1 + .../qemuxml2argv-disk-drive-fat.args | 1 + .../qemuxml2argv-disk-drive-fmt-qcow.args | 1 + .../qemuxml2argv-disk-drive-network-gluster.args | 1 + ...qemuxml2argv-disk-drive-network-iscsi-auth.args | 1 + .../qemuxml2argv-disk-drive-network-iscsi-lun.args | 1 + .../qemuxml2argv-disk-drive-network-iscsi.args | 1 + ...qemuxml2argv-disk-drive-network-nbd-export.args | 1 + ...ml2argv-disk-drive-network-nbd-ipv6-export.args | 1 + .../qemuxml2argv-disk-drive-network-nbd-ipv6.args | 1 + .../qemuxml2argv-disk-drive-network-nbd-unix.args | 1 + .../qemuxml2argv-disk-drive-network-nbd.args | 1 + .../qemuxml2argv-disk-drive-network-rbd-auth.args | 1 + ...muxml2argv-disk-drive-network-rbd-ceph-env.args | 1 + .../qemuxml2argv-disk-drive-network-rbd-ipv6.args | 1 + .../qemuxml2argv-disk-drive-network-rbd.args | 1 + .../qemuxml2argv-disk-drive-network-sheepdog.args | 1 + .../qemuxml2argv-disk-drive-no-boot.args | 1 + .../qemuxml2argv-disk-drive-readonly-disk.args | 1 + ...qemuxml2argv-disk-drive-readonly-no-device.args | 1 + .../qemuxml2argv-disk-drive-shared.args | 1 + .../qemuxml2argv-disk-floppy-pseries.args | 1 + ...emuxml2argv-disk-floppy-tray-no-device-cap.args | 1 + .../qemuxml2argv-disk-floppy-tray.args | 1 + .../qemuxml2argvdata/qemuxml2argv-disk-floppy.args | 1 + .../qemuxml2argv-disk-geometry.args | 1 + .../qemuxml2argv-disk-ide-drive-split.args | 1 + .../qemuxml2argv-disk-ide-wwn.args | 1 + .../qemuxml2argv-disk-ioeventfd.args | 1 + .../qemuxml2argvdata/qemuxml2argv-disk-iscsi.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-disk-many.args | 1 + .../qemuxml2argvdata/qemuxml2argv-disk-order.args | 1 + .../qemuxml2argv-disk-sata-device.args | 1 + .../qemuxml2argv-disk-scsi-device-auto.args | 1 + .../qemuxml2argv-disk-scsi-device.args | 1 + .../qemuxml2argv-disk-scsi-disk-split.args | 1 + .../qemuxml2argv-disk-scsi-disk-vpd.args | 1 + .../qemuxml2argv-disk-scsi-disk-wwn.args | 1 + .../qemuxml2argv-disk-scsi-lun-passthrough.args | 1 + .../qemuxml2argv-disk-scsi-megasas.args | 1 + .../qemuxml2argv-disk-scsi-virtio-scsi.args | 1 + .../qemuxml2argv-disk-scsi-vscsi.args | 1 + .../qemuxml2argvdata/qemuxml2argv-disk-serial.args | 1 + .../qemuxml2argv-disk-snapshot.args | 1 + .../qemuxml2argv-disk-source-pool-mode.args | 1 + .../qemuxml2argv-disk-source-pool.args | 1 + .../qemuxml2argv-disk-usb-device-removable.args | 1 + .../qemuxml2argv-disk-usb-device.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args | 1 + .../qemuxml2argv-disk-virtio-ccw-many.args | 1 + .../qemuxml2argv-disk-virtio-ccw.args | 1 + .../qemuxml2argv-disk-virtio-s390.args | 1 + .../qemuxml2argv-disk-virtio-scsi-ccw.args | 1 + .../qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args | 1 + .../qemuxml2argv-disk-virtio-scsi-ioeventfd.args | 1 + .../qemuxml2argv-disk-virtio-scsi-max_sectors.args | 1 + .../qemuxml2argv-disk-virtio-scsi-num_queues.args | 1 + .../qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 1 + .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args | 1 + .../qemuxml2argv-eoi-disabled.args | 1 + .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-event_idx.args | 1 + .../qemuxml2argv-fips-enabled.args | 1 + .../qemuxml2argv-floppy-drive-fat.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-fs9p.args | 1 + .../qemuxml2argv-graphics-sdl-fullscreen.args | 1 + .../qemuxml2argv-graphics-sdl.args | 1 + ...emuxml2argv-graphics-spice-agent-file-xfer.args | 1 + .../qemuxml2argv-graphics-spice-agentmouse.args | 1 + .../qemuxml2argv-graphics-spice-compression.args | 1 + .../qemuxml2argv-graphics-spice-qxl-vga.args | 1 + .../qemuxml2argv-graphics-spice-sasl.args | 1 + .../qemuxml2argv-graphics-spice-timeout.args | 1 + .../qemuxml2argv-graphics-spice-usb-redir.args | 1 + .../qemuxml2argv-graphics-spice.args | 1 + .../qemuxml2argv-graphics-vnc-policy.args | 1 + .../qemuxml2argv-graphics-vnc-sasl.args | 1 + .../qemuxml2argv-graphics-vnc-socket.args | 1 + .../qemuxml2argv-graphics-vnc-tls.args | 1 + .../qemuxml2argv-graphics-vnc-websocket.args | 1 + .../qemuxml2argv-graphics-vnc.args | 1 + .../qemuxml2argv-hostdev-pci-address-device.args | 1 + .../qemuxml2argv-hostdev-pci-address.args | 1 + .../qemuxml2argv-hostdev-scsi-boot.args | 1 + .../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args | 1 + .../qemuxml2argv-hostdev-scsi-lsi-iscsi.args | 1 + .../qemuxml2argv-hostdev-scsi-lsi.args | 1 + .../qemuxml2argv-hostdev-scsi-readonly.args | 1 + ...emuxml2argv-hostdev-scsi-virtio-iscsi-auth.args | 1 + .../qemuxml2argv-hostdev-scsi-virtio-iscsi.args | 1 + .../qemuxml2argv-hostdev-scsi-virtio-scsi.args | 1 + ...muxml2argv-hostdev-usb-address-device-boot.args | 1 + .../qemuxml2argv-hostdev-usb-address-device.args | 1 + .../qemuxml2argv-hostdev-usb-address.args | 1 + .../qemuxml2argv-hostdev-vfio-multidomain.args | 1 + .../qemuxml2argv-hostdev-vfio.args | 1 + .../qemuxml2argv-hotplug-base.args | 1 + .../qemuxml2argv-hugepages-numa.args | 1 + .../qemuxml2argv-hugepages-pages.args | 1 + .../qemuxml2argv-hugepages-pages2.args | 1 + .../qemuxml2argv-hugepages-pages3.args | 1 + .../qemuxml2argv-hugepages-pages5.args | 1 + .../qemuxml2argv-hugepages-pages6.args | 1 + .../qemuxml2argv-hugepages-shared.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 1 + .../qemuxml2argvdata/qemuxml2argv-hyperv-off.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 1 + .../qemuxml2argv-input-usbmouse-addr.args | 1 + .../qemuxml2argv-input-usbmouse.args | 1 + .../qemuxml2argv-input-usbtablet.args | 1 + .../qemuxml2argv-iothreads-disk-virtio-ccw.args | 1 + .../qemuxml2argv-iothreads-disk.args | 1 + .../qemuxml2argv-iothreads-ids-partial.args | 1 + .../qemuxml2argv-iothreads-ids.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-iothreads.args | 1 + .../qemuxml2argv-kvm-features-off.args | 1 + .../qemuxml2argv-kvm-features.args | 1 + .../qemuxml2argv-kvm-pit-delay.args | 1 + .../qemuxml2argv-kvm-pit-device.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-kvm.args | 1 + .../qemuxml2argv-kvmclock+eoi-disabled.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-lease.args | 1 + .../qemuxml2argv-machine-aeskeywrap-off-argv.args | 1 + .../qemuxml2argv-machine-aeskeywrap-off-cap.args | 1 + .../qemuxml2argv-machine-aeskeywrap-off-caps.args | 1 + .../qemuxml2argv-machine-aeskeywrap-on-argv.args | 1 + .../qemuxml2argv-machine-aeskeywrap-on-cap.args | 1 + .../qemuxml2argv-machine-aeskeywrap-on-caps.args | 1 + .../qemuxml2argv-machine-aliases1.args | 1 + .../qemuxml2argv-machine-aliases2.args | 1 + .../qemuxml2argv-machine-core-off.args | 1 + .../qemuxml2argv-machine-core-on.args | 1 + .../qemuxml2argv-machine-deakeywrap-off-argv.args | 1 + .../qemuxml2argv-machine-deakeywrap-off-cap.args | 1 + .../qemuxml2argv-machine-deakeywrap-off-caps.args | 1 + .../qemuxml2argv-machine-deakeywrap-on-argv.args | 1 + .../qemuxml2argv-machine-deakeywrap-on-cap.args | 1 + .../qemuxml2argv-machine-deakeywrap-on-caps.args | 1 + .../qemuxml2argv-machine-keywrap-none-argv.args | 1 + .../qemuxml2argv-machine-keywrap-none-caps.args | 1 + .../qemuxml2argv-machine-keywrap-none.args | 1 + .../qemuxml2argv-machine-usb-opt.args | 1 + .../qemuxml2argv-machine-vmport-opt.args | 1 + .../qemuxml2argv-memory-hotplug-dimm-addr.args | 1 + .../qemuxml2argv-memory-hotplug-dimm.args | 1 + .../qemuxml2argv-memory-hotplug.args | 1 + .../qemuxml2argv-migrate-numa-unaligned.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-migrate.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args | 1 + .../qemuxml2argv-misc-disable-s3.args | 1 + .../qemuxml2argv-misc-disable-suspends.args | 1 + .../qemuxml2argv-misc-enable-s4.args | 1 + .../qemuxml2argv-misc-no-reboot.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args | 1 + .../qemuxml2argv-mlock-unsupported.args | 1 + .../qemuxml2argv-monitor-json.args | 1 + .../qemuxml2argv-multifunction-pci-device.args | 1 + .../qemuxml2argvdata/qemuxml2argv-net-client.args | 1 + .../qemuxml2argv-net-eth-ifname.args | 1 + .../qemuxml2argv-net-eth-names.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 1 + .../qemuxml2argv-net-hostdev-multidomain.args | 1 + .../qemuxml2argv-net-hostdev-vfio-multidomain.args | 1 + .../qemuxml2argv-net-hostdev-vfio.args | 1 + .../qemuxml2argvdata/qemuxml2argv-net-hostdev.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 1 + .../qemuxml2argvdata/qemuxml2argv-net-server.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-udp.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 1 + .../qemuxml2argv-net-vhostuser-multiq.args | 1 + .../qemuxml2argv-net-vhostuser.args | 1 + .../qemuxml2argv-net-virtio-ccw.args | 1 + .../qemuxml2argv-net-virtio-device.args | 1 + .../qemuxml2argv-net-virtio-disable-offloads.args | 1 + .../qemuxml2argv-net-virtio-netdev.args | 1 + .../qemuxml2argv-net-virtio-s390.args | 1 + .../qemuxml2argvdata/qemuxml2argv-net-virtio.args | 1 + .../qemuxml2argvdata/qemuxml2argv-no-shutdown.args | 1 + .../qemuxml2argv-nographics-vga.args | 1 + .../qemuxml2argvdata/qemuxml2argv-nographics.args | 1 + .../qemuxml2argv-nosharepages.args | 1 + ...qemuxml2argv-numad-auto-memory-vcpu-cpuset.args | 1 + ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 1 + ...muxml2argv-numad-auto-vcpu-static-numatune.args | 1 + ...qemuxml2argv-numad-static-memory-auto-vcpu.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-numad.args | 1 + ...qemuxml2argv-numatune-auto-nodeset-invalid.args | 1 + .../qemuxml2argv-numatune-auto-prefer.args | 1 + .../qemuxml2argv-numatune-memnode-no-memory.args | 1 + .../qemuxml2argv-numatune-memnode.args | 1 + .../qemuxml2argv-numatune-memory.args | 1 + .../qemuxml2argv-panic-no-address.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-panic.args | 1 + .../qemuxml2argv-parallel-parport-chardev.args | 1 + .../qemuxml2argv-parallel-tcp-chardev.args | 1 + .../qemuxml2argv-parallel-tcp.args | 1 + .../qemuxml2argv-pci-autoadd-addr.args | 1 + .../qemuxml2argv-pci-autoadd-idx.args | 1 + .../qemuxml2argv-pci-bridge-many-disks.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-pci-many.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args | 1 + .../qemuxml2argv-pci-serial-dev-chardev.args | 1 + .../qemuxml2argv-pcie-root-port.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args | 1 + .../qemuxml2argv-pcie-switch-downstream-port.args | 1 + .../qemuxml2argv-pcie-switch-upstream-port.args | 1 + .../qemuxml2argv-pcihole64-none.args | 1 + .../qemuxml2argv-pcihole64-q35.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args | 1 + .../qemuxml2argv-pmu-feature-off.args | 1 + .../qemuxml2argvdata/qemuxml2argv-pmu-feature.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 1 + .../qemuxml2argv-ppce500-serial.args | 1 + .../qemuxml2argv-pseries-basic.args | 1 + .../qemuxml2argv-pseries-cpu-compat.args | 1 + .../qemuxml2argv-pseries-cpu-exact.args | 1 + .../qemuxml2argv-pseries-cpu-le.args | 1 + .../qemuxml2argv-pseries-disk.args | 1 + .../qemuxml2argv-pseries-nvram.args | 1 + .../qemuxml2argv-pseries-panic-missing.args | 1 + .../qemuxml2argv-pseries-panic-no-address.args | 1 + .../qemuxml2argv-pseries-usb-default.args | 1 + .../qemuxml2argv-pseries-usb-kbd.args | 1 + .../qemuxml2argv-pseries-usb-multi.args | 1 + .../qemuxml2argv-pseries-vio-user-assigned.args | 1 + .../qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 1 + .../qemuxml2argv-pv-spinlock-disabled.args | 1 + .../qemuxml2argv-pv-spinlock-enabled.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-q35.args | 1 + .../qemuxml2argv-qemu-ns-no-env.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args | 1 + .../qemuxml2argv-reboot-timeout-disabled.args | 1 + .../qemuxml2argv-reboot-timeout-enabled.args | 1 + .../qemuxml2argvdata/qemuxml2argv-restore-v1.args | 1 + .../qemuxml2argv-restore-v2-fd.args | 1 + .../qemuxml2argvdata/qemuxml2argv-restore-v2.args | 1 + ...muxml2argv-s390-allow-bogus-usb-controller.args | 1 + .../qemuxml2argv-s390-allow-bogus-usb-none.args | 1 + .../qemuxml2argv-serial-dev-chardev-iobase.args | 1 + .../qemuxml2argv-serial-dev-chardev.args | 1 + .../qemuxml2argvdata/qemuxml2argv-serial-dev.args | 1 + .../qemuxml2argv-serial-file-chardev.args | 1 + .../qemuxml2argvdata/qemuxml2argv-serial-file.args | 1 + .../qemuxml2argv-serial-many-chardev.args | 1 + .../qemuxml2argvdata/qemuxml2argv-serial-many.args | 1 + .../qemuxml2argv-serial-pty-chardev.args | 1 + .../qemuxml2argvdata/qemuxml2argv-serial-pty.args | 1 + .../qemuxml2argv-serial-spiceport.args | 1 + .../qemuxml2argv-serial-tcp-chardev.args | 1 + .../qemuxml2argv-serial-tcp-telnet-chardev.args | 1 + .../qemuxml2argv-serial-tcp-telnet.args | 1 + .../qemuxml2argvdata/qemuxml2argv-serial-tcp.args | 1 + .../qemuxml2argv-serial-udp-chardev.args | 1 + .../qemuxml2argvdata/qemuxml2argv-serial-udp.args | 1 + .../qemuxml2argv-serial-unix-chardev.args | 1 + .../qemuxml2argvdata/qemuxml2argv-serial-unix.args | 1 + .../qemuxml2argv-serial-vc-chardev.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-shmem.args | 1 + .../qemuxml2argv-smartcard-controller.args | 1 + .../qemuxml2argv-smartcard-host-certificates.args | 1 + .../qemuxml2argv-smartcard-host.args | 1 + ...emuxml2argv-smartcard-passthrough-spicevmc.args | 1 + .../qemuxml2argv-smartcard-passthrough-tcp.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-smp.args | 1 + .../qemuxml2argv-sound-device.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-sound.args | 1 + .../qemuxml2argv-tpm-passthrough.args | 1 + .../qemuxml2argv-usb-controller.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args | 1 + .../qemuxml2argv-usb-ich9-companion.args | 1 + .../qemuxml2argv-usb-ich9-ehci-addr.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-usb-none.args | 1 + .../qemuxml2argv-usb-piix3-controller.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args | 1 + .../qemuxml2argv-usb-redir-boot.args | 1 + .../qemuxml2argv-usb-redir-filter-version.args | 1 + .../qemuxml2argv-usb-redir-filter.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args | 1 + .../qemuxml2argv-video-device-pciaddr-default.args | 1 + .../qemuxml2argv-video-qxl-device-vgamem.args | 1 + .../qemuxml2argv-video-qxl-device.args | 1 + .../qemuxml2argv-video-qxl-nodevice.args | 1 + .../qemuxml2argv-video-qxl-sec-device-vgamem.args | 1 + .../qemuxml2argv-video-qxl-sec-device.args | 1 + .../qemuxml2argv-video-vga-device-vgamem.args | 1 + .../qemuxml2argv-video-vga-device.args | 1 + .../qemuxml2argv-video-vga-nodevice.args | 1 + .../qemuxml2argvdata/qemuxml2argv-virtio-lun.args | 1 + .../qemuxml2argv-virtio-rng-ccw.args | 1 + .../qemuxml2argv-virtio-rng-default.args | 1 + .../qemuxml2argv-virtio-rng-egd.args | 1 + .../qemuxml2argv-virtio-rng-multiple.args | 1 + .../qemuxml2argv-virtio-rng-random.args | 1 + .../qemuxml2argv-watchdog-device.args | 1 + .../qemuxml2argv-watchdog-diag288.args | 1 + .../qemuxml2argv-watchdog-dump.args | 1 + .../qemuxml2argv-watchdog-injectnmi.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-watchdog.args | 1 + tests/qemuxml2argvtest.c | 54 +++++++++++----------- tests/qemuxml2xmltest.c | 1 - .../qemuxmlns-qemu-ns-commandline-ns0.args | 1 + .../qemuxmlns-qemu-ns-commandline-ns1.args | 1 + .../qemuxmlns-qemu-ns-commandline.args | 1 + .../qemuxmlns-qemu-ns-domain-commandline-ns0.args | 1 + .../qemuxmlns-qemu-ns-domain-commandline.args | 1 + .../qemuxmlns-qemu-ns-domain-ns0.args | 1 + tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args | 1 + 442 files changed, 464 insertions(+), 61 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6ba32a8..e8ba22e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1094,11 +1094,8 @@ virQEMUCapsComputeCmdFlags(const char *help, virQEMUCapsSet(qemuCaps, QEMU_CAPS_KVM); if (strstr(help, "-enable-kvm")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_ENABLE_KVM); - if (strstr(help, "-name")) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NAME); - if (strstr(help, ",process=")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NAME_PROCESS); - } + if (strstr(help, ",process=")) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_NAME_PROCESS); if (strstr(help, "-uuid")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_UUID); if (strstr(help, "-xen-domid")) @@ -3213,7 +3210,6 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NAME); virQEMUCapsSet(qemuCaps, QEMU_CAPS_UUID); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNET_HDR); virQEMUCapsSet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_TCP); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 6f314d0..f28207d 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -53,7 +53,7 @@ typedef enum { QEMU_CAPS_DRIVE_BOOT, /* Does -drive support boot=on */ /* 5 */ - QEMU_CAPS_NAME, /* Is the -name flag available */ + X_QEMU_CAPS_NAME, /* Is the -name flag available */ QEMU_CAPS_UUID, /* Is the -uuid flag available */ QEMU_CAPS_DOMID, /* Xenner: -domid flag available */ QEMU_CAPS_VNET_HDR, diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 75f7b48..e992717 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9313,15 +9313,13 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddEnvPassCommon(cmd); - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NAME)) { - virCommandAddArg(cmd, "-name"); - if (cfg->setProcessName && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_NAME_PROCESS)) { - virCommandAddArgFormat(cmd, "%s,process=qemu:%s", - def->name, def->name); - } else { - virCommandAddArg(cmd, def->name); - } + virCommandAddArg(cmd, "-name"); + if (cfg->setProcessName && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_NAME_PROCESS)) { + virCommandAddArgFormat(cmd, "%s,process=qemu:%s", + def->name, def->name); + } else { + virCommandAddArg(cmd, def->name); } if (!standalone) diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps index d639c2b..c8ac077 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='name'/> <flag name='uuid'/> <flag name='vnet-hdr'/> <flag name='migrate-qemu-tcp'/> diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps index 60e3bea..fdd7260 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='name'/> <flag name='uuid'/> <flag name='vnet-hdr'/> <flag name='migrate-qemu-tcp'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps index 98fe6f7..b57d2fb 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='name'/> <flag name='uuid'/> <flag name='vnet-hdr'/> <flag name='migrate-qemu-tcp'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps index 7df2f54..f28ab79 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='name'/> <flag name='uuid'/> <flag name='vnet-hdr'/> <flag name='migrate-qemu-tcp'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index bdb6aff..6317737 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='name'/> <flag name='uuid'/> <flag name='vnet-hdr'/> <flag name='migrate-qemu-tcp'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps index 14ea911..70da8fd 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='name'/> <flag name='uuid'/> <flag name='vnet-hdr'/> <flag name='migrate-qemu-tcp'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps index 6283efd..393c726 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps +++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='name'/> <flag name='uuid'/> <flag name='vnet-hdr'/> <flag name='migrate-qemu-tcp'/> diff --git a/tests/qemucaps2xmldata/all_1.6.0-1.caps b/tests/qemucaps2xmldata/all_1.6.0-1.caps index 95d173a..dfcdd86 100644 --- a/tests/qemucaps2xmldata/all_1.6.0-1.caps +++ b/tests/qemucaps2xmldata/all_1.6.0-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='name'/> <flag name='uuid'/> <flag name='vnet-hdr'/> <flag name='migrate-qemu-tcp'/> diff --git a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps index 18f0897..125b1c6 100644 --- a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps +++ b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='name'/> <flag name='uuid'/> <flag name='vnet-hdr'/> <flag name='migrate-qemu-tcp'/> diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 9c329c8..e3953d3 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -152,7 +152,6 @@ mymain(void) DO_TEST_FULL(name, version, is_kvm, kvm_version, VIR_ERR_OK, __VA_ARGS__) DO_TEST("qemu-0.12.1", 12001, 0, 0, - QEMU_CAPS_NAME, QEMU_CAPS_UUID, QEMU_CAPS_MIGRATE_QEMU_TCP, QEMU_CAPS_MIGRATE_QEMU_EXEC, @@ -186,7 +185,6 @@ mymain(void) QEMU_CAPS_VNC); DO_TEST("qemu-kvm-0.12.1.2-rhel60", 12001, 1, 0, QEMU_CAPS_DRIVE_BOOT, - QEMU_CAPS_NAME, QEMU_CAPS_UUID, QEMU_CAPS_VNET_HDR, QEMU_CAPS_MIGRATE_QEMU_TCP, @@ -246,7 +244,6 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_NET); DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0, QEMU_CAPS_DRIVE_BOOT, - QEMU_CAPS_NAME, QEMU_CAPS_UUID, QEMU_CAPS_VNET_HDR, QEMU_CAPS_MIGRATE_QEMU_TCP, @@ -286,7 +283,6 @@ mymain(void) QEMU_CAPS_VNC); DO_TEST("qemu-kvm-0.13.0", 13000, 1, 0, QEMU_CAPS_DRIVE_BOOT, - QEMU_CAPS_NAME, QEMU_CAPS_UUID, QEMU_CAPS_VNET_HDR, QEMU_CAPS_MIGRATE_QEMU_TCP, @@ -357,7 +353,6 @@ mymain(void) QEMU_CAPS_DEVICE_E1000, QEMU_CAPS_DEVICE_VIRTIO_NET); DO_TEST("qemu-kvm-0.12.1.2-rhel61", 12001, 1, 0, - QEMU_CAPS_NAME, QEMU_CAPS_UUID, QEMU_CAPS_VNET_HDR, QEMU_CAPS_MIGRATE_QEMU_TCP, @@ -424,7 +419,6 @@ mymain(void) QEMU_CAPS_DEVICE_E1000, QEMU_CAPS_DEVICE_VIRTIO_NET); DO_TEST("qemu-kvm-0.12.1.2-rhel62-beta", 12001, 1, 0, - QEMU_CAPS_NAME, QEMU_CAPS_UUID, QEMU_CAPS_VNET_HDR, QEMU_CAPS_MIGRATE_QEMU_TCP, @@ -499,7 +493,6 @@ mymain(void) QEMU_CAPS_DEVICE_E1000, QEMU_CAPS_DEVICE_VIRTIO_NET); DO_TEST("qemu-1.0", 1000000, 0, 0, - QEMU_CAPS_NAME, QEMU_CAPS_UUID, QEMU_CAPS_MIGRATE_QEMU_TCP, QEMU_CAPS_MIGRATE_QEMU_EXEC, @@ -589,7 +582,6 @@ mymain(void) QEMU_CAPS_DEVICE_E1000, QEMU_CAPS_DEVICE_VIRTIO_NET); DO_TEST("qemu-1.1.0", 1001000, 0, 0, - QEMU_CAPS_NAME, QEMU_CAPS_UUID, QEMU_CAPS_MIGRATE_QEMU_TCP, QEMU_CAPS_MIGRATE_QEMU_EXEC, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args index 4cc4cd2..d355a5f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ +-name aarch64test \ -S \ -M virt \ -cpu cortex-a53 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args index 6adb0ff..b868e0b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ +-name aarch64test \ -S \ -M virt \ -cpu host \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.args index 2d16c15..941342b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ +-name aarch64test \ -S \ -M virt \ -no-kvm \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.args index 48bcf3b..c5b3270 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ +-name aarch64test \ -S \ -machine virt,accel=tcg,gic-version=3 \ -cpu cortex-a53 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args index b27ae02..e04afd2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ +-name armtest \ -S \ -M virt \ -cpu host,aarch64=off \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args index 43cc290..4d41d04 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ +-name aarch64test \ -S \ -M virt \ -cpu cortex-a53 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args index 02add0b..5c3c28e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ +-name aarch64-virt-default-nic \ -S \ -M virt \ -cpu cortex-a53 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args index 8ddd3aa..dc9462b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ +-name aarch64test \ -S \ -M virt \ -cpu cortex-a53 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args index 36d461f..f002684 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ +-name aarch64test \ -S \ -M virt \ -cpu cortex-a53 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args index 85d4097..7003f0a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-arm \ +-name armtest \ -S \ -M vexpress-a9 \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args index a182f15..1164599 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-arm \ +-name armtest \ -S \ -M vexpress-a9 \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args index c2ea17b..7b4740e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-arm \ +-name armtest \ -S \ -M vexpress-a9 \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args index 818a235..ec4f2c3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-arm \ +-name armtest \ -S \ -M virt \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args index 6a7daed..bc7090f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args index 43c1d96..4635bcb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args index 43c1d96..4635bcb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args index fc02fbd..1760939 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name test-bios \ -S \ -M pc \ -drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.args b/tests/qemuxml2argvdata/qemuxml2argv-bios.args index de89365..a3dbdca 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bios.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name test-bios \ -S \ -M pc \ -bios /usr/share/seabios/bios.bin \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args index 16686c6..aaa26c0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args index d3bfe8c..2be7f10 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args index e4c60c2..5c14062 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args index c35ac7f..90aae0c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc-q35-2.4 \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args index 58613aa..958304d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args index 85a72db..abfd47b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args index 033e21c..9da5f16 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args index 8ed00c2..0455c50 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args index 8c9b379..dc23ed7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args index be059ff..d045718 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args index 6fc1a23..5145437 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args index 8f11056..09e72fc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args index a272342..0a778f1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args index 78dd818..0eabe00 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args index a96084e..4ec0432 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc-q35-2.4 \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args index 3f5c289..000c042 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args index c61f6d1..41969c8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args index 89a1133..6321840 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args index b1c22c5..1a3c750 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args index 7f48cbf..d412b9d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args index 0fca735..d7e69bd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args index 6eefe4d..b62df60 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args index 7c3a423..7188d92 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args index 533a2bd..99640b8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args index fdd7279..7acfef6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args index 59c30cb..d6d07d6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args index f4503e3..8eaa246 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args @@ -6,6 +6,7 @@ LOGNAME=test \ QEMU_AUDIO_DRV=none \ TZ=Europe/Paris \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args index 8b57b95..d1c99c6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args index 370c9f1..1f7e603 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args index c59dedf..8a8dbbc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args index 916e05d..da4d85f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/kvm \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu qemu32,hv_time \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args index 96829ad..903d23e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args index 15a9fd5..3a37458 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args index 6aec302..c1558d0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args index 9319597..49831f6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args index 6aec302..c1558d0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args b/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args index 1d3698d..5ef6884 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M s390-virtio \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args index 063bb95..715f40c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M s390-ccw \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args index 51b2d5f..fa5c92d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args index 127ae53..c0cecd9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M s390-virtio \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args index 10856dd..0c8af3a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args b/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args index 82f9e93..c6eddd1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=spice \ /usr/libexec/qemu-kvm \ +-name fdr \ -S \ -M rhel6.1.0 \ -enable-kvm \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args index 2318910..d1de725 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-kvm \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu Haswell-noTSX \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args index 9f1a090..551b3ec 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-kvm \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu Haswell \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args index d11102a..3eb4cbd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-kvm \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu Haswell,-rtm,-hle \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args index 9f1a090..551b3ec 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-kvm \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu Haswell \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args index 3d51800..5127dbb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu qemu32,-kvm_pv_eoi \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args index 590babf..6df39b9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu qemu32,+kvm_pv_eoi \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args index c90d81e..d049a77 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-kvm \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu qemu64,-svm,-lm,-nx,-syscall,-clflush,-pse36,-mca \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args index e93bbe4..d373d9d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-kvm \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu core2duo,+lahf_lm,+3dnowext,+xtpr,+ds_cpl,+tm,+ht,+ds,-nx \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args index e93bbe4..d373d9d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-kvm \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu core2duo,+lahf_lm,+3dnowext,+xtpr,+ds_cpl,+tm,+ht,+ds,-nx \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args index 5f9d12e..ae6f96f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-kvm \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu Penryn,-sse4.1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args index caaa29d..8d15d7f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -enable-kvm \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args index 8158ca1..b58a0f0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu Penryn,+xtpr,+tm2,+est,+vmx,+ds_cpl,+monitor,+pbe,+tm,+ht,+ss,+acpi,+ds,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args index f4c6bb8..156f84f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu 'core2duo,vendor=Libvirt QEMU,+lahf_lm,+xtpr,+cx16,+tm2,+est,+vmx,+ds_cpl,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args index 4b71a1c..f5a2b96 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu core2duo,+lahf_lm,+xtpr,+cx16,+tm2,+est,+vmx,+ds_cpl,+pbe,+tm,+ht,+ss,+acpi,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args index 44c27d9..ced3327 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu host,+abm,+ds,-invtsc \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args index 2f103d0..63d1356 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu host \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args index 330fe12..dc2bc2f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -enable-kvm \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args index ddb5153..4571acc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-kvm \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu core2duo,+lahf_lm,+xtpr,+cx16,+tm2,+est,+vmx,+ds_cpl,+pbe,+tm,+ht,+ss,+acpi,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args index 00e07fe..d1cc2bd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-kvm \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu core2duo,+lahf_lm,+xtpr,+cx16,+tm2,+est,+vmx,+ds_cpl,+pbe,+tm,+ht,+ss,+acpi,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args index bc75a9a..cc083aa 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args index a4d1b64..e3b0873 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args index 450b3a4..4d0ca79 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args index a4d1b64..e3b0873 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args index 51f8433..7d38fd4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-kvm \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu core2duo,+lahf_lm,+3dnowext,+xtpr,+est,+vmx,+ds_cpl,+tm,+ht,+acpi,+ds,-nx \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args index 20faf71..682112a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args index 74365a9..e25dc3a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu core2duo \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args index fca5295..18c572e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args b/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args index 7892f0f..eeb8d8d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ +-name dummy2 \ -S \ -M pc-q35-2.3 \ -m 128 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args b/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args index b620fb7..03290b5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/kvm \ +-name kvm \ -S \ -machine pc,accel=kvm \ -m 4096 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args b/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args index 48d85e8..08fc3b0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ +-name qemu-host \ -S \ -machine pc-0.11,accel=tcg \ -m 4096 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args index 3739a5f..1b768e0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args index 6754fbe..7304fbe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args index 829252b..b22b328 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args index 1772275..bb24f41 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/kvm \ +-name QEMUGuest1 \ -S \ -M pc-1.2 \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args index c153842..1b09806 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/kvm \ +-name QEMUGuest1 \ -S \ -M pc-1.2 \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args index f5c0bd5..66123e2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/kvm \ +-name QEMUGuest1 \ -S \ -M pc-1.2 \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args index 0a01a99..97b9071 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/kvm \ +-name QEMUGuest1 \ -S \ -M pc-1.2 \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args index 60c875a..42ec5c6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/kvm \ +-name QEMUGuest1 \ -S \ -M pc-1.2 \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args index 829252b..b22b328 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args index 1f44b92..f60cdce 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name test \ -S \ -M pc-0.13 \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args index 2d273dd..7d3f7d1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args index d5995dc..24cddfc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name test \ -S \ -M pc-0.13 \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args index d52dcaa..6178fc6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args index 2360f46..4196706 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args index 12b8f68..0e21686 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args index 051ae76..9772e62 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args index 6438d09..74a3c99 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args index 4c630b7..974df41 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args index 6438d09..74a3c99 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args index 4f46dc9..8b7efa5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args index f85cf91..00151f5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args index 4977174..d338743 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args index 1da91e4..ce549b6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args index ab612f9..074eac9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name test \ -S \ -M pc-0.13 \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args index 1ae20d8..cf20444 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args index 33192bf..86530a4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args index d82dd2f..4dd82be 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args index 165d2a8..68e6f67 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args index 65fe181..bdd9130 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args index 7e3a264..36c7cca 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args index b69bf0d..48361b3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args index 43f6848..b16de7a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args index 80029bf..18fa809 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args index 0507b40..a6ef9e5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args index 63aa0d5..d413f90 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args index b46cef5..40dd6d6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args index 53691ef..5da8372 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args index 1b0cefe..c9daf15 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args index 580c62c..95079be 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args index 68d39d4..9446e0e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args @@ -7,6 +7,7 @@ QEMU_AUDIO_DRV=none \ CEPH_ARGS=-m \ mon1.example.org:6321,mon2.example.org:6322,mon3.example.org:6322 \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args index 1d378a8..a9979d7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args index f8699fa..94e759a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args index 99f05cd..350c709 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args index 1adf331..2f70cbc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args index 788a388..6f9e15b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args index 58a0fd2..62463fd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args index ae1f114..6234b99 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args index 4d2e592..a4ef36c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ +-name QEMUGuest1 \ -S \ -M pseries \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args index 97bab32..0cedb01 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args index 21f5008..df7d43b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args index 6cf7e2b..ddcb0b8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args index 1a049c6..36995fc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args index 659fd45..646f9f7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args index 951461c..1949628 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args index 4bd0501..46a25c4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name test \ -S \ -M pc-0.13 \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args index 6f09c83..33f940d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args index e170135..584f352 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args index 5a37976..02dbb3d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args index 547f952..53ef910 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args index 2a67ec5..62ca44a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args index 2a67ec5..62ca44a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args index 999abb0..6a26086 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args index 7880a07..17dae7a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args index d56a56c..1e92391 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args index 16087be..ac58027 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args index 63eb48d..f2fa9a2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args index 0065ae0..b22ec00 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args index 3f50270..948d3eb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args index 6948bb2..22ba3d1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args index f00773e..1c09926 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args index ad0a978..6c8586a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args index e4ebe44..e5cc374 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args index e0bf4b6..e53cf2b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args index 7f6626c..ae26a02 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args index 9bbb3b7..879fb6e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args index 9293017..1e0905a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M s390-ccw \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args index 19a872d..4095ce3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M s390-ccw \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args index 491e3ea..7f34a10 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M s390-virtio \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args index 0b39584..9dcd5f2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M s390-ccw \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args index 574bde4..37cbe33 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args index 297ce54..259e807 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args index 08d70fb..44c98e8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args index 104b8d7..574066c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args index b2bd28b..adcd446 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args index 1000e36..1a7755d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args index 3d51800..5127dbb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu qemu32,-kvm_pv_eoi \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args index 590babf..6df39b9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu qemu32,+kvm_pv_eoi \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args index 03fdac3..490ef61 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name test \ -S \ -M pc-0.13 \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args index 1e7758b..726e0a1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -enable-fips \ -M pc \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args index 2ccd40b..5879345 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args index 1680cd4..a9bad83 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M s390-ccw-virtio \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args index ebce05a..0c9b71b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args index 36b272e..6f22abf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args @@ -6,6 +6,7 @@ LOGNAME=test \ XAUTHORITY=/root/.Xauthority \ DISPLAY=:0.1 \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args index 01ac3f1..db7b2df 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args @@ -6,6 +6,7 @@ LOGNAME=test \ XAUTHORITY=/root/.Xauthority \ DISPLAY=:0.1 \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args index 21dd062..2155ff4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args index ba215a1..44c1874 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args index c463ad7..f15b7de 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args index 7b319df..73e8227 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args index a5349aa..0a78f3d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args @@ -6,6 +6,7 @@ LOGNAME=test \ SASL_CONF_PATH=/root/.sasl2 \ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args index 91e30ca..ede86bd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-kvm \ +-name f14 \ -S \ -M pc \ -cpu core2duo,+lahf_lm,+xtpr,+cx16,+tm2,+est,+vmx,+ds_cpl,+pbe,+tm,+ht,+ss,+acpi,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args index 52ffe7b..a87be90 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args index 955bfc3..074cdd2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args index 7831e0d..e59dd60 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args index a9f2c36..95bf81d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args @@ -6,6 +6,7 @@ LOGNAME=test \ SASL_CONF_PATH=/root/.sasl2 \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args index bd9deec..3f67906 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args index 1ed8ca1..7c3e5f1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args @@ -6,6 +6,7 @@ LOGNAME=test \ SASL_CONF_PATH=/root/.sasl2 \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args index eb71e24..c0490dc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args index 30cdc5a..f7416b3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args index e4b5f10..9787c7b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest2 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args index ff46d61..0ef4791 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest2 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args index 25eada0..a699e79 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args index 967a07c..70d249f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest2 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args index a02c84c..e72391e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest2 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args index 85aa01b..090f0b9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest2 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args index 27a28bc..ed68964 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest2 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args index 1b4064b..20de760 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest2 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args index 50716bc..b48ff19 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest2 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args index 30c1d5b..d7a44d6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest2 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args index 79afe03..61f2501 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args index 8cc3310..aa8383d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args index b3591da..51c0f68 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args index 605cbee..2cc6d55 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest2 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args index 8e04e0c..06fef9c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest2 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args b/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args index e7e15b6..2047478 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/libexec/qemu-kvm \ +-name hotplug \ -S \ -M pc \ -m 4096 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args index 567abcd..c9574da 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-x86_64 \ +-name fedora \ -S \ -M pc-i440fx-2.3 \ -m size=1048576k,slots=16,maxmem=1099511627776k \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args index d05fa97..da9a6ed 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 4096 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args index db058a6..cc07aa1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name SomeDummyHugepagesGuest \ -S \ -M pc \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args index 76afe8d..c415fec 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name SomeDummyHugepagesGuest \ -S \ -M pc \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args index 2368950..6f9970f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name SomeDummyHugepagesGuest \ -S \ -M pc \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args index e55bfea..2b03065 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name SomeDummyHugepagesGuest \ -S \ -M pc \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args index a93d20f..c15b8ca 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 4096 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args index aad459d..237f6a4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args b/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args index b951530..6ade3c4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu qemu32 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args b/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args index da3906e..c14495a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu qemu32,hv_relaxed,hv_vapic,hv_spinlocks=0x2fff \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args index 5d8fd06..8364bba 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args index c138ce2..3355f67 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args index 145883d..d557f66 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args index b5e1183..470fe11 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M s390-ccw \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args index f069bdd..da35ad0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args index 95ae95b..32e72c1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args index 07a5c5d..4510721 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args index 88689be..d4fe6e9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args index b951530..6ade3c4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu qemu32 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args index 13fe470..2f0aaf2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu qemu32,kvm=off \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args index 3f43ea7..8039939 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args index 880883b..82c4831 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm.args index 3c84e7b..3a6fafc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvm.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/libexec/qemu-kvm \ +-name kvm \ -S \ -machine pc-1.0,accel=kvm \ -m 4096 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args index 49fc4a1..780fd70 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu qemu32,-kvmclock,-kvm_pv_eoi \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args index 52b8c88..8061501 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/kvm \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu qemu32,-kvmclock \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-lease.args b/tests/qemuxml2argvdata/qemuxml2argv-lease.args index 21d605c..45b53f2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-lease.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-lease.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args index b769897..2d396e8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ +-name QEMUGuest1 \ -S \ -machine s390-ccw-virtio,accel=tcg,aes-key-wrap=off \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args index bcab04a..9e19335 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ +-name QEMUGuest1 \ -S \ -machine s390-ccw-virtio,accel=tcg,aes-key-wrap=off \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args index bcab04a..9e19335 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ +-name QEMUGuest1 \ -S \ -machine s390-ccw-virtio,accel=tcg,aes-key-wrap=off \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args index 6193258..37c19a7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ +-name QEMUGuest1 \ -S \ -machine s390-ccw-virtio,accel=tcg,aes-key-wrap=on \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args index 3d89b12..1c84cda 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ +-name QEMUGuest1 \ -S \ -machine s390-ccw-virtio,accel=tcg,aes-key-wrap=on \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args index 3d89b12..1c84cda 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ +-name QEMUGuest1 \ -S \ -machine s390-ccw-virtio,accel=tcg,aes-key-wrap=on \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args index c08226c..411b8c1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ +-name QEMUGuest1 \ -S \ -M pc-0.11 \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args index 5ae1844..4dba14f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/kvm \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args index 78f552f..ab44a69 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -machine pc,accel=tcg,dump-guest-core=off \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args index 8be1173..a2a469a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -machine pc,accel=tcg,dump-guest-core=on \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args index b705d90..045d781 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ +-name QEMUGuest1 \ -S \ -machine s390-ccw-virtio,accel=tcg,dea-key-wrap=off \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args index d05cfd7..409664a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ +-name QEMUGuest1 \ -S \ -machine s390-ccw-virtio,accel=tcg,dea-key-wrap=off \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args index d05cfd7..409664a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ +-name QEMUGuest1 \ -S \ -machine s390-ccw-virtio,accel=tcg,dea-key-wrap=off \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args index 6c56279..f075449 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ +-name QEMUGuest1 \ -S \ -machine s390-ccw-virtio,accel=tcg,dea-key-wrap=on \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args index 7fb7246..a982a72 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ +-name QEMUGuest1 \ -S \ -machine s390-ccw-virtio,accel=tcg,dea-key-wrap=on \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args index 7fb7246..a982a72 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ +-name QEMUGuest1 \ -S \ -machine s390-ccw-virtio,accel=tcg,dea-key-wrap=on \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args index 03631a5..494ecb5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ +-name QEMUGuest1 \ -S \ -machine s390-ccw-virtio,accel=tcg \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args index 3a72d9d..3bdd9f6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ +-name QEMUGuest1 \ -S \ -machine s390-ccw-virtio,accel=tcg \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args index 3a72d9d..3bdd9f6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ +-name QEMUGuest1 \ -S \ -machine s390-ccw-virtio,accel=tcg \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args index 61b310d..b574670 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args index c431f16..19642f0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -machine pc,accel=tcg,vmport=off \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args index f233c98..555888c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m size=219136k,slots=16,maxmem=1099511627776k \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args index 4fa9f3f..ebbe20e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m size=219136k,slots=16,maxmem=1099511627776k \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args index a422ca2..b8f80eb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m size=219136k,slots=16,maxmem=1099511627776k \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args b/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args index 199fca1..bed6a3c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/kvm \ +-name QEMUGuest \ -S \ -M pc \ -m 14338 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate.args b/tests/qemuxml2argvdata/qemuxml2argv-migrate.args index 69d2e44..c15fa45 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-migrate.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-migrate.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args index 7371f8d..c33da9f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args index 0da13aa..c5fed10 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args index 0503eae..481207c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args index 703f8e7..3a47f61 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args index b8e5600..5f34b6a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args b/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args index 090d23d..f6f2404 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args index 313c758..4bbf842 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args b/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args index e8ba62e..2cb519d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args b/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args index c709697..21e1ae2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name encryptdisk \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args b/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args index e0e9c2d..050a1e3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-client.args b/tests/qemuxml2argvdata/qemuxml2argv-net-client.args index 40a714b..076e86b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-client.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-client.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args index 8397241..36b0a82 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args index f1c828e..6cf9a7b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args index b4f18fd..7f3e3b0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args index 923349f..0dabd82 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args index 481748e..3b622d9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args index 8b396a2..46a50f9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args index fe898fa..68a72f5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args index a227672..d057a49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-server.args b/tests/qemuxml2argvdata/qemuxml2argv-net-server.args index b2833c0..a4297b4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-server.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-server.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args b/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args index 4e67f38..437644a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user.args b/tests/qemuxml2argvdata/qemuxml2argv-net-user.args index a92d818..6f2428b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-user.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-user.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args index d5abfc6..bf6452a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args index eaadea6..e2e7a4d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args index f49c901..9a8dc81 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M s390-ccw \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args index 19d8d73..9689475 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args index 1b7b1f5..017869f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args index 6ba80c2..04b3166 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args index 4be6ed4..9333fa5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M s390-virtio \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args index 53afdfc..c352f48 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args b/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args index dd0c2f6..9f840c5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name encryptdisk \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args index b9963bc..8dedbf5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics.args b/tests/qemuxml2argvdata/qemuxml2argv-nographics.args index 96829ad..903d23e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-nographics.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args b/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args index 4bb1fd4..36f0192 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -machine pc,accel=tcg,mem-merge=off \ -m 215 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args index 18cd862..f9028bb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git 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 index 18cd862..f9028bb 100644 --- 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 @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args index 18cd862..f9028bb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args index 18cd862..f9028bb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad.args b/tests/qemuxml2argvdata/qemuxml2argv-numad.args index 18cd862..f9028bb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numad.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numad.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args index 18cd862..f9028bb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args index 58b953b..46d556e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/kvm \ +-name QEMUGuest \ -S \ -M pc \ -m 64 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args index b0cd4f0..d5c849c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/kvm \ +-name QEMUGuest \ -S \ -M pc \ -m 64 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args index aa0c050..74e6780 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/kvm \ +-name QEMUGuest \ -S \ -M pc \ -m 24105 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args index 18cd862..f9028bb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args b/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args index eb4af11..a3d238d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic.args b/tests/qemuxml2argvdata/qemuxml2argv-panic.args index b3ea3df..a4e78a0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-panic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-panic.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args index acaf86a..2d478d7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args index 806bfbf..c15f1ae 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args index 0546fed..10bb5f9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args index 3cf4546..8b507f1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/libexec/qemu-kvm \ +-name fdr-br \ -S \ -M pc-1.2 \ -m 2048 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args index 7b23f0a..322c572 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/libexec/qemu-kvm \ +-name fdr-br \ -S \ -M pc-1.2 \ -m 2048 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args index 541c9b7..894a717 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-kvm \ +-name lots-of-disks \ -S \ -M pc-i440fx-1.4 \ -cpu qemu64,-kvmclock \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args index d16e84c..17a2509 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/libexec/qemu-kvm \ +-name fdr-br \ -S \ -M pc-1.2 \ -m 2048 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args index c5d67d2..a2a80b2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest2 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args index 8b112b7..2e79b03 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args index 06de4d0..ea1a46b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/libexec/qemu-kvm \ +-name q35-test \ -S \ -M q35 \ -m 2048 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args index c471a3d..350aa52 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/libexec/qemu-kvm \ +-name q35-test \ -S \ -M q35 \ -m 2048 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args index 76cc58d..edc74e8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/libexec/qemu-kvm \ +-name q35-test \ -S \ -M q35 \ -m 2048 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args index 2d149ae..689edb1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/libexec/qemu-kvm \ +-name q35-test \ -S \ -M q35 \ -m 2048 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args index 696c903..099eb14 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/libexec/qemu-kvm \ +-name QEMUGuest1 \ -S \ -M pc-1.2 \ -m 2048 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args index b9de927..e67a7b5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/libexec/qemu-kvm \ +-name q35-test \ -S \ -M q35 \ -m 2048 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args index 2961ba7..3dbd836 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/libexec/qemu-kvm \ +-name foo \ -S \ -M pc-1.2 \ -m 2048 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args index f8e10ca..033f5f2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu qemu32,pmu=off \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args index 5ea1909..5693c30 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu qemu32,pmu=on \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args b/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args index ada24a9..8a60b04 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc \ +-name QEMUGuest1 \ -S \ -M ppce500 \ -m 256 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args b/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args index 424a7b3..78b1609 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc \ +-name QEMUGuest1 \ -S \ -M ppce500 \ -m 256 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args index 81e91e1..82af5fc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ +-name QEMUGuest1 \ -S \ -M pseries \ -m 512 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args index b5185fb..c02d987 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ +-name QEMUGuest1 \ -S \ -M pseries \ -cpu host,compat=power7 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args index e26a036..887b817 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ +-name QEMUGuest1 \ -S \ -M pseries \ -cpu POWER7_v2.3 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args index 81e91e1..82af5fc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ +-name QEMUGuest1 \ -S \ -M pseries \ -m 512 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.args index 6f3c267..2dd5f1c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ +-name QEMUGuest1 \ -S \ -M pseries \ -m 512 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args index 66660f7..dd3255a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ +-name QEMUGuest1 \ -S \ -M pseries \ -m 512 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args index 81e91e1..82af5fc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ +-name QEMUGuest1 \ -S \ -M pseries \ -m 512 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args index 81e91e1..82af5fc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ +-name QEMUGuest1 \ -S \ -M pseries \ -m 512 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args index b3082aa..4fa1399 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ +-name QEMUGuest1 \ -S \ -M pseries \ -m 512 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args index 2e4c372..0c371bc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ +-name QEMUGuest1 \ -S \ -M pseries \ -m 512 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args index 3752ca3..5052269 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ +-name QEMUGuest1 \ -S \ -M pseries \ -m 512 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args index e332520..5b1abc3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ +-name QEMUGuest1 \ -S \ -M pseries \ -m 512 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args index 8ba3da7..48487ea 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ +-name QEMUGuest1 \ -S \ -M pseries \ -m 512 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args index 3a86420..09602ad 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu qemu32,-kvm_pv_unhalt \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args index 753f4d4..d3d5421 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -cpu qemu32,+kvm_pv_unhalt \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-q35.args index c9efffa..2027229 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/libexec/qemu-kvm \ +-name q35-test \ -S \ -M q35 \ -m 2048 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args index ee62fcf..483f1bd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args index 64b13e0..0cc95d2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args @@ -7,6 +7,7 @@ QEMU_AUDIO_DRV=none \ NS=ns \ BAR='' \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args index 889858a..8023a87 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args index b5d0453..73c70d0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args index a667f0f..7598b9c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 213 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args index 2c53a4b..066e19b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args index 1720592..d227a77 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args index 4479d33..ada8882 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ +-name test \ -S \ -M s390-virtio \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args index 4479d33..ada8882 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ +-name test \ -S \ -M s390-virtio \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args index 6c6e21e..f5ebcbc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args index 43aae53..a7a56e4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args index 26d6361..e698c72 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args index e6efc3b..7828233 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args index bce0d14..e37708c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args index 2c8d645..73884cb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args index 555c01d..2f0168a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args index 9319597..49831f6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args index 6aec302..c1558d0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args index 230aec1..67c40a2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args index b0e487a..443cd35 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args index e3e29eb..671f315 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args index a2bd2cd..cd08f32 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args index 061579c..ea2558c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args index 6633e45..cbd1ce0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args index 382d878..3f7ce02 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args index cacf588..61085875 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args index f4be86b..0e16341 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args index 0671173..01e4307 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args index 5ec3a05..c77015a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-shmem.args b/tests/qemuxml2argvdata/qemuxml2argv-shmem.args index fb1f302..078ac4c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-shmem.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-shmem.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args index a5be669..2c6af2e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args index b699d23..e5875a5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args index a5be669..2c6af2e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args index 90d14e9..0fdbdbd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args index 962c682..9002ce6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args index 82d8b94..2b03eeb1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smp.args b/tests/qemuxml2argvdata/qemuxml2argv-smp.args index b185b31..3cec52c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smp.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args index eac6954..19507ab 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound.args b/tests/qemuxml2argvdata/qemuxml2argv-sound.args index f9ffd6e..60359b7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args index 323eeb6..c18ec7f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name TPM-VM \ -S \ -M pc-0.12 \ -m 2048 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args index 482da72..198cdc1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args index 37e4384..3daf40d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args index fb79c57..1b05b73 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args index eb26548..034ff94 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args index 77c6b92..efc50b8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args index c3fadd7..ce94d40 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args index 0464ed0..a612293 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args index f7336fa..43c6b32 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args index 50418c3..e6a84e8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args index e874e46..185c3d9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args index 0315b2c..0344750 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args b/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args index d677706..9faff40 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args index 8d7289d..04276d0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc-0.15 \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args index c32f732..dc1b039 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args index 6ea5b2b..d56a07e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args index 1becac9..64b9255 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args index 90bf011..b07bb7b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args index 22de9de..716d6b9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args index 280d84d..babee90 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args index 2daa002..b48e39a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args index 95324be..5f16980 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args index 5b879cb..09bdb6f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name test \ -S \ -M pc-0.13 \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args index 2823c11..e2b56ad 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M s390-ccw \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args index 42a8eea..1b1c19d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args index 9ed0b03..f15bf57 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args index d582cfe..046568f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args index 19e9694..900d008 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args index c55c7bb..009885b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args index d9b7e1d..2c2e392 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M s390-virtio \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args index 85f6ea5..762ccee 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args index 44bdab2..ed464d8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args index 5edbee2..3fcd0c0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 8f2a749..df69790 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -584,10 +584,10 @@ mymain(void) unsetenv("QEMU_AUDIO_DRV"); unsetenv("SDL_AUDIODRIVER"); - DO_TEST("minimal", QEMU_CAPS_NAME); + DO_TEST("minimal", NONE); DO_TEST_PARSE_ERROR("minimal-no-memory", NONE); - DO_TEST("minimal-msg-timestamp", QEMU_CAPS_NAME, QEMU_CAPS_MSG_TIMESTAMP); - DO_TEST("minimal-s390", QEMU_CAPS_NAME); + DO_TEST("minimal-msg-timestamp", QEMU_CAPS_MSG_TIMESTAMP); + DO_TEST("minimal-s390", NONE); DO_TEST("machine-aliases1", NONE); DO_TEST("machine-aliases2", QEMU_CAPS_KVM); DO_TEST("machine-core-on", QEMU_CAPS_MACHINE_OPT, @@ -997,7 +997,7 @@ mymain(void) DO_TEST("misc-enable-s4", QEMU_CAPS_DISABLE_S4); DO_TEST_FAILURE("misc-enable-s4", NONE); DO_TEST("misc-no-reboot", NONE); - DO_TEST("misc-uuid", QEMU_CAPS_NAME, QEMU_CAPS_UUID); + DO_TEST("misc-uuid", QEMU_CAPS_UUID); DO_TEST_PARSE_ERROR("vhost_queues-invalid", NONE); DO_TEST("net-vhostuser", QEMU_CAPS_DEVICE, QEMU_CAPS_NETDEV); DO_TEST("net-vhostuser-multiq", @@ -1054,7 +1054,7 @@ mymain(void) QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEPORT); - DO_TEST("serial-spiceport-nospice", QEMU_CAPS_NAME); + DO_TEST("serial-spiceport-nospice", NONE); DO_TEST("parallel-tcp", NONE); DO_TEST("console-compat", NONE); @@ -1317,14 +1317,14 @@ mymain(void) DO_TEST("cpu-Haswell-noTSX", QEMU_CAPS_KVM); driver.caps->host.cpu = cpuDefault; - DO_TEST("memtune", QEMU_CAPS_NAME); - DO_TEST("memtune-unlimited", QEMU_CAPS_NAME); - DO_TEST("blkiotune", QEMU_CAPS_NAME); - DO_TEST("blkiotune-device", QEMU_CAPS_NAME); - DO_TEST("cputune", QEMU_CAPS_NAME); - DO_TEST("cputune-zero-shares", QEMU_CAPS_NAME); - DO_TEST_PARSE_ERROR("cputune-iothreadsched-toomuch", QEMU_CAPS_NAME); - DO_TEST_PARSE_ERROR("cputune-vcpusched-overlap", QEMU_CAPS_NAME); + DO_TEST("memtune", NONE); + DO_TEST("memtune-unlimited", NONE); + DO_TEST("blkiotune", NONE); + DO_TEST("blkiotune-device", NONE); + DO_TEST("cputune", NONE); + DO_TEST("cputune-zero-shares", NONE); + DO_TEST_PARSE_ERROR("cputune-iothreadsched-toomuch", NONE); + DO_TEST_PARSE_ERROR("cputune-vcpusched-overlap", NONE); DO_TEST("cputune-numatune", QEMU_CAPS_SMP_TOPOLOGY, QEMU_CAPS_KVM, QEMU_CAPS_OBJECT_IOTHREAD, @@ -1354,9 +1354,9 @@ mymain(void) DO_TEST("numad-auto-memory-vcpu-cpuset", NONE); DO_TEST("numad-auto-memory-vcpu-no-cpuset-and-placement", NONE); DO_TEST("numad-static-memory-auto-vcpu", NONE); - DO_TEST("blkdeviotune", QEMU_CAPS_NAME, QEMU_CAPS_DEVICE, + DO_TEST("blkdeviotune", QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE_IOTUNE); - DO_TEST("blkdeviotune-max", QEMU_CAPS_NAME, QEMU_CAPS_DEVICE, + DO_TEST("blkdeviotune-max", QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE_IOTUNE, QEMU_CAPS_DRIVE_IOTUNE_MAX); @@ -1370,18 +1370,18 @@ mymain(void) QEMU_CAPS_CHARDEV, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_NO_SHUTDOWN); - DO_TEST("seclabel-dynamic", QEMU_CAPS_NAME); - DO_TEST("seclabel-dynamic-baselabel", QEMU_CAPS_NAME); - DO_TEST("seclabel-dynamic-override", QEMU_CAPS_NAME); - DO_TEST("seclabel-dynamic-labelskip", QEMU_CAPS_NAME); - DO_TEST("seclabel-dynamic-relabel", QEMU_CAPS_NAME); - DO_TEST("seclabel-static", QEMU_CAPS_NAME); - DO_TEST("seclabel-static-relabel", QEMU_CAPS_NAME); - DO_TEST("seclabel-static-labelskip", QEMU_CAPS_NAME); - DO_TEST("seclabel-none", QEMU_CAPS_NAME); - DO_TEST("seclabel-dac-none", QEMU_CAPS_NAME); - DO_TEST_PARSE_ERROR("seclabel-multiple", QEMU_CAPS_NAME); - DO_TEST_PARSE_ERROR("seclabel-device-duplicates", QEMU_CAPS_NAME); + DO_TEST("seclabel-dynamic", NONE); + DO_TEST("seclabel-dynamic-baselabel", NONE); + DO_TEST("seclabel-dynamic-override", NONE); + DO_TEST("seclabel-dynamic-labelskip", NONE); + DO_TEST("seclabel-dynamic-relabel", NONE); + DO_TEST("seclabel-static", NONE); + DO_TEST("seclabel-static-relabel", NONE); + DO_TEST("seclabel-static-labelskip", NONE); + DO_TEST("seclabel-none", NONE); + DO_TEST("seclabel-dac-none", NONE); + DO_TEST_PARSE_ERROR("seclabel-multiple", NONE); + DO_TEST_PARSE_ERROR("seclabel-device-duplicates", NONE); DO_TEST("pseries-basic", QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index d77ecbb..38e79b8 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -114,7 +114,6 @@ static const char testStatusXMLPrefix[] = " <vcpu pid='3803519'/>\n" " </vcpus>\n" " <qemuCaps>\n" -" <flag name='name'/>\n" " <flag name='uuid'/>\n" " <flag name='vnet-hdr'/>\n" " <flag name='qxl.vgamem_mb'/>\n" diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args index 1f5f7d6..3337ec4 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args index 1f5f7d6..3337ec4 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args index 1f5f7d6..3337ec4 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args index 1f5f7d6..3337ec4 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args index 1f5f7d6..3337ec4 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args index 1f5f7d6..3337ec4 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args index 2acb236..5175e49 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args @@ -5,6 +5,7 @@ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ +-name QEMUGuest1 \ -S \ -M pc \ -m 214 \ -- 2.5.0

We have twice previously attempted to remove Xenner support commit de9be0ab4d7abe4c3ae5beaaff7ddb208921f1f1 Author: Daniel P. Berrange <berrange(a)redhat.com&gt; Date: Wed Aug 22 17:29:01 2012 +0100 Remove xenner support commit 92572c3d71bd08e6dd1897c7b14be9d27df608e9 Author: Ján Tomko <jtomko(a)redhat.com&gt; Date: Wed Feb 18 16:33:50 2015 +0100 Remove code handling the QEMU_CAPS_DOMID capability This change really does remove the last traces of it in the capabilities handling code Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 4 ---- src/qemu/qemu_capabilities.h | 4 ++-- src/qemu/qemu_command.c | 14 ++++---------- tests/qemuhelptest.c | 4 ---- 4 files changed, 6 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index eb7dac2..2346e40 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1096,10 +1096,6 @@ virQEMUCapsComputeCmdFlags(const char *help, virQEMUCapsSet(qemuCaps, QEMU_CAPS_ENABLE_KVM); if (strstr(help, ",process=")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_NAME_PROCESS); - if (strstr(help, "-xen-domid")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_XEN_DOMID); - else if (strstr(help, "-domid")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DOMID); cache = strstr(help, "cache="); if (cache && (p = strchr(cache, ']'))) { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 6433328..e13c33d 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -55,7 +55,7 @@ typedef enum { /* 5 */ X_QEMU_CAPS_NAME, /* Is the -name flag available */ X_QEMU_CAPS_UUID, /* Is the -uuid flag available */ - QEMU_CAPS_DOMID, /* Xenner: -domid flag available */ + X_QEMU_CAPS_DOMID, /* Xenner: -domid flag available */ QEMU_CAPS_VNET_HDR, QEMU_CAPS_MIGRATE_KVM_STDIO, /* avoid kvm tcp migration bug */ @@ -74,7 +74,7 @@ typedef enum { QEMU_CAPS_DRIVE_SERIAL, /* -driver serial= available */ /* 20 */ - QEMU_CAPS_XEN_DOMID, /* -xen-domid */ + X_QEMU_CAPS_XEN_DOMID, /* -xen-domid */ QEMU_CAPS_MIGRATE_QEMU_UNIX, /* qemu migration via unix sockets */ QEMU_CAPS_CHARDEV, /* Is the new -chardev arg available */ QEMU_CAPS_ENABLE_KVM, /* -enable-kvm flag */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c482253..ffd4e53 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9464,16 +9464,10 @@ qemuBuildCommandLine(virConnectPtr conn, if (def->virtType == VIR_DOMAIN_VIRT_XEN || def->os.type == VIR_DOMAIN_OSTYPE_XEN || def->os.type == VIR_DOMAIN_OSTYPE_LINUX) { - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_XEN_DOMID)) { - virCommandAddArg(cmd, "-xen-attach"); - virCommandAddArg(cmd, "-xen-domid"); - virCommandAddArgFormat(cmd, "%d", def->id); - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("qemu emulator '%s' does not support xen"), - def->emulator); - goto error; - } + virReportError(VIR_ERR_INTERNAL_ERROR, + _("qemu emulator '%s' does not support xen"), + def->emulator); + goto error; } if ((def->os.smbios_mode != VIR_DOMAIN_SMBIOS_NONE) && diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index e5b7b7c..414c874 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -162,7 +162,6 @@ mymain(void) QEMU_CAPS_0_10, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_SDL, - QEMU_CAPS_XEN_DOMID, QEMU_CAPS_MIGRATE_QEMU_UNIX, QEMU_CAPS_CHARDEV, QEMU_CAPS_BALLOON, @@ -288,7 +287,6 @@ mymain(void) QEMU_CAPS_KVM, QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL, - QEMU_CAPS_XEN_DOMID, QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_VGA, QEMU_CAPS_0_10, @@ -493,7 +491,6 @@ mymain(void) QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL, - QEMU_CAPS_XEN_DOMID, QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_VGA, QEMU_CAPS_0_10, @@ -581,7 +578,6 @@ mymain(void) QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL, - QEMU_CAPS_XEN_DOMID, QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_VGA, QEMU_CAPS_0_10, -- 2.5.0

Since we require QEMU 0.12.0, we can assume that QEMU supports all of the fd, tcp, unix and exec migration protocols. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 34 +--------- src/qemu/qemu_capabilities.h | 10 +-- src/qemu/qemu_command.c | 44 +------------ src/qemu/qemu_migration.c | 77 ++++++---------------- tests/qemuargv2xmltest.c | 1 - tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 4 -- tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 4 -- tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 4 -- tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 4 -- tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 4 -- tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 4 -- tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 4 -- tests/qemucaps2xmldata/all_1.6.0-1.caps | 4 -- tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps | 4 -- tests/qemuhelptest.c | 32 --------- .../qemuxml2argv-migrate-numa-unaligned.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-restore-v1.args | 23 ------- tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml | 28 -------- tests/qemuxml2argvtest.c | 13 ++-- 19 files changed, 33 insertions(+), 267 deletions(-) delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ae343cc..55c8b92 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1081,7 +1081,6 @@ virCapsPtr virQEMUCapsInit(virQEMUCapsCachePtr cache) static int virQEMUCapsComputeCmdFlags(const char *help, unsigned int version, - unsigned int kvm_version, virQEMUCapsPtr qemuCaps, bool check_yajl ATTRIBUTE_UNUSED) { @@ -1235,33 +1234,6 @@ virQEMUCapsComputeCmdFlags(const char *help, if (strstr(help, "-machine")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT); - /* - * Handling of -incoming arg with varying features - * -incoming tcp (kvm >= 79, qemu >= 0.10.0) - * -incoming exec (kvm >= 80, qemu >= 0.10.0) - * -incoming unix (qemu >= 0.12.0) - * -incoming fd (qemu >= 0.12.0) - * -incoming stdio (all earlier kvm) - * - * NB, there was a pre-kvm-79 'tcp' support, but it - * was broken, because it blocked the monitor console - * while waiting for data, so pretend it doesn't exist - */ - if (version >= 10000) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_TCP); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_EXEC); - if (version >= 12000) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_UNIX); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_FD); - } - } else if (kvm_version >= 79) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_TCP); - if (kvm_version >= 80) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_EXEC); - } else if (kvm_version > 0) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MIGRATE_KVM_STDIO); - } - if (version >= 10000) virQEMUCapsSet(qemuCaps, QEMU_CAPS_0_10); @@ -1444,7 +1416,7 @@ int virQEMUCapsParseHelpStr(const char *qemu, goto cleanup; } - if (virQEMUCapsComputeCmdFlags(help, *version, *kvm_version, + if (virQEMUCapsComputeCmdFlags(help, *version, qemuCaps, check_yajl) < 0) goto cleanup; @@ -3200,15 +3172,12 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_TCP); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_EXEC); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_V2); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_FORMAT); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VGA); virQEMUCapsSet(qemuCaps, QEMU_CAPS_0_10); virQEMUCapsSet(qemuCaps, QEMU_CAPS_MEM_PATH); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_UNIX); virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV); virQEMUCapsSet(qemuCaps, QEMU_CAPS_MONITOR_JSON); virQEMUCapsSet(qemuCaps, QEMU_CAPS_BALLOON); @@ -3225,7 +3194,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_READONLY); virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMBIOS_TYPE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VGA_NONE); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_FD); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_AIO); virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEVMC); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_QXL_VGA); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index f5919d9..822cf0b 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -57,11 +57,11 @@ typedef enum { X_QEMU_CAPS_UUID, /* Is the -uuid flag available */ X_QEMU_CAPS_DOMID, /* Xenner: -domid flag available */ X_QEMU_CAPS_VNET_HDR, - QEMU_CAPS_MIGRATE_KVM_STDIO, /* avoid kvm tcp migration bug */ + X_QEMU_CAPS_MIGRATE_KVM_STDIO, /* avoid kvm tcp migration bug */ /* 10 */ - QEMU_CAPS_MIGRATE_QEMU_TCP, /* have qemu tcp migration */ - QEMU_CAPS_MIGRATE_QEMU_EXEC, /* have qemu exec migration */ + X_QEMU_CAPS_MIGRATE_QEMU_TCP, /* have qemu tcp migration */ + X_QEMU_CAPS_MIGRATE_QEMU_EXEC, /* have qemu exec migration */ QEMU_CAPS_DRIVE_CACHE_V2, /* cache= flag wanting new v2 values */ QEMU_CAPS_KVM, /* Whether KVM is enabled by default */ QEMU_CAPS_DRIVE_FORMAT, /* Is -drive format= avail */ @@ -75,7 +75,7 @@ typedef enum { /* 20 */ X_QEMU_CAPS_XEN_DOMID, /* -xen-domid */ - QEMU_CAPS_MIGRATE_QEMU_UNIX, /* qemu migration via unix sockets */ + X_QEMU_CAPS_MIGRATE_QEMU_UNIX, /* qemu migration via unix sockets */ QEMU_CAPS_CHARDEV, /* Is the new -chardev arg available */ QEMU_CAPS_ENABLE_KVM, /* -enable-kvm flag */ QEMU_CAPS_MONITOR_JSON, /* JSON mode for monitor */ @@ -112,7 +112,7 @@ typedef enum { QEMU_CAPS_VGA_QXL, /* The 'qxl' arg for '-vga' */ QEMU_CAPS_SPICE, /* Is -spice avail */ QEMU_CAPS_VGA_NONE, /* The 'none' arg for '-vga' */ - QEMU_CAPS_MIGRATE_QEMU_FD, /* -incoming fd:n */ + X_QEMU_CAPS_MIGRATE_QEMU_FD, /* -incoming fd:n */ QEMU_CAPS_BOOTINDEX, /* -device bootindex property */ /* 50 */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d4cd127..82d6470 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -11064,18 +11064,9 @@ qemuBuildCommandLine(virConnectPtr conn, } } - /* Migration is very annoying due to wildly varying syntax & - * capabilities over time of KVM / QEMU codebases. - */ if (migrateFrom) { virCommandAddArg(cmd, "-incoming"); if (STRPREFIX(migrateFrom, "tcp")) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_TCP)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("TCP migration is not supported with " - "this QEMU binary")); - goto error; - } virCommandAddArg(cmd, migrateFrom); } else if (STRPREFIX(migrateFrom, "rdma")) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MIGRATE_RDMA)) { @@ -11086,45 +11077,14 @@ qemuBuildCommandLine(virConnectPtr conn, } virCommandAddArg(cmd, migrateFrom); } else if (STREQ(migrateFrom, "stdio")) { - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_FD)) { - virCommandAddArgFormat(cmd, "fd:%d", migrateFd); - virCommandPassFD(cmd, migrateFd, 0); - } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_EXEC)) { - virCommandAddArg(cmd, "exec:cat"); - virCommandSetInputFD(cmd, migrateFd); - } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MIGRATE_KVM_STDIO)) { - virCommandAddArg(cmd, migrateFrom); - virCommandSetInputFD(cmd, migrateFd); - } else { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("STDIO migration is not supported " - "with this QEMU binary")); - goto error; - } + virCommandAddArgFormat(cmd, "fd:%d", migrateFd); + virCommandPassFD(cmd, migrateFd, 0); } else if (STRPREFIX(migrateFrom, "exec")) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_EXEC)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("EXEC migration is not supported " - "with this QEMU binary")); - goto error; - } virCommandAddArg(cmd, migrateFrom); } else if (STRPREFIX(migrateFrom, "fd")) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_FD)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("FD migration is not supported " - "with this QEMU binary")); - goto error; - } virCommandAddArg(cmd, migrateFrom); virCommandPassFD(cmd, migrateFd, 0); } else if (STRPREFIX(migrateFrom, "unix")) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_UNIX)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("UNIX migration is not supported " - "with this QEMU binary")); - goto error; - } virCommandAddArg(cmd, migrateFrom); } else { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e8ffde0..fca05e3 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4359,15 +4359,8 @@ qemuMigrationRun(virQEMUDriverPtr driver, break; case MIGRATION_DEST_UNIX: - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_UNIX)) { - ret = qemuMonitorMigrateToUnix(priv->mon, migrate_flags, - spec->dest.unix_socket.file); - } else { - const char *args[] = { - "nc", "-U", spec->dest.unix_socket.file, NULL - }; - ret = qemuMonitorMigrateToCommand(priv->mon, migrate_flags, args); - } + ret = qemuMonitorMigrateToUnix(priv->mon, migrate_flags, + spec->dest.unix_socket.file); break; case MIGRATION_DEST_FD: @@ -4562,8 +4555,7 @@ static int doNativeMigrate(virQEMUDriverPtr driver, } } - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_FD) && - STRNEQ(uribits->scheme, "rdma")) + if (STRNEQ(uribits->scheme, "rdma")) spec.destType = MIGRATION_DEST_CONNECT_HOST; else spec.destType = MIGRATION_DEST_HOST; @@ -4600,11 +4592,11 @@ static int doTunnelMigrate(virQEMUDriverPtr driver, size_t nmigrate_disks, const char **migrate_disks) { - qemuDomainObjPrivatePtr priv = vm->privateData; virNetSocketPtr sock = NULL; int ret = -1; qemuMigrationSpec spec; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + int fds[2]; VIR_DEBUG("driver=%p, vm=%p, st=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, flags=%lx, resource=%lu, " @@ -4613,53 +4605,24 @@ static int doTunnelMigrate(virQEMUDriverPtr driver, cookieout, cookieoutlen, flags, resource, NULLSTR(graphicsuri), nmigrate_disks, migrate_disks); - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_FD) && - !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_UNIX) && - !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_EXEC)) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("Source qemu is too old to support tunnelled migration")); - virObjectUnref(cfg); - return -1; - } - spec.fwdType = MIGRATION_FWD_STREAM; spec.fwd.stream = st; - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_FD)) { - int fds[2]; - - spec.destType = MIGRATION_DEST_FD; - spec.dest.fd.qemu = -1; - spec.dest.fd.local = -1; - - if (pipe2(fds, O_CLOEXEC) == 0) { - spec.dest.fd.qemu = fds[1]; - spec.dest.fd.local = fds[0]; - } - if (spec.dest.fd.qemu == -1 || - virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, - spec.dest.fd.qemu) < 0) { - virReportSystemError(errno, "%s", - _("cannot create pipe for tunnelled migration")); - goto cleanup; - } - } else { - spec.destType = MIGRATION_DEST_UNIX; - spec.dest.unix_socket.sock = -1; - spec.dest.unix_socket.file = NULL; - - if (virAsprintf(&spec.dest.unix_socket.file, - "%s/qemu.tunnelmigrate.src.%s", - cfg->libDir, vm->def->name) < 0) - goto cleanup; - if (virNetSocketNewListenUNIX(spec.dest.unix_socket.file, 0700, - cfg->user, cfg->group, - &sock) < 0 || - virNetSocketListen(sock, 1) < 0) - goto cleanup; + spec.destType = MIGRATION_DEST_FD; + spec.dest.fd.qemu = -1; + spec.dest.fd.local = -1; - spec.dest.unix_socket.sock = virNetSocketGetFD(sock); + if (pipe2(fds, O_CLOEXEC) == 0) { + spec.dest.fd.qemu = fds[1]; + spec.dest.fd.local = fds[0]; + } + if (spec.dest.fd.qemu == -1 || + virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, + spec.dest.fd.qemu) < 0) { + virReportSystemError(errno, "%s", + _("cannot create pipe for tunnelled migration")); + goto cleanup; } ret = qemuMigrationRun(driver, vm, cookiein, cookieinlen, cookieout, @@ -5943,8 +5906,7 @@ qemuMigrationToFile(virQEMUDriverPtr driver, virDomainObjPtr vm, return -1; } - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_FD) && - (!compressor || pipe(pipeFD) == 0)) { + if ((!compressor || pipe(pipeFD) == 0)) { /* All right! We can use fd migration, which means that qemu * doesn't have to open() the file, so while we still have to * grant SELinux access, we can do it on fd and avoid cleanup @@ -5983,8 +5945,7 @@ qemuMigrationToFile(virQEMUDriverPtr driver, virDomainObjPtr vm, if (!compressor) { const char *args[] = { "cat", NULL }; - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_FD) && - priv->monConfig->type == VIR_DOMAIN_CHR_TYPE_UNIX) { + if (priv->monConfig->type == VIR_DOMAIN_CHR_TYPE_UNIX) { rc = qemuMonitorMigrateToFd(priv->mon, QEMU_MONITOR_MIGRATE_BACKGROUND, fd); diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 96453e5..01670c7 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -280,7 +280,6 @@ mymain(void) DO_TEST("nosharepages"); - DO_TEST("restore-v1"); DO_TEST("restore-v2"); DO_TEST("migrate"); diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps index c149b6c..e83b956 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps @@ -1,13 +1,10 @@ <qemuCaps> - <flag name='migrate-qemu-tcp'/> - <flag name='migrate-qemu-exec'/> <flag name='drive-cache-v2'/> <flag name='drive-format'/> <flag name='vga'/> <flag name='0.10'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='migrate-qemu-unix'/> <flag name='chardev'/> <flag name='enable-kvm'/> <flag name='monitor-json'/> @@ -29,7 +26,6 @@ <flag name='vga-qxl'/> <flag name='spice'/> <flag name='vga-none'/> - <flag name='migrate-qemu-fd'/> <flag name='boot-index'/> <flag name='hda-duplex'/> <flag name='drive-aio'/> diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps index 8425e43..9dc91cd 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps @@ -1,13 +1,10 @@ <qemuCaps> - <flag name='migrate-qemu-tcp'/> - <flag name='migrate-qemu-exec'/> <flag name='drive-cache-v2'/> <flag name='drive-format'/> <flag name='vga'/> <flag name='0.10'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='migrate-qemu-unix'/> <flag name='chardev'/> <flag name='enable-kvm'/> <flag name='monitor-json'/> @@ -30,7 +27,6 @@ <flag name='vga-qxl'/> <flag name='spice'/> <flag name='vga-none'/> - <flag name='migrate-qemu-fd'/> <flag name='boot-index'/> <flag name='hda-duplex'/> <flag name='drive-aio'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps index 2b86eba..63e1f47 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps @@ -1,13 +1,10 @@ <qemuCaps> - <flag name='migrate-qemu-tcp'/> - <flag name='migrate-qemu-exec'/> <flag name='drive-cache-v2'/> <flag name='drive-format'/> <flag name='vga'/> <flag name='0.10'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='migrate-qemu-unix'/> <flag name='chardev'/> <flag name='enable-kvm'/> <flag name='monitor-json'/> @@ -30,7 +27,6 @@ <flag name='vga-qxl'/> <flag name='spice'/> <flag name='vga-none'/> - <flag name='migrate-qemu-fd'/> <flag name='boot-index'/> <flag name='hda-duplex'/> <flag name='drive-aio'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps index 39133a1..c7c363e 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps @@ -1,13 +1,10 @@ <qemuCaps> - <flag name='migrate-qemu-tcp'/> - <flag name='migrate-qemu-exec'/> <flag name='drive-cache-v2'/> <flag name='drive-format'/> <flag name='vga'/> <flag name='0.10'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='migrate-qemu-unix'/> <flag name='chardev'/> <flag name='enable-kvm'/> <flag name='monitor-json'/> @@ -30,7 +27,6 @@ <flag name='vga-qxl'/> <flag name='spice'/> <flag name='vga-none'/> - <flag name='migrate-qemu-fd'/> <flag name='boot-index'/> <flag name='hda-duplex'/> <flag name='drive-aio'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index 50f5af1..694f671 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -1,13 +1,10 @@ <qemuCaps> - <flag name='migrate-qemu-tcp'/> - <flag name='migrate-qemu-exec'/> <flag name='drive-cache-v2'/> <flag name='drive-format'/> <flag name='vga'/> <flag name='0.10'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='migrate-qemu-unix'/> <flag name='chardev'/> <flag name='enable-kvm'/> <flag name='monitor-json'/> @@ -30,7 +27,6 @@ <flag name='vga-qxl'/> <flag name='spice'/> <flag name='vga-none'/> - <flag name='migrate-qemu-fd'/> <flag name='boot-index'/> <flag name='hda-duplex'/> <flag name='drive-aio'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps index c339dae..69f4a1d 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps @@ -1,13 +1,10 @@ <qemuCaps> - <flag name='migrate-qemu-tcp'/> - <flag name='migrate-qemu-exec'/> <flag name='drive-cache-v2'/> <flag name='drive-format'/> <flag name='vga'/> <flag name='0.10'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='migrate-qemu-unix'/> <flag name='chardev'/> <flag name='enable-kvm'/> <flag name='monitor-json'/> @@ -30,7 +27,6 @@ <flag name='vga-qxl'/> <flag name='spice'/> <flag name='vga-none'/> - <flag name='migrate-qemu-fd'/> <flag name='boot-index'/> <flag name='hda-duplex'/> <flag name='drive-aio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps index 6c5a32c..c0baf7d 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps +++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps @@ -1,13 +1,10 @@ <qemuCaps> - <flag name='migrate-qemu-tcp'/> - <flag name='migrate-qemu-exec'/> <flag name='drive-cache-v2'/> <flag name='drive-format'/> <flag name='vga'/> <flag name='0.10'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='migrate-qemu-unix'/> <flag name='chardev'/> <flag name='enable-kvm'/> <flag name='monitor-json'/> @@ -30,7 +27,6 @@ <flag name='vga-qxl'/> <flag name='spice'/> <flag name='vga-none'/> - <flag name='migrate-qemu-fd'/> <flag name='boot-index'/> <flag name='hda-duplex'/> <flag name='drive-aio'/> diff --git a/tests/qemucaps2xmldata/all_1.6.0-1.caps b/tests/qemucaps2xmldata/all_1.6.0-1.caps index 0f6c22a..62dc749 100644 --- a/tests/qemucaps2xmldata/all_1.6.0-1.caps +++ b/tests/qemucaps2xmldata/all_1.6.0-1.caps @@ -1,13 +1,10 @@ <qemuCaps> - <flag name='migrate-qemu-tcp'/> - <flag name='migrate-qemu-exec'/> <flag name='drive-cache-v2'/> <flag name='drive-format'/> <flag name='vga'/> <flag name='0.10'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='migrate-qemu-unix'/> <flag name='chardev'/> <flag name='enable-kvm'/> <flag name='monitor-json'/> @@ -30,7 +27,6 @@ <flag name='vga-qxl'/> <flag name='spice'/> <flag name='vga-none'/> - <flag name='migrate-qemu-fd'/> <flag name='boot-index'/> <flag name='hda-duplex'/> <flag name='drive-aio'/> diff --git a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps index 15f67d4..fcd91a8 100644 --- a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps +++ b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps @@ -1,13 +1,10 @@ <qemuCaps> - <flag name='migrate-qemu-tcp'/> - <flag name='migrate-qemu-exec'/> <flag name='drive-cache-v2'/> <flag name='drive-format'/> <flag name='vga'/> <flag name='0.10'/> <flag name='mem-path'/> <flag name='drive-serial'/> - <flag name='migrate-qemu-unix'/> <flag name='chardev'/> <flag name='enable-kvm'/> <flag name='monitor-json'/> @@ -30,7 +27,6 @@ <flag name='vga-qxl'/> <flag name='spice'/> <flag name='vga-none'/> - <flag name='migrate-qemu-fd'/> <flag name='boot-index'/> <flag name='hda-duplex'/> <flag name='drive-aio'/> diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 7bc52f1..0745b1d 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -152,8 +152,6 @@ mymain(void) DO_TEST_FULL(name, version, is_kvm, kvm_version, VIR_ERR_OK, __VA_ARGS__) DO_TEST("qemu-0.12.1", 12001, 0, 0, - QEMU_CAPS_MIGRATE_QEMU_TCP, - QEMU_CAPS_MIGRATE_QEMU_EXEC, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL, @@ -162,7 +160,6 @@ mymain(void) QEMU_CAPS_0_10, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_SDL, - QEMU_CAPS_MIGRATE_QEMU_UNIX, QEMU_CAPS_CHARDEV, QEMU_CAPS_BALLOON, QEMU_CAPS_DEVICE, @@ -173,7 +170,6 @@ mymain(void) QEMU_CAPS_NAME_PROCESS, QEMU_CAPS_SMBIOS_TYPE, QEMU_CAPS_VGA_NONE, - QEMU_CAPS_MIGRATE_QEMU_FD, QEMU_CAPS_DRIVE_AIO, QEMU_CAPS_NO_SHUTDOWN, QEMU_CAPS_PCI_ROMBAR, @@ -183,8 +179,6 @@ mymain(void) QEMU_CAPS_VNC); DO_TEST("qemu-kvm-0.12.1.2-rhel60", 12001, 1, 0, QEMU_CAPS_DRIVE_BOOT, - QEMU_CAPS_MIGRATE_QEMU_TCP, - QEMU_CAPS_MIGRATE_QEMU_EXEC, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_KVM, QEMU_CAPS_DRIVE_FORMAT, @@ -194,7 +188,6 @@ mymain(void) QEMU_CAPS_0_10, QEMU_CAPS_PCIDEVICE, QEMU_CAPS_MEM_PATH, - QEMU_CAPS_MIGRATE_QEMU_UNIX, QEMU_CAPS_CHARDEV, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_MONITOR_JSON, @@ -215,7 +208,6 @@ mymain(void) QEMU_CAPS_VGA_QXL, QEMU_CAPS_SPICE, QEMU_CAPS_VGA_NONE, - QEMU_CAPS_MIGRATE_QEMU_FD, QEMU_CAPS_DRIVE_AIO, QEMU_CAPS_DEVICE_SPICEVMC, QEMU_CAPS_PIIX3_USB_UHCI, @@ -240,8 +232,6 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_NET); DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0, QEMU_CAPS_DRIVE_BOOT, - QEMU_CAPS_MIGRATE_QEMU_TCP, - QEMU_CAPS_MIGRATE_QEMU_EXEC, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_KVM, QEMU_CAPS_DRIVE_FORMAT, @@ -252,7 +242,6 @@ mymain(void) QEMU_CAPS_PCIDEVICE, QEMU_CAPS_MEM_PATH, QEMU_CAPS_SDL, - QEMU_CAPS_MIGRATE_QEMU_UNIX, QEMU_CAPS_CHARDEV, QEMU_CAPS_BALLOON, QEMU_CAPS_DEVICE, @@ -267,7 +256,6 @@ mymain(void) QEMU_CAPS_NAME_PROCESS, QEMU_CAPS_SMBIOS_TYPE, QEMU_CAPS_VGA_NONE, - QEMU_CAPS_MIGRATE_QEMU_FD, QEMU_CAPS_DRIVE_AIO, QEMU_CAPS_NO_SHUTDOWN, QEMU_CAPS_PCI_ROMBAR, @@ -277,8 +265,6 @@ mymain(void) QEMU_CAPS_VNC); DO_TEST("qemu-kvm-0.13.0", 13000, 1, 0, QEMU_CAPS_DRIVE_BOOT, - QEMU_CAPS_MIGRATE_QEMU_TCP, - QEMU_CAPS_MIGRATE_QEMU_EXEC, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_KVM, @@ -290,7 +276,6 @@ mymain(void) QEMU_CAPS_PCIDEVICE, QEMU_CAPS_MEM_PATH, QEMU_CAPS_SDL, - QEMU_CAPS_MIGRATE_QEMU_UNIX, QEMU_CAPS_CHARDEV, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_MONITOR_JSON, @@ -312,7 +297,6 @@ mymain(void) QEMU_CAPS_SMBIOS_TYPE, QEMU_CAPS_SPICE, QEMU_CAPS_VGA_NONE, - QEMU_CAPS_MIGRATE_QEMU_FD, QEMU_CAPS_DRIVE_AIO, QEMU_CAPS_DEVICE_SPICEVMC, QEMU_CAPS_PCI_MULTIFUNCTION, @@ -344,8 +328,6 @@ mymain(void) QEMU_CAPS_DEVICE_E1000, QEMU_CAPS_DEVICE_VIRTIO_NET); DO_TEST("qemu-kvm-0.12.1.2-rhel61", 12001, 1, 0, - QEMU_CAPS_MIGRATE_QEMU_TCP, - QEMU_CAPS_MIGRATE_QEMU_EXEC, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_KVM, @@ -356,7 +338,6 @@ mymain(void) QEMU_CAPS_0_10, QEMU_CAPS_PCIDEVICE, QEMU_CAPS_MEM_PATH, - QEMU_CAPS_MIGRATE_QEMU_UNIX, QEMU_CAPS_CHARDEV, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_MONITOR_JSON, @@ -377,7 +358,6 @@ mymain(void) QEMU_CAPS_VGA_QXL, QEMU_CAPS_SPICE, QEMU_CAPS_VGA_NONE, - QEMU_CAPS_MIGRATE_QEMU_FD, QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_DRIVE_AIO, QEMU_CAPS_CCID_PASSTHRU, @@ -408,8 +388,6 @@ mymain(void) QEMU_CAPS_DEVICE_E1000, QEMU_CAPS_DEVICE_VIRTIO_NET); DO_TEST("qemu-kvm-0.12.1.2-rhel62-beta", 12001, 1, 0, - QEMU_CAPS_MIGRATE_QEMU_TCP, - QEMU_CAPS_MIGRATE_QEMU_EXEC, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_KVM, @@ -420,7 +398,6 @@ mymain(void) QEMU_CAPS_0_10, QEMU_CAPS_PCIDEVICE, QEMU_CAPS_MEM_PATH, - QEMU_CAPS_MIGRATE_QEMU_UNIX, QEMU_CAPS_CHARDEV, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_BALLOON, @@ -440,7 +417,6 @@ mymain(void) QEMU_CAPS_VGA_QXL, QEMU_CAPS_SPICE, QEMU_CAPS_VGA_NONE, - QEMU_CAPS_MIGRATE_QEMU_FD, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_DRIVE_AIO, @@ -480,8 +456,6 @@ mymain(void) QEMU_CAPS_DEVICE_E1000, QEMU_CAPS_DEVICE_VIRTIO_NET); DO_TEST("qemu-1.0", 1000000, 0, 0, - QEMU_CAPS_MIGRATE_QEMU_TCP, - QEMU_CAPS_MIGRATE_QEMU_EXEC, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_DRIVE_FORMAT, @@ -491,7 +465,6 @@ mymain(void) QEMU_CAPS_0_10, QEMU_CAPS_MEM_PATH, QEMU_CAPS_SDL, - QEMU_CAPS_MIGRATE_QEMU_UNIX, QEMU_CAPS_CHARDEV, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_MONITOR_JSON, @@ -510,7 +483,6 @@ mymain(void) QEMU_CAPS_VGA_QXL, QEMU_CAPS_SPICE, QEMU_CAPS_VGA_NONE, - QEMU_CAPS_MIGRATE_QEMU_FD, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_DRIVE_AIO, @@ -567,8 +539,6 @@ mymain(void) QEMU_CAPS_DEVICE_E1000, QEMU_CAPS_DEVICE_VIRTIO_NET); DO_TEST("qemu-1.1.0", 1001000, 0, 0, - QEMU_CAPS_MIGRATE_QEMU_TCP, - QEMU_CAPS_MIGRATE_QEMU_EXEC, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_DRIVE_FORMAT, @@ -578,7 +548,6 @@ mymain(void) QEMU_CAPS_0_10, QEMU_CAPS_MEM_PATH, QEMU_CAPS_SDL, - QEMU_CAPS_MIGRATE_QEMU_UNIX, QEMU_CAPS_CHARDEV, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_MONITOR_JSON, @@ -597,7 +566,6 @@ mymain(void) QEMU_CAPS_VGA_QXL, QEMU_CAPS_SPICE, QEMU_CAPS_VGA_NONE, - QEMU_CAPS_MIGRATE_QEMU_FD, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_DRIVE_AIO, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args b/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args index 3cf3205..0f30899 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args @@ -28,4 +28,4 @@ host-nodes=5,host-nodes=7,policy=bind \ -net none \ -serial none \ -parallel none \ --incoming stdio +-incoming fd:7 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args deleted file mode 100644 index 017d19c..0000000 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args +++ /dev/null @@ -1,23 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu \ --name QEMUGuest1 \ --S \ --M pc \ --m 213 \ --smp 1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ --net none \ --serial none \ --parallel none \ --incoming stdio diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml deleted file mode 100644 index b40ca80..0000000 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml +++ /dev/null @@ -1,28 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3d7bca8..081d92a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1255,16 +1255,13 @@ mymain(void) QEMU_CAPS_PCIDEVICE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PCI_ROMBAR); - DO_TEST_FULL("restore-v1", "stdio", 7, 0, QEMU_CAPS_MIGRATE_KVM_STDIO); - DO_TEST_FULL("restore-v2", "stdio", 7, 0, QEMU_CAPS_MIGRATE_QEMU_EXEC); - DO_TEST_FULL("restore-v2", "exec:cat", 7, 0, QEMU_CAPS_MIGRATE_QEMU_EXEC); - DO_TEST_FULL("restore-v2-fd", "stdio", 7, 0, QEMU_CAPS_MIGRATE_QEMU_FD); - DO_TEST_FULL("restore-v2-fd", "fd:7", 7, 0, QEMU_CAPS_MIGRATE_QEMU_FD); - DO_TEST_FULL("migrate", "tcp:10.0.0.1:5000", -1, 0, - QEMU_CAPS_MIGRATE_QEMU_TCP); + DO_TEST_FULL("restore-v2", "exec:cat", 7, 0, NONE); + DO_TEST_FULL("restore-v2-fd", "stdio", 7, 0, NONE); + DO_TEST_FULL("restore-v2-fd", "fd:7", 7, 0, NONE); + DO_TEST_FULL("migrate", "tcp:10.0.0.1:5000", -1, 0, NONE); DO_TEST_LINUX_FULL("migrate-numa-unaligned", "stdio", 7, 0, - QEMU_CAPS_MIGRATE_KVM_STDIO, QEMU_CAPS_NUMA, + QEMU_CAPS_NUMA, QEMU_CAPS_OBJECT_MEMORY_RAM); DO_TEST("qemu-ns", NONE); -- 2.5.0

As of QEMU 0.10.0 the -drive format= parameter was added, so the QEMU driver can assume it is always available. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 8 +- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 9 +- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 - tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 - tests/qemucaps2xmldata/all_1.6.0-1.caps | 1 - tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps | 1 - tests/qemuhelptest.c | 8 - .../qemuxml2argv-aarch64-aavmf-virtio-mmio.args | 2 +- .../qemuxml2argv-aarch64-cpu-passthrough.args | 2 +- .../qemuxml2argv-aarch64-kvm-32-on-64.args | 2 +- .../qemuxml2argv-aarch64-mmio-default-pci.args | 2 +- .../qemuxml2argv-aarch64-virt-virtio.args | 2 +- .../qemuxml2argv-aarch64-virtio-pci.args | 2 +- .../qemuxml2argv-arm-vexpressa9-basic.args | 2 +- .../qemuxml2argv-arm-vexpressa9-virtio.args | 2 +- .../qemuxml2argv-arm-virt-virtio.args | 2 +- .../qemuxml2argv-balloon-device-auto.args | 2 +- .../qemuxml2argv-balloon-device-period.args | 2 +- .../qemuxml2argv-balloon-device.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-bios.args | 2 +- .../qemuxml2argv-blkdeviotune-max.args | 8 +- .../qemuxml2argv-blkdeviotune.args | 8 +- .../qemuxml2argv-blkiotune-device.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 2 +- .../qemuxml2argv-boot-complex-bootindex.args | 14 +- .../qemuxml2argv-boot-complex.args | 14 +- .../qemuxml2argv-boot-floppy-q35.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-floppy.args | 4 +- ...xml2argv-boot-menu-disable-drive-bootindex.args | 2 +- .../qemuxml2argv-boot-menu-disable-drive.args | 2 +- .../qemuxml2argv-boot-menu-disable.args | 2 +- ...qemuxml2argv-boot-menu-enable-with-timeout.args | 2 +- .../qemuxml2argv-boot-menu-enable.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-multi.args | 2 +- .../qemuxml2argv-boot-network.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-order.args | 9 +- .../qemuxml2argvdata/qemuxml2argv-boot-strict.args | 14 +- .../qemuxml2argv-bootindex-floppy-q35.args | 2 +- .../qemuxml2argv-channel-guestfwd.args | 2 +- .../qemuxml2argv-channel-spicevmc-old.args | 2 +- .../qemuxml2argv-channel-spicevmc.args | 2 +- .../qemuxml2argv-channel-virtio-auto.args | 2 +- .../qemuxml2argv-channel-virtio-autoadd.args | 2 +- .../qemuxml2argv-channel-virtio-autoassign.args | 2 +- .../qemuxml2argv-channel-virtio-default.args | 2 +- .../qemuxml2argv-channel-virtio-state.args | 2 +- .../qemuxml2argv-channel-virtio-unix.args | 2 +- .../qemuxml2argv-channel-virtio.args | 2 +- .../qemuxml2argv-clock-catchup.args | 2 +- .../qemuxml2argv-clock-france.args | 2 +- .../qemuxml2argv-clock-hpet-off.args | 2 +- ...muxml2argv-clock-localtime-basis-localtime.args | 2 +- .../qemuxml2argv-clock-localtime.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args | 2 +- .../qemuxml2argv-clock-variable.args | 2 +- .../qemuxml2argv-console-compat-auto.args | 2 +- .../qemuxml2argv-console-compat-chardev.args | 2 +- .../qemuxml2argv-console-compat.args | 2 +- .../qemuxml2argv-console-sclp.args | 2 +- .../qemuxml2argv-console-virtio-ccw.args | 2 +- .../qemuxml2argv-console-virtio-many.args | 2 +- .../qemuxml2argv-console-virtio-s390.args | 2 +- .../qemuxml2argv-console-virtio.args | 2 +- .../qemuxml2argv-controller-order.args | 5 +- ...qemuxml2argv-cpu-host-passthrough-features.args | 2 +- .../qemuxml2argv-cputune-zero-shares.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-cputune.args | 2 +- .../qemuxml2argv-disk-blockio.args | 4 +- .../qemuxml2argv-disk-cdrom-empty.args | 4 +- .../qemuxml2argv-disk-cdrom-network-ftp.args | 2 +- .../qemuxml2argv-disk-cdrom-network-ftps.args | 2 +- .../qemuxml2argv-disk-cdrom-network-http.args | 2 +- .../qemuxml2argv-disk-cdrom-network-https.args | 2 +- .../qemuxml2argv-disk-cdrom-network-tftp.args | 2 +- ...qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 4 +- .../qemuxml2argv-disk-cdrom-tray.args | 7 +- .../qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 4 +- .../qemuxml2argv-disk-copy_on_read.args | 4 +- .../qemuxml2argv-disk-drive-boot-cdrom.args | 4 +- .../qemuxml2argv-disk-drive-boot-disk.args | 4 +- .../qemuxml2argv-disk-drive-discard.args | 4 +- ...muxml2argv-disk-drive-network-rbd-ceph-env.args | 2 +- .../qemuxml2argv-disk-drive-no-boot.args | 7 +- .../qemuxml2argv-disk-drive-readonly-disk.args | 5 +- ...qemuxml2argv-disk-drive-readonly-no-device.args | 4 +- .../qemuxml2argv-disk-floppy-pseries.args | 6 +- ...emuxml2argv-disk-floppy-tray-no-device-cap.args | 6 +- .../qemuxml2argv-disk-floppy-tray.args | 6 +- .../qemuxml2argvdata/qemuxml2argv-disk-floppy.args | 6 +- .../qemuxml2argv-disk-geometry.args | 4 +- .../qemuxml2argv-disk-ide-drive-split.args | 4 +- .../qemuxml2argv-disk-ide-wwn.args | 2 +- .../qemuxml2argv-disk-ioeventfd.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-disk-iscsi.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-many.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-disk-order.args | 9 +- .../qemuxml2argv-disk-sata-device.args | 2 +- .../qemuxml2argv-disk-scsi-device-auto.args | 4 +- .../qemuxml2argv-disk-scsi-device.args | 4 +- .../qemuxml2argv-disk-scsi-disk-split.args | 8 +- .../qemuxml2argv-disk-scsi-disk-vpd.args | 4 +- .../qemuxml2argv-disk-scsi-disk-wwn.args | 4 +- .../qemuxml2argv-disk-scsi-lun-passthrough.args | 4 +- .../qemuxml2argv-disk-scsi-megasas.args | 4 +- .../qemuxml2argv-disk-scsi-virtio-scsi.args | 4 +- .../qemuxml2argv-disk-scsi-vscsi.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-disk-serial.args | 2 +- .../qemuxml2argv-disk-source-pool-mode.args | 2 +- .../qemuxml2argv-disk-source-pool.args | 4 +- .../qemuxml2argv-disk-usb-device-removable.args | 4 +- .../qemuxml2argv-disk-usb-device.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args | 2 +- .../qemuxml2argv-disk-virtio-ccw-many.args | 8 +- .../qemuxml2argv-disk-virtio-ccw.args | 4 +- .../qemuxml2argv-disk-virtio-s390.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-ccw.args | 4 +- .../qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-ioeventfd.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-max_sectors.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-num_queues.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args | 8 +- .../qemuxml2argv-encrypted-disk.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-event_idx.args | 5 +- .../qemuxml2argv-fips-enabled.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-fs9p.args | 2 +- .../qemuxml2argv-graphics-sdl-fullscreen.args | 2 +- .../qemuxml2argv-graphics-sdl.args | 2 +- ...emuxml2argv-graphics-spice-agent-file-xfer.args | 2 +- .../qemuxml2argv-graphics-spice-agentmouse.args | 2 +- .../qemuxml2argv-graphics-spice-compression.args | 2 +- .../qemuxml2argv-graphics-spice-qxl-vga.args | 2 +- .../qemuxml2argv-graphics-spice-sasl.args | 2 +- .../qemuxml2argv-graphics-spice-timeout.args | 5 +- .../qemuxml2argv-graphics-spice.args | 2 +- .../qemuxml2argv-graphics-vnc-policy.args | 2 +- .../qemuxml2argv-graphics-vnc-sasl.args | 2 +- .../qemuxml2argv-graphics-vnc-socket.args | 2 +- .../qemuxml2argv-graphics-vnc-tls.args | 2 +- .../qemuxml2argv-graphics-vnc.args | 2 +- .../qemuxml2argv-hostdev-pci-address-device.args | 2 +- .../qemuxml2argv-hostdev-pci-address.args | 2 +- .../qemuxml2argv-hostdev-scsi-boot.args | 2 +- .../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args | 2 +- .../qemuxml2argv-hostdev-scsi-lsi-iscsi.args | 2 +- .../qemuxml2argv-hostdev-scsi-lsi.args | 2 +- .../qemuxml2argv-hostdev-scsi-readonly.args | 2 +- ...emuxml2argv-hostdev-scsi-virtio-iscsi-auth.args | 2 +- .../qemuxml2argv-hostdev-scsi-virtio-iscsi.args | 2 +- .../qemuxml2argv-hostdev-scsi-virtio-scsi.args | 2 +- ...muxml2argv-hostdev-usb-address-device-boot.args | 2 +- .../qemuxml2argv-hostdev-usb-address-device.args | 2 +- .../qemuxml2argv-hostdev-usb-address.args | 2 +- .../qemuxml2argv-hostdev-vfio-multidomain.args | 2 +- .../qemuxml2argv-hostdev-vfio.args | 2 +- .../qemuxml2argv-hugepages-numa.args | 5 +- .../qemuxml2argv-hugepages-pages.args | 2 +- .../qemuxml2argv-hugepages-pages2.args | 2 +- .../qemuxml2argv-hugepages-pages3.args | 2 +- .../qemuxml2argv-hugepages-pages5.args | 2 +- .../qemuxml2argv-hugepages-pages6.args | 2 +- .../qemuxml2argv-hugepages-shared.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 2 +- .../qemuxml2argv-input-usbmouse-addr.args | 2 +- .../qemuxml2argv-input-usbmouse.args | 2 +- .../qemuxml2argv-input-usbtablet.args | 2 +- .../qemuxml2argv-iothreads-disk-virtio-ccw.args | 4 +- .../qemuxml2argv-iothreads-disk.args | 8 +- .../qemuxml2argv-iothreads-ids-partial.args | 2 +- .../qemuxml2argv-iothreads-ids.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-iothreads.args | 2 +- .../qemuxml2argv-kvm-pit-delay.args | 2 +- .../qemuxml2argv-kvm-pit-device.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-lease.args | 2 +- .../qemuxml2argv-machine-aeskeywrap-off-argv.args | 3 +- .../qemuxml2argv-machine-aeskeywrap-off-cap.args | 2 +- .../qemuxml2argv-machine-aeskeywrap-off-caps.args | 2 +- .../qemuxml2argv-machine-aeskeywrap-on-argv.args | 3 +- .../qemuxml2argv-machine-aeskeywrap-on-cap.args | 2 +- .../qemuxml2argv-machine-aeskeywrap-on-caps.args | 2 +- .../qemuxml2argv-machine-aliases1.args | 2 +- .../qemuxml2argv-machine-aliases2.args | 2 +- .../qemuxml2argv-machine-core-off.args | 2 +- .../qemuxml2argv-machine-core-on.args | 2 +- .../qemuxml2argv-machine-deakeywrap-off-argv.args | 3 +- .../qemuxml2argv-machine-deakeywrap-off-cap.args | 2 +- .../qemuxml2argv-machine-deakeywrap-off-caps.args | 2 +- .../qemuxml2argv-machine-deakeywrap-on-argv.args | 3 +- .../qemuxml2argv-machine-deakeywrap-on-cap.args | 2 +- .../qemuxml2argv-machine-deakeywrap-on-caps.args | 2 +- .../qemuxml2argv-machine-keywrap-none-argv.args | 3 +- .../qemuxml2argv-machine-keywrap-none-caps.args | 2 +- .../qemuxml2argv-machine-keywrap-none.args | 2 +- .../qemuxml2argv-machine-usb-opt.args | 2 +- .../qemuxml2argv-machine-vmport-opt.args | 2 +- .../qemuxml2argv-memory-hotplug-dimm-addr.args | 2 +- .../qemuxml2argv-memory-hotplug-dimm.args | 2 +- .../qemuxml2argv-memory-hotplug.args | 2 +- .../qemuxml2argv-memtune-unlimited.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-memtune.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-metadata.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-migrate.args | 2 +- .../qemuxml2argv-minimal-msg-timestamp.args | 2 +- .../qemuxml2argv-minimal-s390.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-minimal.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args | 2 +- .../qemuxml2argv-misc-disable-s3.args | 2 +- .../qemuxml2argv-misc-disable-suspends.args | 2 +- .../qemuxml2argv-misc-enable-s4.args | 2 +- .../qemuxml2argv-misc-no-reboot.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args | 2 +- .../qemuxml2argv-monitor-json.args | 2 +- .../qemuxml2argv-multifunction-pci-device.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-net-client.args | 2 +- .../qemuxml2argv-net-eth-ifname.args | 2 +- .../qemuxml2argv-net-eth-names.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 2 +- .../qemuxml2argv-net-hostdev-multidomain.args | 2 +- .../qemuxml2argv-net-hostdev-vfio-multidomain.args | 2 +- .../qemuxml2argv-net-hostdev-vfio.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-net-hostdev.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-net-server.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-udp.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 2 +- .../qemuxml2argv-net-vhostuser-multiq.args | 2 +- .../qemuxml2argv-net-vhostuser.args | 2 +- .../qemuxml2argv-net-virtio-device.args | 2 +- .../qemuxml2argv-net-virtio-disable-offloads.args | 2 +- .../qemuxml2argv-net-virtio-netdev.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-net-virtio.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-no-shutdown.args | 2 +- .../qemuxml2argv-nographics-vga.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-nographics.args | 2 +- .../qemuxml2argv-nosharepages.args | 2 +- ...qemuxml2argv-numad-auto-memory-vcpu-cpuset.args | 2 +- ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 2 +- ...muxml2argv-numad-auto-vcpu-static-numatune.args | 2 +- ...qemuxml2argv-numad-static-memory-auto-vcpu.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-numad.args | 2 +- ...qemuxml2argv-numatune-auto-nodeset-invalid.args | 2 +- .../qemuxml2argv-numatune-memory.args | 2 +- .../qemuxml2argv-panic-no-address.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-panic.args | 2 +- .../qemuxml2argv-parallel-parport-chardev.args | 2 +- .../qemuxml2argv-parallel-tcp-chardev.args | 2 +- .../qemuxml2argv-parallel-tcp.args | 2 +- .../qemuxml2argv-pci-autoadd-addr.args | 2 +- .../qemuxml2argv-pci-autoadd-idx.args | 2 +- .../qemuxml2argv-pci-bridge-many-disks.args | 315 ++++++++++++++------- tests/qemuxml2argvdata/qemuxml2argv-pci-many.args | 86 ++++-- tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args | 2 +- .../qemuxml2argv-pci-serial-dev-chardev.args | 2 +- .../qemuxml2argv-pcie-root-port.args | 2 +- .../qemuxml2argv-pcie-switch-downstream-port.args | 2 +- .../qemuxml2argv-pcie-switch-upstream-port.args | 2 +- .../qemuxml2argv-pcihole64-q35.args | 2 +- .../qemuxml2argv-pseries-vio-user-assigned.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 2 +- .../qemuxml2argv-qemu-ns-no-env.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args | 2 +- .../qemuxml2argv-restore-v2-fd.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-restore-v2.args | 2 +- ...muxml2argv-s390-allow-bogus-usb-controller.args | 2 +- .../qemuxml2argv-s390-allow-bogus-usb-none.args | 2 +- .../qemuxml2argv-seclabel-dac-none.args | 2 +- .../qemuxml2argv-seclabel-dynamic-baselabel.args | 2 +- .../qemuxml2argv-seclabel-dynamic-labelskip.args | 2 +- .../qemuxml2argv-seclabel-dynamic-override.args | 4 +- .../qemuxml2argv-seclabel-dynamic-relabel.args | 2 +- .../qemuxml2argv-seclabel-dynamic.args | 2 +- .../qemuxml2argv-seclabel-none.args | 2 +- .../qemuxml2argv-seclabel-static-labelskip.args | 2 +- .../qemuxml2argv-seclabel-static-relabel.args | 2 +- .../qemuxml2argv-seclabel-static.args | 2 +- .../qemuxml2argv-serial-dev-chardev-iobase.args | 2 +- .../qemuxml2argv-serial-dev-chardev.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-dev.args | 2 +- .../qemuxml2argv-serial-file-chardev.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-file.args | 2 +- .../qemuxml2argv-serial-many-chardev.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-many.args | 2 +- .../qemuxml2argv-serial-pty-chardev.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-pty.args | 2 +- .../qemuxml2argv-serial-spiceport-nospice.args | 2 +- .../qemuxml2argv-serial-spiceport.args | 2 +- .../qemuxml2argv-serial-tcp-chardev.args | 2 +- .../qemuxml2argv-serial-tcp-telnet-chardev.args | 2 +- .../qemuxml2argv-serial-tcp-telnet.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-tcp.args | 2 +- .../qemuxml2argv-serial-udp-chardev.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-udp.args | 2 +- .../qemuxml2argv-serial-unix-chardev.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-unix.args | 2 +- .../qemuxml2argv-serial-vc-chardev.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-smp.args | 2 +- .../qemuxml2argv-sound-device.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-sound.args | 2 +- .../qemuxml2argv-video-device-pciaddr-default.args | 2 +- .../qemuxml2argv-video-qxl-device-vgamem.args | 2 +- .../qemuxml2argv-video-qxl-device.args | 2 +- .../qemuxml2argv-video-qxl-nodevice.args | 3 +- .../qemuxml2argv-video-qxl-sec-device-vgamem.args | 2 +- .../qemuxml2argv-video-qxl-sec-device.args | 2 +- .../qemuxml2argv-video-vga-device-vgamem.args | 2 +- .../qemuxml2argv-video-vga-device.args | 2 +- .../qemuxml2argv-video-vga-nodevice.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-virtio-lun.args | 4 +- .../qemuxml2argv-virtio-rng-ccw.args | 2 +- .../qemuxml2argv-watchdog-device.args | 2 +- .../qemuxml2argv-watchdog-diag288.args | 2 +- .../qemuxml2argv-watchdog-dump.args | 2 +- .../qemuxml2argv-watchdog-injectnmi.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-watchdog.args | 2 +- tests/qemuxml2argvtest.c | 78 ++--- .../qemuxmlns-qemu-ns-commandline-ns0.args | 2 +- .../qemuxmlns-qemu-ns-commandline-ns1.args | 2 +- .../qemuxmlns-qemu-ns-commandline.args | 2 +- .../qemuxmlns-qemu-ns-domain-commandline-ns0.args | 2 +- .../qemuxmlns-qemu-ns-domain-commandline.args | 2 +- .../qemuxmlns-qemu-ns-domain-ns0.args | 2 +- tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args | 2 +- 333 files changed, 730 insertions(+), 624 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8f25a57..dfb9c9c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1102,8 +1102,6 @@ virQEMUCapsComputeCmdFlags(const char *help, if (memmem(cache, p - cache, "unsafe", sizeof("unsafe") - 1)) virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_UNSAFE); } - if (strstr(help, "format=")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_FORMAT); if (strstr(help, "readonly=")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_READONLY); if (strstr(help, "aio=threads|native")) @@ -3170,7 +3168,6 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_FORMAT); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VGA); virQEMUCapsSet(qemuCaps, QEMU_CAPS_0_10); virQEMUCapsSet(qemuCaps, QEMU_CAPS_MEM_PATH); @@ -3885,9 +3882,8 @@ virQEMUCapsFillDomainLoaderCaps(virQEMUCapsPtr qemuCaps, VIR_DOMAIN_CAPS_ENUM_SET(capsLoader->type, VIR_DOMAIN_LOADER_TYPE_ROM); - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_FORMAT)) - VIR_DOMAIN_CAPS_ENUM_SET(capsLoader->type, - VIR_DOMAIN_LOADER_TYPE_PFLASH); + VIR_DOMAIN_CAPS_ENUM_SET(capsLoader->type, + VIR_DOMAIN_LOADER_TYPE_PFLASH); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_READONLY)) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 2324f71..e5cab61 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -64,7 +64,7 @@ typedef enum { X_QEMU_CAPS_MIGRATE_QEMU_EXEC, /* have qemu exec migration */ X_QEMU_CAPS_DRIVE_CACHE_V2, /* cache= flag wanting new v2 values */ QEMU_CAPS_KVM, /* Whether KVM is enabled by default */ - QEMU_CAPS_DRIVE_FORMAT, /* Is -drive format= avail */ + X_QEMU_CAPS_DRIVE_FORMAT, /* Is -drive format= avail */ /* 15 */ QEMU_CAPS_VGA, /* Is -vga avail */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7223098..0e2b5e0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3857,8 +3857,7 @@ qemuBuildDriveStr(virConnectPtr conn, goto error; } if (disk->src->format > 0 && - disk->src->type != VIR_STORAGE_TYPE_DIR && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_FORMAT)) + disk->src->type != VIR_STORAGE_TYPE_DIR) virBufferAsprintf(&opt, ",format=%s", virStorageFileFormatTypeToString(disk->src->format)); @@ -9048,12 +9047,6 @@ qemuBuildDomainLoaderCommandLine(virCommandPtr cmd, break; case VIR_DOMAIN_LOADER_TYPE_PFLASH: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_FORMAT)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("this QEMU binary doesn't support passing " - "drive format")); - goto cleanup; - } if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_ACPI) && def->features[VIR_DOMAIN_FEATURE_ACPI] != VIR_TRISTATE_SWITCH_ON) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps index 87a2ca1..54646f9 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='drive-format'/> <flag name='vga'/> <flag name='0.10'/> <flag name='mem-path'/> diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps index aa2200a..4dbd15f 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='drive-format'/> <flag name='vga'/> <flag name='0.10'/> <flag name='mem-path'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps index 9d503a0..36c1f41 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='drive-format'/> <flag name='vga'/> <flag name='0.10'/> <flag name='mem-path'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps index bb5d0d6..cffa02a 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='drive-format'/> <flag name='vga'/> <flag name='0.10'/> <flag name='mem-path'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index e8dcc8d..abbc52b 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='drive-format'/> <flag name='vga'/> <flag name='0.10'/> <flag name='mem-path'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps index 7627aee..025a8c1 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='drive-format'/> <flag name='vga'/> <flag name='0.10'/> <flag name='mem-path'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps index dce0870..fdd6309 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps +++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='drive-format'/> <flag name='vga'/> <flag name='0.10'/> <flag name='mem-path'/> diff --git a/tests/qemucaps2xmldata/all_1.6.0-1.caps b/tests/qemucaps2xmldata/all_1.6.0-1.caps index c699a65..f9f97fd 100644 --- a/tests/qemucaps2xmldata/all_1.6.0-1.caps +++ b/tests/qemucaps2xmldata/all_1.6.0-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='drive-format'/> <flag name='vga'/> <flag name='0.10'/> <flag name='mem-path'/> diff --git a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps index 2f89a72..495ef5f 100644 --- a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps +++ b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='drive-format'/> <flag name='vga'/> <flag name='0.10'/> <flag name='mem-path'/> diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index a458ff0..28f0662 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -152,7 +152,6 @@ mymain(void) DO_TEST_FULL(name, version, is_kvm, kvm_version, VIR_ERR_OK, __VA_ARGS__) DO_TEST("qemu-0.12.1", 12001, 0, 0, - QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_VGA, @@ -179,7 +178,6 @@ mymain(void) DO_TEST("qemu-kvm-0.12.1.2-rhel60", 12001, 1, 0, QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_KVM, - QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_VGA, @@ -231,7 +229,6 @@ mymain(void) DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0, QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_KVM, - QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_VGA, @@ -264,7 +261,6 @@ mymain(void) QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_KVM, - QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_VGA, @@ -326,7 +322,6 @@ mymain(void) DO_TEST("qemu-kvm-0.12.1.2-rhel61", 12001, 1, 0, QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_KVM, - QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_VGA, @@ -385,7 +380,6 @@ mymain(void) DO_TEST("qemu-kvm-0.12.1.2-rhel62-beta", 12001, 1, 0, QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_KVM, - QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_VGA, @@ -451,7 +445,6 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_NET); DO_TEST("qemu-1.0", 1000000, 0, 0, QEMU_CAPS_DRIVE_CACHE_UNSAFE, - QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_VGA, @@ -533,7 +526,6 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_NET); DO_TEST("qemu-1.1.0", 1001000, 0, 0, QEMU_CAPS_DRIVE_CACHE_UNSAFE, - QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_VGA, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args index 09dac0c..ec5b9a5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args @@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \ -dtb /aarch64.dtb \ -device virtio-serial-device,id=virtio-serial0 \ -usb \ --drive file=/aarch64.raw,if=none,id=drive-virtio-disk0 \ +-drive file=/aarch64.raw,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ -net user,vlan=0,name=hostnet0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args index 3ded3e9..3feb754 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args @@ -18,5 +18,5 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -boot c \ -usb \ --drive file=/aarch64.raw,if=none,id=drive-virtio-disk0 \ +-drive file=/aarch64.raw,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args index 3397c33..489cf13 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args @@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \ -initrd /arm.initrd \ -append 'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \ -usb \ --drive file=/arm.raw,if=none,id=drive-virtio-disk0 \ +-drive file=/arm.raw,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ -net user,vlan=0,name=hostnet0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args index 8fa0dd0..8968da2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args @@ -25,7 +25,7 @@ QEMU_AUDIO_DRV=none \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ -device virtio-serial-device,id=virtio-serial0 \ -usb \ --drive file=/aarch64.raw,if=none,id=drive-virtio-disk0 \ +-drive file=/aarch64.raw,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ -net user,vlan=0,name=hostnet0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args index fbd9234..b4863fc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args @@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \ -dtb /aarch64.dtb \ -device virtio-serial-device,id=virtio-serial0 \ -usb \ --drive file=/aarch64.raw,if=none,id=drive-virtio-disk0 \ +-drive file=/aarch64.raw,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ -net user,vlan=0,name=hostnet0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args index 053a6d8..a803ebd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args @@ -25,7 +25,7 @@ QEMU_AUDIO_DRV=none \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ -device virtio-scsi-pci,id=scsi0,bus=pcie.0,addr=0x3 \ -usb \ --drive file=/aarch64.raw,if=none,id=drive-scsi0-0-0-0 \ +-drive file=/aarch64.raw,if=none,id=drive-scsi0-0-0-0,format=raw \ -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ id=scsi0-0-0-0 \ -device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:09:a4:37,bus=pcie.0,addr=0x2 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args index 892654a..5f26d16 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args @@ -22,7 +22,7 @@ QEMU_AUDIO_DRV=none \ 115200n8 rw root=/dev/mmcblk0p3 rootwait physmap.enabled=0' \ -dtb /arm.dtb \ -usb \ --drive file=/arm.raw,if=sd,index=0 \ +-drive file=/arm.raw,if=sd,index=0,format=raw \ -net nic,macaddr=52:54:00:09:a4:37,vlan=0,model=lan9118,name=net0 \ -net user,vlan=0,name=hostnet0 \ -serial pty diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args index c19a808..fbff07d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args @@ -22,7 +22,7 @@ QEMU_AUDIO_DRV=none \ -dtb /arm.dtb \ -device virtio-serial-device,id=virtio-serial0 \ -usb \ --drive file=/arm.raw,if=none,id=drive-virtio-disk0 \ +-drive file=/arm.raw,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ -net user,vlan=0,name=hostnet0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args index b3f9ab3..9c98444 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args @@ -22,7 +22,7 @@ QEMU_AUDIO_DRV=none \ -dtb /arm.dtb \ -device virtio-serial-device,id=virtio-serial0 \ -usb \ --drive file=/arm.raw,if=none,id=drive-virtio-disk0 \ +-drive file=/arm.raw,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ -net user,vlan=0,name=hostnet0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args index 4deb0ec..9f6e0d3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args @@ -18,6 +18,6 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args index bfe81a3..8789386 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args @@ -18,6 +18,6 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args index bfe81a3..8789386 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args @@ -18,6 +18,6 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.args b/tests/qemuxml2argvdata/qemuxml2argv-bios.args index aba184e..0f0f73c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bios.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.args @@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -serial pty \ -device usb-tablet,id=input0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args index a7f75b6..5976153 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args @@ -17,11 +17,11 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,cache=none,bps=5000,\ -iops=6000,bps_max=10000,iops_max=11000 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=qcow2,\ +cache=none,bps=5000,iops=6000,bps_max=10000,iops_max=11000 \ -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=none,\ -bps_rd=5000,bps_wr=5500,iops_rd=3500,iops_wr=4000,bps_rd_max=6000,\ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-1,format=qcow2,\ +cache=none,bps_rd=5000,bps_wr=5500,iops_rd=3500,iops_wr=4000,bps_rd_max=6000,\ bps_wr_max=6500,iops_rd_max=7000,iops_wr_max=7500,iops_size=2000 \ -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args index 81f7f1f..4a4e156 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args @@ -17,10 +17,10 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,cache=none,bps=5000,\ -iops=6000 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=qcow2,\ +cache=none,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=none,\ -bps_rd=5000,bps_wr=5000,iops=7000 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-1,format=qcow2,\ +cache=none,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 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args index 7a531fb..6f74a49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args index 7a531fb..6f74a49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args index 176791e..71f9ac5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot d \ -usb \ --drive file=/dev/cdrom,if=ide,media=cdrom,bus=1,unit=0 \ +-drive file=/dev/cdrom,if=ide,media=cdrom,bus=1,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args index 186a44d..18a0b8c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args @@ -16,22 +16,22 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -usb \ --drive file=/tmp/vda.img,if=none,id=drive-virtio-disk0 \ +-drive file=/tmp/vda.img,if=none,id=drive-virtio-disk0,format=raw \ -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 \ +-drive file=/tmp/vdb.img,if=none,id=drive-virtio-disk1,format=raw \ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,\ id=virtio-disk1 \ --drive file=/dev/HostVG/hda,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/hda,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=/dev/HostVG/hdb,if=none,id=drive-ide0-0-1 \ +-drive file=/dev/HostVG/hdb,if=none,id=drive-ide0-0-1,format=raw \ -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive file=/dev/HostVG/hdc,if=none,media=cdrom,id=drive-ide0-1-0 \ +-drive file=/dev/HostVG/hdc,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \ -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 \ +-drive file=/dev/fd0,if=none,id=drive-fdc0-0-0,format=raw \ -global isa-fdc.driveA=drive-fdc0-0-0 \ -global isa-fdc.bootindexA=4 \ --drive file=/dev/fd1,if=none,id=drive-fdc0-0-1 \ +-drive file=/dev/fd1,if=none,id=drive-fdc0-0-1,format=raw \ -global isa-fdc.driveB=drive-fdc0-0-1 \ -device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x3,\ bootindex=2 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args index d7d4a53..5215d27 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args @@ -17,21 +17,21 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot dnca \ -usb \ --drive file=/tmp/vda.img,if=none,id=drive-virtio-disk0,boot=on \ +-drive file=/tmp/vda.img,if=none,id=drive-virtio-disk0,boot=on,format=raw \ -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 \ +-drive file=/tmp/vdb.img,if=none,id=drive-virtio-disk1,format=raw \ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,\ id=virtio-disk1 \ --drive file=/dev/HostVG/hda,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/hda,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=/dev/HostVG/hdb,if=none,id=drive-ide0-0-1 \ +-drive file=/dev/HostVG/hdb,if=none,id=drive-ide0-0-1,format=raw \ -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive file=/dev/HostVG/hdc,if=none,media=cdrom,id=drive-ide0-1-0 \ +-drive file=/dev/HostVG/hdc,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --drive file=/dev/fd0,if=none,id=drive-fdc0-0-0 \ +-drive file=/dev/fd0,if=none,id=drive-fdc0-0-0,format=raw \ -global isa-fdc.driveA=drive-fdc0-0-0 \ --drive file=/dev/fd1,if=none,id=drive-fdc0-0-1 \ +-drive file=/dev/fd1,if=none,id=drive-fdc0-0-1,format=raw \ -global isa-fdc.driveB=drive-fdc0-0-1 \ -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 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args index d60bcf6..90c97c9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args @@ -18,6 +18,6 @@ QEMU_AUDIO_DRV=none \ -boot a \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ --drive file=/tmp/firmware.img,if=none,id=drive-fdc0-0-0 \ +-drive file=/tmp/firmware.img,if=none,id=drive-fdc0-0-0,format=raw \ -device isa-fdc,driveA=drive-fdc0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args index 4b55b6b..8cde686 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args @@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot a \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ --drive file=/tmp/firmware.img,if=floppy,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ +-drive file=/tmp/firmware.img,if=floppy,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args index 61d72bc..62dabe1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args @@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot menu=off \ -usb \ --drive file=/dev/cdrom,if=none,media=cdrom,id=drive-ide0-1-0 \ +-drive file=/dev/cdrom,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args index 8115545..441f8fd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args @@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot order=d,menu=off \ -usb \ --drive file=/dev/cdrom,if=none,media=cdrom,id=drive-ide0-1-0 \ +-drive file=/dev/cdrom,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args index 5864859..8d3aece 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot order=d,menu=off \ -usb \ --drive file=/dev/cdrom,if=ide,media=cdrom,bus=1,unit=0 \ +-drive file=/dev/cdrom,if=ide,media=cdrom,bus=1,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args index 1f3727f..15b188f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args @@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot order=d,menu=on,splash-time=3000 \ -usb \ --drive file=/dev/cdrom,if=none,media=cdrom,id=drive-ide0-1-0 \ +-drive file=/dev/cdrom,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args index 1b4f3d0..d640b18 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args @@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot order=d,menu=on \ -usb \ --drive file=/dev/cdrom,if=none,media=cdrom,id=drive-ide0-1-0 \ +-drive file=/dev/cdrom,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args index 9a2a178..710249d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot order=dcna,menu=on \ -usb \ --drive file=/dev/cdrom,if=ide,media=cdrom,bus=1,unit=0 \ +-drive file=/dev/cdrom,if=ide,media=cdrom,bus=1,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args index 108bea6..692d1e2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot n \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args index 629316f..49c427f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args @@ -16,14 +16,15 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -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 \ +-drive file=/root/boot.iso,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ --drive file=sheepdog:example.org:6000:image,if=none,id=drive-virtio-disk0 \ +-drive file=sheepdog:example.org:6000:image,if=none,id=drive-virtio-disk0,\ +format=raw \ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ id=virtio-disk0,bootindex=3 \ --drive file=/dev/null,if=none,id=drive-fdc0-0-1 \ +-drive file=/dev/null,if=none,id=drive-fdc0-0-1,format=raw \ -global isa-fdc.driveB=drive-fdc0-0-1 \ -global isa-fdc.bootindexB=4 \ -device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args index 2dc0c79..a8f54bc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args @@ -17,22 +17,22 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot strict=on \ -usb \ --drive file=/tmp/vda.img,if=none,id=drive-virtio-disk0 \ +-drive file=/tmp/vda.img,if=none,id=drive-virtio-disk0,format=raw \ -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 \ +-drive file=/tmp/vdb.img,if=none,id=drive-virtio-disk1,format=raw \ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,\ id=virtio-disk1 \ --drive file=/dev/HostVG/hda,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/hda,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=/dev/HostVG/hdb,if=none,id=drive-ide0-0-1 \ +-drive file=/dev/HostVG/hdb,if=none,id=drive-ide0-0-1,format=raw \ -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive file=/dev/HostVG/hdc,if=none,media=cdrom,id=drive-ide0-1-0 \ +-drive file=/dev/HostVG/hdc,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \ -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 \ +-drive file=/dev/fd0,if=none,id=drive-fdc0-0-0,format=raw \ -global isa-fdc.driveA=drive-fdc0-0-0 \ -global isa-fdc.bootindexA=4 \ --drive file=/dev/fd1,if=none,id=drive-fdc0-0-1 \ +-drive file=/dev/fd1,if=none,id=drive-fdc0-0-1,format=raw \ -global isa-fdc.driveB=drive-fdc0-0-1 \ -device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x3,\ bootindex=2 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args index be7763c..797db09 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args @@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ --drive file=/tmp/firmware.img,if=none,id=drive-fdc0-0-0 \ +-drive file=/tmp/firmware.img,if=none,id=drive-fdc0-0-0,format=raw \ -device isa-fdc,driveA=drive-fdc0-0-0,bootindexA=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args index 31b3242..f0a6e3b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args @@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev pipe,id=charchannel0,path=/tmp/guestfwd \ -netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=user-channel0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args index 896c69e..4bb811c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \ -boot c \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device spicevmc,bus=virtio-serial1.0,nr=3,id=channel0 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args index e75b510..7ec0ed8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \ -boot c \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev spicevmc,id=charchannel0,name=vdagent \ -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args index 55a0826..caf8cf9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args @@ -23,7 +23,7 @@ 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 \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev pty,id=charchannel0 \ -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args index dcad80b..7e1c143 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args @@ -22,7 +22,7 @@ QEMU_AUDIO_DRV=none \ addr=0x3 \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0x4 \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev pty,id=charchannel0 \ -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args index 6b139cf..c65dd4a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args @@ -22,7 +22,7 @@ QEMU_AUDIO_DRV=none \ addr=0x3 \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev pty,id=charchannel0 \ -device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args index b73d0c5..e4d4408 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args @@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev pty,id=charchannel0 \ -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args index 32362bc..76a5deb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args @@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev pty,id=charchannel0 \ -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args index 99c5f4c..86a9e4a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args @@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev socket,id=charchannel0,\ path=/tmp/domain-QEMUGuest1/org.qemu.guest_agent.0,server,nowait \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args index 26b112d..fe7e19f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args @@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev pty,id=charchannel0 \ -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args index f1779c8..2653220 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args index cd19362..78198b6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args @@ -18,7 +18,7 @@ TZ=Europe/Paris \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args index f10cbb6..df8345f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args @@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args index a41563f..c89850e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args index 562ef76..0ba4e2c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args index 7a531fb..6f74a49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args index da130d1..077c67e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args index 8dab65c..a4e4df7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial pty \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args index 1e07163..38b140c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args @@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev pty,id=charserial0 \ -device isa-serial,chardev=charserial0,id=serial0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args index 8dab65c..a4e4df7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial pty \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args b/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args index f2feb0a..53c8af9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0 \ -chardev pty,id=charconsole0 \ -device sclpconsole,chardev=charconsole0,id=console0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args index 97adfe3..9567f5a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0001 \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,\ bootindex=1 \ -chardev pty,id=charconsole0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args index 09dd2b5..bd9196a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args @@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev pty,id=charserial0 \ -device isa-serial,chardev=charserial0,id=serial0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args index 0d18fe7..2f64735 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -device virtio-serial-s390,id=virtio-serial0 \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ -chardev pty,id=charconsole0 \ -device virtconsole,chardev=charconsole0,id=console0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args index c0b2f89..47d58fa 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args @@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev pty,id=charconsole0 \ -device virtconsole,chardev=charconsole0,id=console0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args b/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args index 142471e..932d127 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args @@ -19,11 +19,12 @@ QEMU_AUDIO_DRV=spice \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x7 \ -device usb-ccid,id=ccid0 \ --drive file=/tmp/fdr.img,if=none,id=drive-virtio-disk0,cache=none,aio=native \ +-drive file=/tmp/fdr.img,if=none,id=drive-virtio-disk0,format=raw,cache=none,\ +aio=native \ -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,\ id=virtio-disk0 \ -drive file=/tmp/Fedora-17-x86_64-Live-Desktop.iso,if=none,media=cdrom,\ -id=drive-ide0-1-0 \ +id=drive-ide0-1-0,format=raw \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:4d:4b:19,bus=pci.0,addr=0x3 \ -net user,vlan=0,name=hostnet0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args index 42132e8..3c30177 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args b/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args index 02b6a55..4afff19 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune.args b/tests/qemuxml2argvdata/qemuxml2argv-cputune.args index 02b6a55..4afff19 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cputune.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args index a1f6327..e04a5cb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args @@ -18,9 +18,9 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1,format=raw \ -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 \ +-drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2,format=raw \ -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 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args index e1fcf99..faacb54 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args @@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ +-drive if=ide,media=cdrom,bus=1,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args index 6b6b33c..34b5f41 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args @@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \ -boot d \ -usb \ -drive file=ftp://host.name:21/url/path/file.iso,if=none,media=cdrom,\ -id=drive-ide0-1-0 \ +id=drive-ide0-1-0,format=raw \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args index c5ea7b8..85a1b55 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args @@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \ -boot d \ -usb \ -drive file=ftps://host.name:990/url/path/file.iso,if=none,media=cdrom,\ -id=drive-ide0-1-0 \ +id=drive-ide0-1-0,format=raw \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args index 84fca84..317db01 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args @@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \ -boot d \ -usb \ -drive file=http://host.name:80/url/path/file.iso,if=none,media=cdrom,\ -id=drive-ide0-1-0 \ +id=drive-ide0-1-0,format=raw \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args index 2eb64fb..384699b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args @@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \ -boot d \ -usb \ -drive file=https://host.name:443/url/path/file.iso,if=none,media=cdrom,\ -id=drive-ide0-1-0 \ +id=drive-ide0-1-0,format=raw \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args index 367745e..8c14592 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args @@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \ -boot d \ -usb \ -drive file=tftp://host.name:69/url/path/file.iso,if=none,media=cdrom,\ -id=drive-ide0-1-0 \ +id=drive-ide0-1-0,format=raw \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args index e1fcf99..faacb54 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args @@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ +-drive if=ide,media=cdrom,bus=1,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args index 5fe6440..dea3f70 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args @@ -17,12 +17,13 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot dc \ -usb \ --drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \ +-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,\ +format=qcow2 \ -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 \ +id=drive-ide0-1-0,format=raw \ -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 \ +-drive if=none,media=cdrom,id=drive-ide0-1-1,format=raw \ -device ide-drive,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args index 39d98f7..9421754 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args @@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ --drive file=/root/boot.iso,if=ide,media=cdrom,bus=1,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ +-drive file=/root/boot.iso,if=ide,media=cdrom,bus=1,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args index c48f939..45a75a0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args @@ -19,11 +19,11 @@ QEMU_AUDIO_DRV=none \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ -usb \ -drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,\ -copy-on-read=on \ +format=qcow2,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 \ +id=drive-ide0-1-0,format=raw \ -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 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args index ae9780a..1bf5dd6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args @@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ +-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args index 2ae53ed..75ba4c2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args @@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \ -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=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ +-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args index 7549f91..ca3a182 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args @@ -18,10 +18,10 @@ QEMU_AUDIO_DRV=none \ -boot dc \ -usb \ -drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,\ -discard=unmap \ +format=qcow2,discard=unmap \ -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,discard=ignore \ +id=drive-ide0-1-0,format=raw,discard=ignore \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args index f8761c9..8dd1992 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args @@ -18,7 +18,7 @@ mon1.example.org:6321,mon2.example.org:6322,mon3.example.org:6322 \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=rbd:pool/image,if=virtio,format=raw \ -net none \ -serial none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args index 589bbcd..6ed9ea3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args @@ -16,10 +16,11 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -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 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,media=cdrom,id=drive-ide0-1-0,\ +format=raw \ -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 \ +-drive file=/dev/fd0,if=none,id=drive-fdc0-0-0,format=raw \ -global isa-fdc.driveA=drive-fdc0-0-0 \ -global isa-fdc.bootindexA=3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args index 11e2e2d..1da7f9a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args @@ -18,8 +18,9 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -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 \ +-drive file=/dev/sr0,if=none,media=cdrom,id=drive-ide0-1-0,readonly=on,\ +format=raw \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args index bbe917f..1697508 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args @@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ +-drive file=/dev/sr0,if=ide,media=cdrom,bus=1,unit=0,readonly=on,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args index 799f11a..3c8ab26 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args @@ -16,9 +16,9 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ --drive file=/dev/fd0,if=floppy,unit=0 \ --drive file=/tmp/firmware.img,if=floppy,unit=1 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ +-drive file=/dev/fd0,if=floppy,unit=0,format=raw \ +-drive file=/tmp/firmware.img,if=floppy,unit=1,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args index 437d791..e06b010 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args @@ -16,9 +16,9 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ --drive file=/dev/fd0,if=floppy,unit=0 \ --drive if=floppy,unit=1 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ +-drive file=/dev/fd0,if=floppy,unit=0,format=raw \ +-drive if=floppy,unit=1,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args index 3b6d00d..1400aec 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args @@ -17,10 +17,10 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -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 \ +-drive file=/dev/fd0,if=none,id=drive-fdc0-0-0,format=raw \ -global isa-fdc.driveA=drive-fdc0-0-0 \ --drive if=none,id=drive-fdc0-0-1 \ +-drive if=none,id=drive-fdc0-0-1,format=raw \ -global isa-fdc.driveB=drive-fdc0-0-1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args index 0c4003f..f920e67 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args @@ -16,9 +16,9 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ --drive file=/dev/fd0,if=floppy,unit=0 \ --drive file=/tmp/firmware.img,if=floppy,unit=1 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ +-drive file=/dev/fd0,if=floppy,unit=0,format=raw \ +-drive file=/tmp/firmware.img,if=floppy,unit=1,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args index 2f94b3f..719023a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args @@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,cyls=16383,heads=16,\ -secs=63,trans=lba \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw,cyls=16383,\ +heads=16,secs=63,trans=lba \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args index 45c6dd3..d27bf5f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args @@ -18,8 +18,8 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1,format=raw \ -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 \ +-drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2,format=raw \ -device ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args index 606ea51..2a0b884 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1,\ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1,format=raw,\ serial=WD-WMAP9A966149 \ -device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,\ wwn=0x5000c50015ea71ad \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args index b65770c..d2537da 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args @@ -18,11 +18,12 @@ QEMU_AUDIO_DRV=none \ -boot dc \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ -usb \ --drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \ +-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,\ +format=qcow2 \ -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 \ +id=drive-ide0-1-0,format=raw \ -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 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args index 79bbe29..73c1e66 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -usb \ -drive file=/dev/disk/by-path/ip-192.168.44.1:\ 3260-iscsi-iqn.2011-02.lan.hdserver:hydrar-desktop.win7vm-lun-0,if=ide,bus=0,\ -unit=0 \ +unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args index abc1626..ad4ae62 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args @@ -16,10 +16,10 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ --drive file=/dev/HostVG/QEMUGuest2,if=ide,bus=0,unit=1 \ --drive file=/tmp/data.img,if=ide,bus=1,unit=0 \ --drive file=/tmp/logs.img,if=ide,bus=1,unit=1 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ +-drive file=/dev/HostVG/QEMUGuest2,if=ide,bus=0,unit=1,format=raw \ +-drive file=/tmp/data.img,if=ide,bus=1,unit=0,format=raw \ +-drive file=/tmp/logs.img,if=ide,bus=1,unit=1,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args index 7c8641b..2e71c2a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args @@ -17,14 +17,15 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -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 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,media=cdrom,id=drive-ide0-1-0,\ +format=raw \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --drive file=/tmp/data.img,if=none,id=drive-virtio-disk0 \ +-drive file=/tmp/data.img,if=none,id=drive-virtio-disk0,format=raw \ -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 \ +-drive file=/tmp/logs.img,if=none,id=drive-virtio-disk1,format=raw \ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\ id=virtio-disk1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args index 00b3103..8d9ce21 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args @@ -19,6 +19,6 @@ QEMU_AUDIO_DRV=none \ -boot c \ -device ahci,id=sata0,bus=pci.0,addr=0x3 \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0,format=raw \ -device ide-drive,bus=sata0.0,drive=drive-sata0-0-0,id=sata0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args index 21774b7..ad9ea82 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args @@ -19,8 +19,8 @@ QEMU_AUDIO_DRV=none \ -boot c \ -device lsi,id=scsi0,bus=pci.0,addr=0x3 \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -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 \ +-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0,format=raw \ -device 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 --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args index 21774b7..ad9ea82 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args @@ -19,8 +19,8 @@ QEMU_AUDIO_DRV=none \ -boot c \ -device lsi,id=scsi0,bus=pci.0,addr=0x3 \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -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 \ +-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0,format=raw \ -device 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 --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args index c5d35bf..048a221 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args @@ -22,16 +22,16 @@ QEMU_AUDIO_DRV=none \ -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 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-1-0,format=raw \ -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 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi0-0-0-0,format=raw \ -device scsi-cd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ id=scsi0-0-0-0 \ --drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0-1 \ +-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0-1,format=raw \ -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 \ +-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-1-1,format=raw \ -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=1,lun=1,drive=drive-scsi0-0-1-1,\ id=scsi0-0-1-1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args index 9b16956..f6cc3b2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args @@ -20,10 +20,10 @@ QEMU_AUDIO_DRV=none \ -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 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0,format=raw \ -device scsi-cd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ id=scsi0-0-0-0,vendor=SEAGATE,product=ST3146707LC \ --drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi1-0-0 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi1-0-0,format=raw \ -device scsi-hd,bus=scsi1.0,scsi-id=0,drive=drive-scsi1-0-0,id=scsi1-0-0,\ vendor=SEAGATE,product=ST3567807GD \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args index 0babb37..5a5bcf6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args @@ -20,10 +20,10 @@ QEMU_AUDIO_DRV=none \ -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 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-1-0,format=raw \ -device scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,\ id=scsi0-0-1-0,wwn=0x5000c50015ea71ac \ --drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi0-0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi0-0-0-0,format=raw \ -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=0x5000c50015ea71ad \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args index f99f4f2..d95eebc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args @@ -19,10 +19,10 @@ QEMU_AUDIO_DRV=none \ -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 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0,format=raw \ -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 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi0-0-1-1,format=raw \ -device scsi-block,bus=scsi0.0,channel=0,scsi-id=1,lun=1,drive=drive-scsi0-0-1-1,\ id=scsi0-0-1-1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args index 4f1caa7..6c4e73f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args @@ -19,9 +19,9 @@ QEMU_AUDIO_DRV=none \ -boot c \ -device megasas,id=scsi0,bus=pci.0,addr=0x3 \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -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 \ +-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-4-0,format=raw \ -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,drive=drive-scsi0-0-4-0,\ id=scsi0-0-4-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args index 8e5cbd9..a3c79c2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args @@ -19,9 +19,9 @@ QEMU_AUDIO_DRV=none \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -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 \ +-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-4-0,format=raw \ -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,drive=drive-scsi0-0-4-0,\ id=scsi0-0-4-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args index 3159a26..1dad9cf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args @@ -19,9 +19,9 @@ QEMU_AUDIO_DRV=none \ -boot c \ -device spapr-vscsi,id=scsi0,reg=0x2000 \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -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 \ +-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-3-0,format=raw \ -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=3,lun=0,drive=drive-scsi0-0-3-0,\ id=scsi0-0-3-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args index 86b78eb..6525fbf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive 'file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1,\ +-drive 'file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1,format=raw,\ serial=\ \ WD-WMAP9A966149' \ -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args index e1d6512..7a39cf5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args @@ -23,6 +23,6 @@ QEMU_AUDIO_DRV=none \ -drive file=iscsi://iscsi.example.com:3260/demo-target/2,if=none,media=cdrom,\ id=drive-ide0-0-2 \ -device ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 \ --drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-3 \ +-drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-3,format=raw \ -device ide-drive,bus=ide.0,unit=3,drive=drive-ide0-0-3,id=ide0-0-3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args index 26f0137..4f2d1d1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args @@ -20,8 +20,8 @@ QEMU_AUDIO_DRV=none \ -usb \ -drive file=/some/block/device/cdrom,if=none,media=cdrom,id=drive-ide0-0-1 \ -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive if=none,media=cdrom,id=drive-ide0-1-0 \ +-drive if=none,media=cdrom,id=drive-ide0-1-0,format=raw \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2 \ +-drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2,format=raw \ -device ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args index b89e9bb..62fbd61 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args @@ -18,8 +18,8 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -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 \ +-drive file=/tmp/usbdisk.img,if=none,id=drive-usb-disk0,format=raw \ -device usb-storage,drive=drive-usb-disk0,id=usb-disk0,removable=on \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args index 3381073..e6fafc6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args @@ -18,8 +18,8 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -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 \ +-drive file=/tmp/usbdisk.img,if=none,id=drive-usb-disk0,format=raw \ -device usb-storage,drive=drive-usb-disk0,id=usb-disk0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args index dfc7b9f..ae740e6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -usbdevice disk:/tmp/usbdisk.img \ -net none \ -serial none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args index 889d635..15344fd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args @@ -16,12 +16,12 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-ccw,devno=0.0.0007,drive=drive-virtio-disk0,id=virtio-disk0 \ --drive file=/dev/HostVG/QEMUGuest4,if=none,id=drive-virtio-disk1 \ +-drive file=/dev/HostVG/QEMUGuest4,if=none,id=drive-virtio-disk1,format=raw \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk1,id=virtio-disk1 \ --drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-virtio-disk2 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-virtio-disk2,format=raw \ -device virtio-blk-ccw,devno=fe.0.0001,drive=drive-virtio-disk2,id=virtio-disk2 \ --drive file=/dev/HostVG/QEMUGuest3,if=none,id=drive-virtio-disk3 \ +-drive file=/dev/HostVG/QEMUGuest3,if=none,id=drive-virtio-disk3,format=raw \ -device virtio-blk-ccw,devno=fe.2.f00f,drive=drive-virtio-disk3,id=virtio-disk3 \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args index 430df81..d868187 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args @@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 \ --drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-virtio-disk1 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-virtio-disk1,format=raw \ -device virtio-blk-ccw,devno=0.0.0007,drive=drive-virtio-disk1,id=virtio-disk1 \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args index b97090b..cfcb916 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args @@ -16,5 +16,5 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args index 179e725..98106f4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args @@ -17,9 +17,9 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -device virtio-scsi-ccw,id=scsi0,devno=fe.0.0001 \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 \ --drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi0-0-4-0 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi0-0-4-0,format=raw \ -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,drive=drive-scsi0-0-4-0,\ id=scsi0-0-4-0 \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args index f127f92..74be9f1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args @@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -device virtio-scsi-pci,id=scsi0,cmd_per_lun=50,bus=pci.0,addr=0x3 \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0,format=raw \ -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ id=scsi0-0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args index 4eb1c7e..7a1f0b2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args @@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -device virtio-scsi-pci,id=scsi0,ioeventfd=on,bus=pci.0,addr=0x3 \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0,format=raw \ -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ id=scsi0-0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args index d17e2c3..108abb0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args @@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -device virtio-scsi-pci,id=scsi0,max_sectors=512,bus=pci.0,addr=0x3 \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0,format=raw \ -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ id=scsi0-0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args index 5c36f27..f9bc22b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args @@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -device virtio-scsi-pci,id=scsi0,num_queues=8,bus=pci.0,addr=0x3 \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0,format=raw \ -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ id=scsi0-0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args index d6cb697..99cc056 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args @@ -16,10 +16,10 @@ QEMU_AUDIO_DRV=none \ -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 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ +-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ +-drive file=/tmp/data.img,if=virtio,format=raw \ +-drive file=/tmp/logs.img,if=virtio,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args index 8f20b3b..ab3ef10 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args @@ -16,10 +16,10 @@ QEMU_AUDIO_DRV=none \ -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 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ +-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ +-drive file=/tmp/data.img,if=xen,index=0,format=raw \ +-drive file=/tmp/logs.img,if=xen,index=6,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args index 87e1d2e..1d4897e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args @@ -22,7 +22,7 @@ server,nowait \ -boot c \ -usb \ -drive file=/storage/guest_disks/encryptdisk,if=none,id=drive-virtio-disk0,\ -boot=on,format=qcow2 \ +format=raw,boot=on,format=qcow2 \ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ id=virtio-disk0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args index 768cc9d..df5cd8d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args @@ -18,11 +18,12 @@ QEMU_AUDIO_DRV=none \ -boot dc \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ -usb \ --drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \ +-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,\ +format=qcow2 \ -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 \ +id=drive-ide0-1-0,format=raw \ -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 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args index 01563f4..6840535 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args index 8ccb593..3afcc65 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 \ -fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \ -device virtio-9p-ccw,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args index 165a153..b50fd85 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -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,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args index acfb6b4..5be91a5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args @@ -16,7 +16,7 @@ DISPLAY=:0.1 \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args index fec0a5e..3affb42 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args @@ -16,7 +16,7 @@ DISPLAY=:0.1 \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args index 3010767..48e892c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=spice \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\ tls-channel=main,plaintext-channel=inputs,disable-agent-file-xfer \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args index 4a1c3ac..cff9598 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \ -boot c \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev spicevmc,id=charchannel0,name=vdagent \ -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args index 4cce624..2e52369 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=spice \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -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,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args index c3ba565..5cfdb06 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=spice \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\ tls-channel=main,plaintext-channel=inputs \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args index 7786553a..945924f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=spice \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -spice port=5903,tls-port=5904,sasl,addr=127.0.0.1,\ x509-dir=/etc/pki/libvirt-spice,tls-channel=default \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args index 662445a..defd8e2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args @@ -18,11 +18,12 @@ QEMU_AUDIO_DRV=spice \ -boot dc \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ -usb \ --drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \ +-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,\ +format=qcow2 \ -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 \ +id=drive-ide0-1-0,format=raw \ -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 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args index 1ee5da0..3ffd722 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=spice \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -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,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args index fcb796a..4fdc099 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args index 1cc36b5..88f77bd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args index 93c3ef3..e92c631 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args index d586af8..ce83221 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args index 5be901f..c91b469 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args index 100721a..93f592f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -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 --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args index 69f641a..390cede 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest2,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest2,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args index 8537a9d..5417f66 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -usb \ --drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -drive file=/dev/sg0,if=none,id=drive-hostdev0 \ -device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,drive=drive-hostdev0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args index 39d397c..f2e7dcd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -device lsi,id=scsi0,bus=pci.0,addr=0x3 \ -usb \ --drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ 3260/iqn.1992-01.com.example,if=none,format=raw,id=drive-hostdev0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args index d8387f0..63f5a78 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -device lsi,id=scsi0,bus=pci.0,addr=0x3 \ -usb \ --drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -drive file=iscsi://example.org:3260/iqn.1992-01.com.example,if=none,format=raw,\ id=drive-hostdev0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args index 252b255..eb2a6fc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -device lsi,id=scsi0,bus=pci.0,addr=0x3 \ -usb \ --drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -drive file=/dev/sg0,if=none,id=drive-hostdev0 \ -device scsi-generic,bus=scsi0.0,scsi-id=7,drive=drive-hostdev0,id=hostdev0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args index 81b18ea..816d3c2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -usb \ --drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -drive file=/dev/sg0,if=none,id=drive-hostdev0,readonly=on \ -device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,drive=drive-hostdev0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args index 15dfd37..2b3d87d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -usb \ --drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ 3260/iqn.1992-01.com.example,if=none,format=raw,id=drive-hostdev0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args index cb87a7a..eab55d9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -usb \ --drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -drive file=iscsi://example.org:3260/iqn.1992-01.com.example,if=none,format=raw,\ id=drive-hostdev0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args index 716b18c..745921c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -usb \ --drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -drive file=/dev/sg0,if=none,id=drive-hostdev0 \ -device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,drive=drive-hostdev0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args index 0714d53..c1f8a13 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args index 9d6730a..a48eb21 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device usb-host,hostbus=14,hostaddr=6,id=hostdev0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args index fd30c1f..74aebd3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args index b8a76ae..d5048a8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device vfio-pci,host=55aa:20:0f.3,id=hostdev0,bus=pci.0,addr=0x3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args index 879e69a..3003e89 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device vfio-pci,host=06:12.5,id=hostdev0,bus=pci.0,addr=0x3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args index 3dec91f..77c1b91 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args @@ -31,10 +31,11 @@ addr=0x6 \ -device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x6.0x1 \ -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x6.0x2 \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x5 \ --drive file=/var/lib/libvirt/images/fedora.qcow2,if=none,id=drive-virtio-disk0 \ +-drive file=/var/lib/libvirt/images/fedora.qcow2,if=none,id=drive-virtio-disk0,\ +format=qcow2 \ -device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk0,\ id=virtio-disk0 \ --drive if=none,media=cdrom,id=drive-ide0-0-0 \ +-drive if=none,media=cdrom,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -serial pty \ -chardev socket,id=charchannel0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args index d995790..01951e9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args @@ -31,7 +31,7 @@ mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=3,policy=bind -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args index 9e78a54..c2c2ca4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args @@ -22,7 +22,7 @@ mem-path=/dev/hugepages2M/libvirt/qemu,size=805306368 \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args index 1e69158..ac7cd0a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args @@ -21,7 +21,7 @@ mem-path=/dev/hugepages1G/libvirt/qemu,size=805306368 \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args index 5e51e23..04bfbee 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args index 9ed7eed..4c96d5e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args index f79c32e..dd5e79e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args @@ -31,7 +31,7 @@ mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=3,policy=bind -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args index b66a50e..044b9fa 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args index c6e9b79..611eb2b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device usb-mouse,id=input0,bus=usb.0,port=4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args index c1e3ace..7a539af 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args index 4c95753..33f0edc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args index 6cc77d6..f26b4a8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args @@ -18,10 +18,10 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-ccw,iothread=iothread1,devno=fe.0.0000,\ drive=drive-virtio-disk0,id=virtio-disk0 \ --drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-virtio-disk1 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-virtio-disk1,format=raw \ -device virtio-blk-ccw,iothread=iothread2,devno=0.0.0007,\ drive=drive-virtio-disk1,id=virtio-disk1 \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args index 80c0f8a..687b816 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args @@ -19,11 +19,13 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=/var/lib/libvirt/images/iothrtest1.img,if=none,id=drive-virtio-disk1 \ +-drive file=/var/lib/libvirt/images/iothrtest1.img,if=none,id=drive-virtio-disk1,\ +format=raw \ -device virtio-blk-pci,iothread=iothread1,bus=pci.0,addr=0x4,\ drive=drive-virtio-disk1,id=virtio-disk1 \ --drive file=/var/lib/libvirt/images/iothrtest2.img,if=none,id=drive-virtio-disk2 \ +-drive file=/var/lib/libvirt/images/iothrtest2.img,if=none,id=drive-virtio-disk2,\ +format=raw \ -device virtio-blk-pci,iothread=iothread2,bus=pci.0,addr=0x3,\ drive=drive-virtio-disk2,id=virtio-disk2 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args index c5b11fb..7e91ba9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args @@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args index 6863944..4f5d3a0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args index ba79787..604ae6f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args index 2b6f4fe..dc53e77 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args index 95359ac..bf660a4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-lease.args b/tests/qemuxml2argvdata/qemuxml2argv-lease.args index 4eb7326..720ed17 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-lease.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-lease.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -cdrom /root/boot.iso \ -net none \ -serial none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args index 98ec167..9fee98f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args @@ -16,4 +16,5 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0 +-drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0,\ +format=raw diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args index 72a88f4..2796d9b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args @@ -16,5 +16,5 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args index 72a88f4..2796d9b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args @@ -16,5 +16,5 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args index 739a453..f44b98a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args @@ -16,4 +16,5 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0 +-drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0,\ +format=raw diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args index 55cd4cd..bdf028d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args @@ -16,5 +16,5 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args index 55cd4cd..bdf028d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args @@ -16,5 +16,5 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args index 3122fb1..a507bd0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args index 36ba617..ba93e17 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args index 469a2b5..75ddc81 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args index de95c95..d01e8e5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args index fcc82e9..dcbdd5b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args @@ -16,4 +16,5 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0 +-drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0,\ +format=raw diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args index 3bc02df..4d696b1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args @@ -16,5 +16,5 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args index 3bc02df..4d696b1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args @@ -16,5 +16,5 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args index 0e2a719..77f9837 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args @@ -16,4 +16,5 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0 +-drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0,\ +format=raw diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args index 74e5ce0..1963b84 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args @@ -16,5 +16,5 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args index 74e5ce0..1963b84 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args @@ -16,5 +16,5 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args index 8183e90..aa8dae0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args @@ -16,4 +16,5 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0 +-drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0,\ +format=raw diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args index 809509e..f241a19 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args @@ -16,5 +16,5 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args index 809509e..f241a19 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args @@ -16,5 +16,5 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args index 5a7f586..5d0efca 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args index b0c6492..cbc1c38 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args index 7d83966..22245f2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args @@ -21,6 +21,6 @@ mem-path=/dev/hugepages2M/libvirt/qemu,size=536870912,host-nodes=1-3,policy=bind -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args index f27cb75..8382755 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args @@ -23,6 +23,6 @@ mem-path=/dev/hugepages2M/libvirt/qemu,size=536870912,host-nodes=1-3,policy=bind -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args index 08f653f..0ee4059 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args b/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args index 7a531fb..6f74a49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memtune.args b/tests/qemuxml2argvdata/qemuxml2argv-memtune.args index 7a531fb..6f74a49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memtune.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-memtune.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-metadata.args b/tests/qemuxml2argvdata/qemuxml2argv-metadata.args index 7a531fb..6f74a49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-metadata.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-metadata.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate.args b/tests/qemuxml2argvdata/qemuxml2argv-migrate.args index 2d502af..709a25b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-migrate.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-migrate.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args b/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args index 5bba25c..5ba1465 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args index ac45953..5082812 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=virtio \ +-drive file=/dev/HostVG/QEMUGuest1,if=virtio,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal.args b/tests/qemuxml2argvdata/qemuxml2argv-minimal.args index 7a531fb..6f74a49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-minimal.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args index 079923a..32e09ba 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args index 2e2ddca..d21775b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -global PIIX4_PM.disable_s3=1 \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args index 4063afb..07bf768 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -global PIIX4_PM.disable_s4=1 \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args index 0cec38c..f5c90b3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -global PIIX4_PM.disable_s4=0 \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args index 8178ad3..766a71c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args index 079923a..32e09ba 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args b/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args index 50eee81..9f85fc0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args @@ -19,6 +19,6 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/hda1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/hda1,if=none,id=drive-ide0-0-0,format=qcow2 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args b/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args index 4572304..c27887a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args @@ -27,6 +27,6 @@ QEMU_AUDIO_DRV=none \ -device lsi,id=scsi7,bus=pci.0,addr=0x4.0x6 \ -device lsi,id=scsi8,bus=pci.0,addr=0x4.0x7 \ -usb \ --drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0 \ +-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0,format=raw \ -device 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=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-client.args b/tests/qemuxml2argvdata/qemuxml2argv-net-client.args index 53e8f4c..d2d4ac5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-client.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-client.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 \ -net socket,connect=192.168.0.1:5558,vlan=0 \ -serial none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args index e0af6d3..02679aa 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 \ -net tap,ifname=nic02,script=/etc/qemu-ifup,vlan=0 \ -serial none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args index 07f350b..78de72d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139,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 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args index 8d457db..d4db71c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 \ -net tap,script=/etc/qemu-ifup,vlan=0 \ -serial none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args index 7bc8b3f..4ac6944 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device pci-assign,host=2424:21:1c.6,id=hostdev0,bus=pci.0,addr=0x3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args index 594018d..2ae29d2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device vfio-pci,host=0021:de:1f.1,id=hostdev0,bus=pci.0,addr=0x3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args index 8aebdf7..3730bf8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device vfio-pci,host=03:07.1,id=hostdev0,bus=pci.0,addr=0x3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args index af75d43..4f0cb3d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -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 --git a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args index c99b264..77bb706 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 \ -net socket,mcast=192.0.0.1:5558,vlan=0 \ -serial none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-server.args b/tests/qemuxml2argvdata/qemuxml2argv-net-server.args index f7008c8..ddbc0da 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-server.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-server.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 \ -net socket,listen=192.168.0.1:5558,vlan=0 \ -serial none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args b/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args index 000617a..650fe6b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 \ -net socket,udp=192.168.10.1:5555,localaddr=192.168.10.1:5556,vlan=0 \ -serial none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user.args b/tests/qemuxml2argvdata/qemuxml2argv-net-user.args index a141c93..7fc1ec9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-user.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-user.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 \ -net user,vlan=0 \ -serial none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args index a6a80c9..999dede 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev socket,id=charnet0,path=/tmp/vhost0.sock,server \ -netdev type=vhost-user,id=hostnet0,chardev=charnet0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args index beabbb2..c12f09d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev socket,id=charnet0,path=/tmp/vhost0.sock,server \ -netdev type=vhost-user,id=hostnet0,chardev=charnet0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args index c4389c6..b85ac1d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device virtio-net-pci,tx=bh,vlan=0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,\ addr=0x3 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args index 3a6edb4..6df16be 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest7,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest7,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device virtio-net-pci,csum=off,gso=off,host_tso4=off,host_tso6=off,host_ecn=off,\ host_ufo=off,mrg_rxbuf=off,guest_csum=off,guest_tso4=off,guest_tso6=off,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args index 6cf6fb7..1760a37 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -netdev user,id=hostnet0 \ -device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args index a6ea8ba..a4f2175 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net nic,macaddr=00:11:22:33:44:55,vlan=0,model=virtio \ -net user,vlan=0 \ -serial none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args b/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args index 5ca99e9..bbb895a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args @@ -20,6 +20,6 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/hda1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/hda1,if=none,id=drive-ide0-0-0,format=qcow2 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args index 1dc0eb8..1ef677c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics.args b/tests/qemuxml2argvdata/qemuxml2argv-nographics.args index 7a531fb..6f74a49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-nographics.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args b/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args index 52dd271..8019c00 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args index 02b6a55..4afff19 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git 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 index 02b6a55..4afff19 100644 --- 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 @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args index 02b6a55..4afff19 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args index 02b6a55..4afff19 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad.args b/tests/qemuxml2argvdata/qemuxml2argv-numad.args index 02b6a55..4afff19 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numad.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numad.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args index 02b6a55..4afff19 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args index 02b6a55..4afff19 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args b/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args index dcec4a0..e06d59f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -device pvpanic diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic.args b/tests/qemuxml2argvdata/qemuxml2argv-panic.args index a181e18..46ad1a0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-panic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-panic.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -device pvpanic,ioport=1285 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args index 74059ec..5096d7f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args @@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev parport,id=charparallel0,path=/dev/parport0 \ -device isa-parallel,chardev=charparallel0,id=parallel0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args index c240702..2945394 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args @@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev socket,id=charparallel0,host=127.0.0.1,port=9999,server,nowait \ -device isa-parallel,chardev=charparallel0,id=parallel0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args index 3201d73..63f9f1e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel tcp:127.0.0.1:9999,server,nowait diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args index a5852b1..7ee7388 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args @@ -23,6 +23,6 @@ QEMU_AUDIO_DRV=none \ -device pci-bridge,chassis_nr=6,id=pci.6,bus=pci.0,addr=0x8 \ -device pci-bridge,chassis_nr=7,id=pci.7,bus=pci.0,addr=0x9 \ -usb \ --drive file=/var/iso/f18kde.iso,if=none,media=cdrom,id=drive-ide0-1-0 \ +-drive file=/var/iso/f18kde.iso,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.7,addr=0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args index 0175856..8f70c47 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args @@ -24,6 +24,6 @@ QEMU_AUDIO_DRV=none \ -device pci-bridge,chassis_nr=6,id=pci.6,bus=pci.0,addr=0x9 \ -device pci-bridge,chassis_nr=7,id=pci.7,bus=pci.0,addr=0xa \ -usb \ --drive file=/var/iso/f18kde.iso,if=none,media=cdrom,id=drive-ide0-1-0 \ +-drive file=/var/iso/f18kde.iso,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args index 618c25a..3ba9997 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args @@ -21,318 +21,423 @@ QEMU_AUDIO_DRV=none \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x4 \ -device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.0,addr=0x5 \ -usb \ --drive file=/var/lib/libvirt/images/test.img,if=none,id=drive-virtio-disk0 \ +-drive file=/var/lib/libvirt/images/test.img,if=none,id=drive-virtio-disk0,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk0,\ id=virtio-disk0 \ --drive file=/var/lib/libvirt/images/disk-a-a.img,if=none,id=drive-virtio-disk26 \ +-drive file=/var/lib/libvirt/images/disk-a-a.img,if=none,id=drive-virtio-disk26,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk26,\ id=virtio-disk26 \ --drive file=/var/lib/libvirt/images/disk-a-b.img,if=none,id=drive-virtio-disk27 \ +-drive file=/var/lib/libvirt/images/disk-a-b.img,if=none,id=drive-virtio-disk27,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk27,\ id=virtio-disk27 \ --drive file=/var/lib/libvirt/images/disk-a-c.img,if=none,id=drive-virtio-disk28 \ +-drive file=/var/lib/libvirt/images/disk-a-c.img,if=none,id=drive-virtio-disk28,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x9,drive=drive-virtio-disk28,\ id=virtio-disk28 \ --drive file=/var/lib/libvirt/images/disk-a-d.img,if=none,id=drive-virtio-disk29 \ +-drive file=/var/lib/libvirt/images/disk-a-d.img,if=none,id=drive-virtio-disk29,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0xa,drive=drive-virtio-disk29,\ id=virtio-disk29 \ --drive file=/var/lib/libvirt/images/disk-b-a.img,if=none,id=drive-virtio-disk52 \ +-drive file=/var/lib/libvirt/images/disk-b-a.img,if=none,id=drive-virtio-disk52,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0xb,drive=drive-virtio-disk52,\ id=virtio-disk52 \ --drive file=/var/lib/libvirt/images/disk-b-b.img,if=none,id=drive-virtio-disk53 \ +-drive file=/var/lib/libvirt/images/disk-b-b.img,if=none,id=drive-virtio-disk53,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0xc,drive=drive-virtio-disk53,\ id=virtio-disk53 \ --drive file=/var/lib/libvirt/images/disk-b-c.img,if=none,id=drive-virtio-disk54 \ +-drive file=/var/lib/libvirt/images/disk-b-c.img,if=none,id=drive-virtio-disk54,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0xd,drive=drive-virtio-disk54,\ id=virtio-disk54 \ --drive file=/var/lib/libvirt/images/disk-b-d.img,if=none,id=drive-virtio-disk55 \ +-drive file=/var/lib/libvirt/images/disk-b-d.img,if=none,id=drive-virtio-disk55,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0xe,drive=drive-virtio-disk55,\ id=virtio-disk55 \ --drive file=/var/lib/libvirt/images/disk-c-a.img,if=none,id=drive-virtio-disk78 \ +-drive file=/var/lib/libvirt/images/disk-c-a.img,if=none,id=drive-virtio-disk78,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0xf,drive=drive-virtio-disk78,\ id=virtio-disk78 \ --drive file=/var/lib/libvirt/images/disk-c-b.img,if=none,id=drive-virtio-disk79 \ +-drive file=/var/lib/libvirt/images/disk-c-b.img,if=none,id=drive-virtio-disk79,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x10,drive=drive-virtio-disk79,\ id=virtio-disk79 \ --drive file=/var/lib/libvirt/images/disk-c-c.img,if=none,id=drive-virtio-disk80 \ +-drive file=/var/lib/libvirt/images/disk-c-c.img,if=none,id=drive-virtio-disk80,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x11,drive=drive-virtio-disk80,\ id=virtio-disk80 \ --drive file=/var/lib/libvirt/images/disk-c-d.img,if=none,id=drive-virtio-disk81 \ +-drive file=/var/lib/libvirt/images/disk-c-d.img,if=none,id=drive-virtio-disk81,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x12,drive=drive-virtio-disk81,\ id=virtio-disk81 \ --drive file=/var/lib/libvirt/images/disk-d-a.img,if=none,id=drive-virtio-disk104 \ +-drive file=/var/lib/libvirt/images/disk-d-a.img,if=none,id=drive-virtio-disk104,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x13,drive=drive-virtio-disk104,\ id=virtio-disk104 \ --drive file=/var/lib/libvirt/images/disk-d-b.img,if=none,id=drive-virtio-disk105 \ +-drive file=/var/lib/libvirt/images/disk-d-b.img,if=none,id=drive-virtio-disk105,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x14,drive=drive-virtio-disk105,\ id=virtio-disk105 \ --drive file=/var/lib/libvirt/images/disk-d-c.img,if=none,id=drive-virtio-disk106 \ +-drive file=/var/lib/libvirt/images/disk-d-c.img,if=none,id=drive-virtio-disk106,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x15,drive=drive-virtio-disk106,\ id=virtio-disk106 \ --drive file=/var/lib/libvirt/images/disk-d-d.img,if=none,id=drive-virtio-disk107 \ +-drive file=/var/lib/libvirt/images/disk-d-d.img,if=none,id=drive-virtio-disk107,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x16,drive=drive-virtio-disk107,\ id=virtio-disk107 \ --drive file=/var/lib/libvirt/images/disk-e-a.img,if=none,id=drive-virtio-disk130 \ +-drive file=/var/lib/libvirt/images/disk-e-a.img,if=none,id=drive-virtio-disk130,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x17,drive=drive-virtio-disk130,\ id=virtio-disk130 \ --drive file=/var/lib/libvirt/images/disk-e-b.img,if=none,id=drive-virtio-disk131 \ +-drive file=/var/lib/libvirt/images/disk-e-b.img,if=none,id=drive-virtio-disk131,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x18,drive=drive-virtio-disk131,\ id=virtio-disk131 \ --drive file=/var/lib/libvirt/images/disk-e-c.img,if=none,id=drive-virtio-disk132 \ +-drive file=/var/lib/libvirt/images/disk-e-c.img,if=none,id=drive-virtio-disk132,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x19,drive=drive-virtio-disk132,\ id=virtio-disk132 \ --drive file=/var/lib/libvirt/images/disk-e-d.img,if=none,id=drive-virtio-disk133 \ +-drive file=/var/lib/libvirt/images/disk-e-d.img,if=none,id=drive-virtio-disk133,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x1a,drive=drive-virtio-disk133,\ id=virtio-disk133 \ --drive file=/var/lib/libvirt/images/disk-f-a.img,if=none,id=drive-virtio-disk156 \ +-drive file=/var/lib/libvirt/images/disk-f-a.img,if=none,id=drive-virtio-disk156,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x1b,drive=drive-virtio-disk156,\ id=virtio-disk156 \ --drive file=/var/lib/libvirt/images/disk-f-b.img,if=none,id=drive-virtio-disk157 \ +-drive file=/var/lib/libvirt/images/disk-f-b.img,if=none,id=drive-virtio-disk157,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x1c,drive=drive-virtio-disk157,\ id=virtio-disk157 \ --drive file=/var/lib/libvirt/images/disk-f-c.img,if=none,id=drive-virtio-disk158 \ +-drive file=/var/lib/libvirt/images/disk-f-c.img,if=none,id=drive-virtio-disk158,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x1d,drive=drive-virtio-disk158,\ id=virtio-disk158 \ --drive file=/var/lib/libvirt/images/disk-f-d.img,if=none,id=drive-virtio-disk159 \ +-drive file=/var/lib/libvirt/images/disk-f-d.img,if=none,id=drive-virtio-disk159,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=drive-virtio-disk159,\ id=virtio-disk159 \ --drive file=/var/lib/libvirt/images/disk-g-a.img,if=none,id=drive-virtio-disk182 \ +-drive file=/var/lib/libvirt/images/disk-g-a.img,if=none,id=drive-virtio-disk182,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=drive-virtio-disk182,\ id=virtio-disk182 \ --drive file=/var/lib/libvirt/images/disk-g-b.img,if=none,id=drive-virtio-disk183 \ +-drive file=/var/lib/libvirt/images/disk-g-b.img,if=none,id=drive-virtio-disk183,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x1,drive=drive-virtio-disk183,\ id=virtio-disk183 \ --drive file=/var/lib/libvirt/images/disk-g-c.img,if=none,id=drive-virtio-disk184 \ +-drive file=/var/lib/libvirt/images/disk-g-c.img,if=none,id=drive-virtio-disk184,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x2,drive=drive-virtio-disk184,\ id=virtio-disk184 \ --drive file=/var/lib/libvirt/images/disk-g-d.img,if=none,id=drive-virtio-disk185 \ +-drive file=/var/lib/libvirt/images/disk-g-d.img,if=none,id=drive-virtio-disk185,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x3,drive=drive-virtio-disk185,\ id=virtio-disk185 \ --drive file=/var/lib/libvirt/images/disk-h-a.img,if=none,id=drive-virtio-disk208 \ +-drive file=/var/lib/libvirt/images/disk-h-a.img,if=none,id=drive-virtio-disk208,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x4,drive=drive-virtio-disk208,\ id=virtio-disk208 \ --drive file=/var/lib/libvirt/images/disk-h-b.img,if=none,id=drive-virtio-disk209 \ +-drive file=/var/lib/libvirt/images/disk-h-b.img,if=none,id=drive-virtio-disk209,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x5,drive=drive-virtio-disk209,\ id=virtio-disk209 \ --drive file=/var/lib/libvirt/images/disk-h-c.img,if=none,id=drive-virtio-disk210 \ +-drive file=/var/lib/libvirt/images/disk-h-c.img,if=none,id=drive-virtio-disk210,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x6,drive=drive-virtio-disk210,\ id=virtio-disk210 \ --drive file=/var/lib/libvirt/images/disk-h-d.img,if=none,id=drive-virtio-disk211 \ +-drive file=/var/lib/libvirt/images/disk-h-d.img,if=none,id=drive-virtio-disk211,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x7,drive=drive-virtio-disk211,\ id=virtio-disk211 \ --drive file=/var/lib/libvirt/images/disk-i-a.img,if=none,id=drive-virtio-disk234 \ +-drive file=/var/lib/libvirt/images/disk-i-a.img,if=none,id=drive-virtio-disk234,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x8,drive=drive-virtio-disk234,\ id=virtio-disk234 \ --drive file=/var/lib/libvirt/images/disk-i-b.img,if=none,id=drive-virtio-disk235 \ +-drive file=/var/lib/libvirt/images/disk-i-b.img,if=none,id=drive-virtio-disk235,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x9,drive=drive-virtio-disk235,\ id=virtio-disk235 \ --drive file=/var/lib/libvirt/images/disk-i-c.img,if=none,id=drive-virtio-disk236 \ +-drive file=/var/lib/libvirt/images/disk-i-c.img,if=none,id=drive-virtio-disk236,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0xa,drive=drive-virtio-disk236,\ id=virtio-disk236 \ --drive file=/var/lib/libvirt/images/disk-i-d.img,if=none,id=drive-virtio-disk237 \ +-drive file=/var/lib/libvirt/images/disk-i-d.img,if=none,id=drive-virtio-disk237,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0xb,drive=drive-virtio-disk237,\ id=virtio-disk237 \ --drive file=/var/lib/libvirt/images/disk-j-a.img,if=none,id=drive-virtio-disk260 \ +-drive file=/var/lib/libvirt/images/disk-j-a.img,if=none,id=drive-virtio-disk260,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0xc,drive=drive-virtio-disk260,\ id=virtio-disk260 \ --drive file=/var/lib/libvirt/images/disk-j-b.img,if=none,id=drive-virtio-disk261 \ +-drive file=/var/lib/libvirt/images/disk-j-b.img,if=none,id=drive-virtio-disk261,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0xd,drive=drive-virtio-disk261,\ id=virtio-disk261 \ --drive file=/var/lib/libvirt/images/disk-j-c.img,if=none,id=drive-virtio-disk262 \ +-drive file=/var/lib/libvirt/images/disk-j-c.img,if=none,id=drive-virtio-disk262,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0xe,drive=drive-virtio-disk262,\ id=virtio-disk262 \ --drive file=/var/lib/libvirt/images/disk-j-d.img,if=none,id=drive-virtio-disk263 \ +-drive file=/var/lib/libvirt/images/disk-j-d.img,if=none,id=drive-virtio-disk263,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0xf,drive=drive-virtio-disk263,\ id=virtio-disk263 \ --drive file=/var/lib/libvirt/images/disk-k-a.img,if=none,id=drive-virtio-disk286 \ +-drive file=/var/lib/libvirt/images/disk-k-a.img,if=none,id=drive-virtio-disk286,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x10,drive=drive-virtio-disk286,\ id=virtio-disk286 \ --drive file=/var/lib/libvirt/images/disk-k-b.img,if=none,id=drive-virtio-disk287 \ +-drive file=/var/lib/libvirt/images/disk-k-b.img,if=none,id=drive-virtio-disk287,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x11,drive=drive-virtio-disk287,\ id=virtio-disk287 \ --drive file=/var/lib/libvirt/images/disk-k-c.img,if=none,id=drive-virtio-disk288 \ +-drive file=/var/lib/libvirt/images/disk-k-c.img,if=none,id=drive-virtio-disk288,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x12,drive=drive-virtio-disk288,\ id=virtio-disk288 \ --drive file=/var/lib/libvirt/images/disk-k-d.img,if=none,id=drive-virtio-disk289 \ +-drive file=/var/lib/libvirt/images/disk-k-d.img,if=none,id=drive-virtio-disk289,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x13,drive=drive-virtio-disk289,\ id=virtio-disk289 \ --drive file=/var/lib/libvirt/images/disk-l-a.img,if=none,id=drive-virtio-disk312 \ +-drive file=/var/lib/libvirt/images/disk-l-a.img,if=none,id=drive-virtio-disk312,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x14,drive=drive-virtio-disk312,\ id=virtio-disk312 \ --drive file=/var/lib/libvirt/images/disk-l-b.img,if=none,id=drive-virtio-disk313 \ +-drive file=/var/lib/libvirt/images/disk-l-b.img,if=none,id=drive-virtio-disk313,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x15,drive=drive-virtio-disk313,\ id=virtio-disk313 \ --drive file=/var/lib/libvirt/images/disk-l-c.img,if=none,id=drive-virtio-disk314 \ +-drive file=/var/lib/libvirt/images/disk-l-c.img,if=none,id=drive-virtio-disk314,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x16,drive=drive-virtio-disk314,\ id=virtio-disk314 \ --drive file=/var/lib/libvirt/images/disk-l-d.img,if=none,id=drive-virtio-disk315 \ +-drive file=/var/lib/libvirt/images/disk-l-d.img,if=none,id=drive-virtio-disk315,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x17,drive=drive-virtio-disk315,\ id=virtio-disk315 \ --drive file=/var/lib/libvirt/images/disk-m-a.img,if=none,id=drive-virtio-disk338 \ +-drive file=/var/lib/libvirt/images/disk-m-a.img,if=none,id=drive-virtio-disk338,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x18,drive=drive-virtio-disk338,\ id=virtio-disk338 \ --drive file=/var/lib/libvirt/images/disk-m-b.img,if=none,id=drive-virtio-disk339 \ +-drive file=/var/lib/libvirt/images/disk-m-b.img,if=none,id=drive-virtio-disk339,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x19,drive=drive-virtio-disk339,\ id=virtio-disk339 \ --drive file=/var/lib/libvirt/images/disk-m-c.img,if=none,id=drive-virtio-disk340 \ +-drive file=/var/lib/libvirt/images/disk-m-c.img,if=none,id=drive-virtio-disk340,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x1a,drive=drive-virtio-disk340,\ id=virtio-disk340 \ --drive file=/var/lib/libvirt/images/disk-m-d.img,if=none,id=drive-virtio-disk341 \ +-drive file=/var/lib/libvirt/images/disk-m-d.img,if=none,id=drive-virtio-disk341,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x1b,drive=drive-virtio-disk341,\ id=virtio-disk341 \ --drive file=/var/lib/libvirt/images/disk-n-a.img,if=none,id=drive-virtio-disk364 \ +-drive file=/var/lib/libvirt/images/disk-n-a.img,if=none,id=drive-virtio-disk364,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x1c,drive=drive-virtio-disk364,\ id=virtio-disk364 \ --drive file=/var/lib/libvirt/images/disk-n-b.img,if=none,id=drive-virtio-disk365 \ +-drive file=/var/lib/libvirt/images/disk-n-b.img,if=none,id=drive-virtio-disk365,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x1d,drive=drive-virtio-disk365,\ id=virtio-disk365 \ --drive file=/var/lib/libvirt/images/disk-n-c.img,if=none,id=drive-virtio-disk366 \ +-drive file=/var/lib/libvirt/images/disk-n-c.img,if=none,id=drive-virtio-disk366,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x1e,drive=drive-virtio-disk366,\ id=virtio-disk366 \ --drive file=/var/lib/libvirt/images/disk-n-d.img,if=none,id=drive-virtio-disk367 \ +-drive file=/var/lib/libvirt/images/disk-n-d.img,if=none,id=drive-virtio-disk367,\ +format=raw \ -device virtio-blk-pci,bus=pci.1,addr=0x1f,drive=drive-virtio-disk367,\ id=virtio-disk367 \ --drive file=/var/lib/libvirt/images/disk-o-a.img,if=none,id=drive-virtio-disk390 \ +-drive file=/var/lib/libvirt/images/disk-o-a.img,if=none,id=drive-virtio-disk390,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x1,drive=drive-virtio-disk390,\ id=virtio-disk390 \ --drive file=/var/lib/libvirt/images/disk-o-b.img,if=none,id=drive-virtio-disk391 \ +-drive file=/var/lib/libvirt/images/disk-o-b.img,if=none,id=drive-virtio-disk391,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x2,drive=drive-virtio-disk391,\ id=virtio-disk391 \ --drive file=/var/lib/libvirt/images/disk-o-c.img,if=none,id=drive-virtio-disk392 \ +-drive file=/var/lib/libvirt/images/disk-o-c.img,if=none,id=drive-virtio-disk392,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x3,drive=drive-virtio-disk392,\ id=virtio-disk392 \ --drive file=/var/lib/libvirt/images/disk-o-d.img,if=none,id=drive-virtio-disk393 \ +-drive file=/var/lib/libvirt/images/disk-o-d.img,if=none,id=drive-virtio-disk393,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x4,drive=drive-virtio-disk393,\ id=virtio-disk393 \ --drive file=/var/lib/libvirt/images/disk-p-a.img,if=none,id=drive-virtio-disk416 \ +-drive file=/var/lib/libvirt/images/disk-p-a.img,if=none,id=drive-virtio-disk416,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x5,drive=drive-virtio-disk416,\ id=virtio-disk416 \ --drive file=/var/lib/libvirt/images/disk-p-b.img,if=none,id=drive-virtio-disk417 \ +-drive file=/var/lib/libvirt/images/disk-p-b.img,if=none,id=drive-virtio-disk417,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x6,drive=drive-virtio-disk417,\ id=virtio-disk417 \ --drive file=/var/lib/libvirt/images/disk-p-c.img,if=none,id=drive-virtio-disk418 \ +-drive file=/var/lib/libvirt/images/disk-p-c.img,if=none,id=drive-virtio-disk418,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x7,drive=drive-virtio-disk418,\ id=virtio-disk418 \ --drive file=/var/lib/libvirt/images/disk-p-d.img,if=none,id=drive-virtio-disk419 \ +-drive file=/var/lib/libvirt/images/disk-p-d.img,if=none,id=drive-virtio-disk419,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x8,drive=drive-virtio-disk419,\ id=virtio-disk419 \ --drive file=/var/lib/libvirt/images/disk-q-a.img,if=none,id=drive-virtio-disk442 \ +-drive file=/var/lib/libvirt/images/disk-q-a.img,if=none,id=drive-virtio-disk442,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x9,drive=drive-virtio-disk442,\ id=virtio-disk442 \ --drive file=/var/lib/libvirt/images/disk-q-b.img,if=none,id=drive-virtio-disk443 \ +-drive file=/var/lib/libvirt/images/disk-q-b.img,if=none,id=drive-virtio-disk443,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0xa,drive=drive-virtio-disk443,\ id=virtio-disk443 \ --drive file=/var/lib/libvirt/images/disk-q-c.img,if=none,id=drive-virtio-disk444 \ +-drive file=/var/lib/libvirt/images/disk-q-c.img,if=none,id=drive-virtio-disk444,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0xb,drive=drive-virtio-disk444,\ id=virtio-disk444 \ --drive file=/var/lib/libvirt/images/disk-q-d.img,if=none,id=drive-virtio-disk445 \ +-drive file=/var/lib/libvirt/images/disk-q-d.img,if=none,id=drive-virtio-disk445,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0xc,drive=drive-virtio-disk445,\ id=virtio-disk445 \ --drive file=/var/lib/libvirt/images/disk-r-a.img,if=none,id=drive-virtio-disk468 \ +-drive file=/var/lib/libvirt/images/disk-r-a.img,if=none,id=drive-virtio-disk468,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0xd,drive=drive-virtio-disk468,\ id=virtio-disk468 \ --drive file=/var/lib/libvirt/images/disk-r-b.img,if=none,id=drive-virtio-disk469 \ +-drive file=/var/lib/libvirt/images/disk-r-b.img,if=none,id=drive-virtio-disk469,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0xe,drive=drive-virtio-disk469,\ id=virtio-disk469 \ --drive file=/var/lib/libvirt/images/disk-r-c.img,if=none,id=drive-virtio-disk470 \ +-drive file=/var/lib/libvirt/images/disk-r-c.img,if=none,id=drive-virtio-disk470,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0xf,drive=drive-virtio-disk470,\ id=virtio-disk470 \ --drive file=/var/lib/libvirt/images/disk-r-d.img,if=none,id=drive-virtio-disk471 \ +-drive file=/var/lib/libvirt/images/disk-r-d.img,if=none,id=drive-virtio-disk471,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x10,drive=drive-virtio-disk471,\ id=virtio-disk471 \ --drive file=/var/lib/libvirt/images/disk-s-a.img,if=none,id=drive-virtio-disk494 \ +-drive file=/var/lib/libvirt/images/disk-s-a.img,if=none,id=drive-virtio-disk494,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x11,drive=drive-virtio-disk494,\ id=virtio-disk494 \ --drive file=/var/lib/libvirt/images/disk-s-b.img,if=none,id=drive-virtio-disk495 \ +-drive file=/var/lib/libvirt/images/disk-s-b.img,if=none,id=drive-virtio-disk495,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x12,drive=drive-virtio-disk495,\ id=virtio-disk495 \ --drive file=/var/lib/libvirt/images/disk-s-c.img,if=none,id=drive-virtio-disk496 \ +-drive file=/var/lib/libvirt/images/disk-s-c.img,if=none,id=drive-virtio-disk496,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x13,drive=drive-virtio-disk496,\ id=virtio-disk496 \ --drive file=/var/lib/libvirt/images/disk-s-d.img,if=none,id=drive-virtio-disk497 \ +-drive file=/var/lib/libvirt/images/disk-s-d.img,if=none,id=drive-virtio-disk497,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x14,drive=drive-virtio-disk497,\ id=virtio-disk497 \ --drive file=/var/lib/libvirt/images/disk-t-a.img,if=none,id=drive-virtio-disk520 \ +-drive file=/var/lib/libvirt/images/disk-t-a.img,if=none,id=drive-virtio-disk520,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x15,drive=drive-virtio-disk520,\ id=virtio-disk520 \ --drive file=/var/lib/libvirt/images/disk-t-b.img,if=none,id=drive-virtio-disk521 \ +-drive file=/var/lib/libvirt/images/disk-t-b.img,if=none,id=drive-virtio-disk521,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x16,drive=drive-virtio-disk521,\ id=virtio-disk521 \ --drive file=/var/lib/libvirt/images/disk-t-c.img,if=none,id=drive-virtio-disk522 \ +-drive file=/var/lib/libvirt/images/disk-t-c.img,if=none,id=drive-virtio-disk522,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x17,drive=drive-virtio-disk522,\ id=virtio-disk522 \ --drive file=/var/lib/libvirt/images/disk-t-d.img,if=none,id=drive-virtio-disk523 \ +-drive file=/var/lib/libvirt/images/disk-t-d.img,if=none,id=drive-virtio-disk523,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x18,drive=drive-virtio-disk523,\ id=virtio-disk523 \ --drive file=/var/lib/libvirt/images/disk-u-a.img,if=none,id=drive-virtio-disk546 \ +-drive file=/var/lib/libvirt/images/disk-u-a.img,if=none,id=drive-virtio-disk546,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x19,drive=drive-virtio-disk546,\ id=virtio-disk546 \ --drive file=/var/lib/libvirt/images/disk-u-b.img,if=none,id=drive-virtio-disk547 \ +-drive file=/var/lib/libvirt/images/disk-u-b.img,if=none,id=drive-virtio-disk547,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x1a,drive=drive-virtio-disk547,\ id=virtio-disk547 \ --drive file=/var/lib/libvirt/images/disk-u-c.img,if=none,id=drive-virtio-disk548 \ +-drive file=/var/lib/libvirt/images/disk-u-c.img,if=none,id=drive-virtio-disk548,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x1b,drive=drive-virtio-disk548,\ id=virtio-disk548 \ --drive file=/var/lib/libvirt/images/disk-u-d.img,if=none,id=drive-virtio-disk549 \ +-drive file=/var/lib/libvirt/images/disk-u-d.img,if=none,id=drive-virtio-disk549,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x1c,drive=drive-virtio-disk549,\ id=virtio-disk549 \ --drive file=/var/lib/libvirt/images/disk-v-a.img,if=none,id=drive-virtio-disk572 \ +-drive file=/var/lib/libvirt/images/disk-v-a.img,if=none,id=drive-virtio-disk572,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x1d,drive=drive-virtio-disk572,\ id=virtio-disk572 \ --drive file=/var/lib/libvirt/images/disk-v-b.img,if=none,id=drive-virtio-disk573 \ +-drive file=/var/lib/libvirt/images/disk-v-b.img,if=none,id=drive-virtio-disk573,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x1e,drive=drive-virtio-disk573,\ id=virtio-disk573 \ --drive file=/var/lib/libvirt/images/disk-v-c.img,if=none,id=drive-virtio-disk574 \ +-drive file=/var/lib/libvirt/images/disk-v-c.img,if=none,id=drive-virtio-disk574,\ +format=raw \ -device virtio-blk-pci,bus=pci.2,addr=0x1f,drive=drive-virtio-disk574,\ id=virtio-disk574 \ --drive file=/var/lib/libvirt/images/disk-v-d.img,if=none,id=drive-virtio-disk575 \ +-drive file=/var/lib/libvirt/images/disk-v-d.img,if=none,id=drive-virtio-disk575,\ +format=raw \ -device virtio-blk-pci,bus=pci.3,addr=0x1,drive=drive-virtio-disk575,\ id=virtio-disk575 \ --drive file=/var/lib/libvirt/images/disk-w-a.img,if=none,id=drive-virtio-disk598 \ +-drive file=/var/lib/libvirt/images/disk-w-a.img,if=none,id=drive-virtio-disk598,\ +format=raw \ -device virtio-blk-pci,bus=pci.3,addr=0x2,drive=drive-virtio-disk598,\ id=virtio-disk598 \ --drive file=/var/lib/libvirt/images/disk-w-b.img,if=none,id=drive-virtio-disk599 \ +-drive file=/var/lib/libvirt/images/disk-w-b.img,if=none,id=drive-virtio-disk599,\ +format=raw \ -device virtio-blk-pci,bus=pci.3,addr=0x3,drive=drive-virtio-disk599,\ id=virtio-disk599 \ --drive file=/var/lib/libvirt/images/disk-w-c.img,if=none,id=drive-virtio-disk600 \ +-drive file=/var/lib/libvirt/images/disk-w-c.img,if=none,id=drive-virtio-disk600,\ +format=raw \ -device virtio-blk-pci,bus=pci.3,addr=0x4,drive=drive-virtio-disk600,\ id=virtio-disk600 \ --drive file=/var/lib/libvirt/images/disk-w-d.img,if=none,id=drive-virtio-disk601 \ +-drive file=/var/lib/libvirt/images/disk-w-d.img,if=none,id=drive-virtio-disk601,\ +format=raw \ -device virtio-blk-pci,bus=pci.3,addr=0x5,drive=drive-virtio-disk601,\ id=virtio-disk601 \ --drive file=/var/lib/libvirt/images/disk-x-a.img,if=none,id=drive-virtio-disk624 \ +-drive file=/var/lib/libvirt/images/disk-x-a.img,if=none,id=drive-virtio-disk624,\ +format=raw \ -device virtio-blk-pci,bus=pci.3,addr=0x6,drive=drive-virtio-disk624,\ id=virtio-disk624 \ --drive file=/var/lib/libvirt/images/disk-x-b.img,if=none,id=drive-virtio-disk625 \ +-drive file=/var/lib/libvirt/images/disk-x-b.img,if=none,id=drive-virtio-disk625,\ +format=raw \ -device virtio-blk-pci,bus=pci.3,addr=0x7,drive=drive-virtio-disk625,\ id=virtio-disk625 \ --drive file=/var/lib/libvirt/images/disk-x-c.img,if=none,id=drive-virtio-disk626 \ +-drive file=/var/lib/libvirt/images/disk-x-c.img,if=none,id=drive-virtio-disk626,\ +format=raw \ -device virtio-blk-pci,bus=pci.3,addr=0x8,drive=drive-virtio-disk626,\ id=virtio-disk626 \ --drive file=/var/lib/libvirt/images/disk-x-d.img,if=none,id=drive-virtio-disk627 \ +-drive file=/var/lib/libvirt/images/disk-x-d.img,if=none,id=drive-virtio-disk627,\ +format=raw \ -device virtio-blk-pci,bus=pci.3,addr=0x9,drive=drive-virtio-disk627,\ id=virtio-disk627 \ --drive file=/var/lib/libvirt/images/disk-y-a.img,if=none,id=drive-virtio-disk650 \ +-drive file=/var/lib/libvirt/images/disk-y-a.img,if=none,id=drive-virtio-disk650,\ +format=raw \ -device virtio-blk-pci,bus=pci.3,addr=0xa,drive=drive-virtio-disk650,\ id=virtio-disk650 \ --drive file=/var/lib/libvirt/images/disk-y-b.img,if=none,id=drive-virtio-disk651 \ +-drive file=/var/lib/libvirt/images/disk-y-b.img,if=none,id=drive-virtio-disk651,\ +format=raw \ -device virtio-blk-pci,bus=pci.3,addr=0xb,drive=drive-virtio-disk651,\ id=virtio-disk651 \ --drive file=/var/lib/libvirt/images/disk-y-c.img,if=none,id=drive-virtio-disk652 \ +-drive file=/var/lib/libvirt/images/disk-y-c.img,if=none,id=drive-virtio-disk652,\ +format=raw \ -device virtio-blk-pci,bus=pci.3,addr=0xc,drive=drive-virtio-disk652,\ id=virtio-disk652 \ --drive file=/var/lib/libvirt/images/disk-y-d.img,if=none,id=drive-virtio-disk653 \ +-drive file=/var/lib/libvirt/images/disk-y-d.img,if=none,id=drive-virtio-disk653,\ +format=raw \ -device virtio-blk-pci,bus=pci.3,addr=0xd,drive=drive-virtio-disk653,\ id=virtio-disk653 \ --drive file=/var/lib/libvirt/images/disk-z-a.img,if=none,id=drive-virtio-disk676 \ +-drive file=/var/lib/libvirt/images/disk-z-a.img,if=none,id=drive-virtio-disk676,\ +format=raw \ -device virtio-blk-pci,bus=pci.3,addr=0xe,drive=drive-virtio-disk676,\ id=virtio-disk676 \ --drive file=/var/lib/libvirt/images/disk-z-b.img,if=none,id=drive-virtio-disk677 \ +-drive file=/var/lib/libvirt/images/disk-z-b.img,if=none,id=drive-virtio-disk677,\ +format=raw \ -device virtio-blk-pci,bus=pci.3,addr=0xf,drive=drive-virtio-disk677,\ id=virtio-disk677 \ --drive file=/var/lib/libvirt/images/disk-z-c.img,if=none,id=drive-virtio-disk678 \ +-drive file=/var/lib/libvirt/images/disk-z-c.img,if=none,id=drive-virtio-disk678,\ +format=raw \ -device virtio-blk-pci,bus=pci.3,addr=0x10,drive=drive-virtio-disk678,\ id=virtio-disk678 \ --drive file=/var/lib/libvirt/images/disk-z-d.img,if=none,id=drive-virtio-disk679 \ +-drive file=/var/lib/libvirt/images/disk-z-d.img,if=none,id=drive-virtio-disk679,\ +format=raw \ -device virtio-blk-pci,bus=pci.3,addr=0x11,drive=drive-virtio-disk679,\ id=virtio-disk679 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args index 63a8ca7..eff4223 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args @@ -16,90 +16,118 @@ QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait \ -boot c \ -usb \ --drive file=/var/iso/f18kde.iso,if=none,media=cdrom,id=drive-ide0-1-0 \ +-drive file=/var/iso/f18kde.iso,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --drive file=/var/lib/libvirt/images/test.img,if=none,id=drive-virtio-disk0 \ +-drive file=/var/lib/libvirt/images/test.img,if=none,id=drive-virtio-disk0,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ id=virtio-disk0 \ --drive file=/var/lib/libvirt/images/test1.img,if=none,id=drive-virtio-disk1 \ +-drive file=/var/lib/libvirt/images/test1.img,if=none,id=drive-virtio-disk1,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\ id=virtio-disk1 \ --drive file=/var/lib/libvirt/images/disk-a-a.img,if=none,id=drive-virtio-disk26 \ +-drive file=/var/lib/libvirt/images/disk-a-a.img,if=none,id=drive-virtio-disk26,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk26,\ id=virtio-disk26 \ --drive file=/var/lib/libvirt/images/disk-a-b.img,if=none,id=drive-virtio-disk27 \ +-drive file=/var/lib/libvirt/images/disk-a-b.img,if=none,id=drive-virtio-disk27,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk27,\ id=virtio-disk27 \ --drive file=/var/lib/libvirt/images/disk-a-c.img,if=none,id=drive-virtio-disk28 \ +-drive file=/var/lib/libvirt/images/disk-a-c.img,if=none,id=drive-virtio-disk28,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk28,\ id=virtio-disk28 \ --drive file=/var/lib/libvirt/images/disk-a-d.img,if=none,id=drive-virtio-disk29 \ +-drive file=/var/lib/libvirt/images/disk-a-d.img,if=none,id=drive-virtio-disk29,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x9,drive=drive-virtio-disk29,\ id=virtio-disk29 \ --drive file=/var/lib/libvirt/images/disk-b-a.img,if=none,id=drive-virtio-disk52 \ +-drive file=/var/lib/libvirt/images/disk-b-a.img,if=none,id=drive-virtio-disk52,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0xa,drive=drive-virtio-disk52,\ id=virtio-disk52 \ --drive file=/var/lib/libvirt/images/disk-b-b.img,if=none,id=drive-virtio-disk53 \ +-drive file=/var/lib/libvirt/images/disk-b-b.img,if=none,id=drive-virtio-disk53,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0xb,drive=drive-virtio-disk53,\ id=virtio-disk53 \ --drive file=/var/lib/libvirt/images/disk-b-c.img,if=none,id=drive-virtio-disk54 \ +-drive file=/var/lib/libvirt/images/disk-b-c.img,if=none,id=drive-virtio-disk54,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0xc,drive=drive-virtio-disk54,\ id=virtio-disk54 \ --drive file=/var/lib/libvirt/images/disk-b-d.img,if=none,id=drive-virtio-disk55 \ +-drive file=/var/lib/libvirt/images/disk-b-d.img,if=none,id=drive-virtio-disk55,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0xd,drive=drive-virtio-disk55,\ id=virtio-disk55 \ --drive file=/var/lib/libvirt/images/disk-c-a.img,if=none,id=drive-virtio-disk78 \ +-drive file=/var/lib/libvirt/images/disk-c-a.img,if=none,id=drive-virtio-disk78,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0xe,drive=drive-virtio-disk78,\ id=virtio-disk78 \ --drive file=/var/lib/libvirt/images/disk-c-b.img,if=none,id=drive-virtio-disk79 \ +-drive file=/var/lib/libvirt/images/disk-c-b.img,if=none,id=drive-virtio-disk79,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0xf,drive=drive-virtio-disk79,\ id=virtio-disk79 \ --drive file=/var/lib/libvirt/images/disk-c-c.img,if=none,id=drive-virtio-disk80 \ +-drive file=/var/lib/libvirt/images/disk-c-c.img,if=none,id=drive-virtio-disk80,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x10,drive=drive-virtio-disk80,\ id=virtio-disk80 \ --drive file=/var/lib/libvirt/images/disk-c-d.img,if=none,id=drive-virtio-disk81 \ +-drive file=/var/lib/libvirt/images/disk-c-d.img,if=none,id=drive-virtio-disk81,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x11,drive=drive-virtio-disk81,\ id=virtio-disk81 \ --drive file=/var/lib/libvirt/images/disk-d-a.img,if=none,id=drive-virtio-disk104 \ +-drive file=/var/lib/libvirt/images/disk-d-a.img,if=none,id=drive-virtio-disk104,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x12,drive=drive-virtio-disk104,\ id=virtio-disk104 \ --drive file=/var/lib/libvirt/images/disk-d-b.img,if=none,id=drive-virtio-disk105 \ +-drive file=/var/lib/libvirt/images/disk-d-b.img,if=none,id=drive-virtio-disk105,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x13,drive=drive-virtio-disk105,\ id=virtio-disk105 \ --drive file=/var/lib/libvirt/images/disk-d-c.img,if=none,id=drive-virtio-disk106 \ +-drive file=/var/lib/libvirt/images/disk-d-c.img,if=none,id=drive-virtio-disk106,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x14,drive=drive-virtio-disk106,\ id=virtio-disk106 \ --drive file=/var/lib/libvirt/images/disk-d-d.img,if=none,id=drive-virtio-disk107 \ +-drive file=/var/lib/libvirt/images/disk-d-d.img,if=none,id=drive-virtio-disk107,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x15,drive=drive-virtio-disk107,\ id=virtio-disk107 \ --drive file=/var/lib/libvirt/images/disk-e-a.img,if=none,id=drive-virtio-disk130 \ +-drive file=/var/lib/libvirt/images/disk-e-a.img,if=none,id=drive-virtio-disk130,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x16,drive=drive-virtio-disk130,\ id=virtio-disk130 \ --drive file=/var/lib/libvirt/images/disk-e-b.img,if=none,id=drive-virtio-disk131 \ +-drive file=/var/lib/libvirt/images/disk-e-b.img,if=none,id=drive-virtio-disk131,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x17,drive=drive-virtio-disk131,\ id=virtio-disk131 \ --drive file=/var/lib/libvirt/images/disk-e-c.img,if=none,id=drive-virtio-disk132 \ +-drive file=/var/lib/libvirt/images/disk-e-c.img,if=none,id=drive-virtio-disk132,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x18,drive=drive-virtio-disk132,\ id=virtio-disk132 \ --drive file=/var/lib/libvirt/images/disk-e-d.img,if=none,id=drive-virtio-disk133 \ +-drive file=/var/lib/libvirt/images/disk-e-d.img,if=none,id=drive-virtio-disk133,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x19,drive=drive-virtio-disk133,\ id=virtio-disk133 \ --drive file=/var/lib/libvirt/images/disk-f-a.img,if=none,id=drive-virtio-disk156 \ +-drive file=/var/lib/libvirt/images/disk-f-a.img,if=none,id=drive-virtio-disk156,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x1a,drive=drive-virtio-disk156,\ id=virtio-disk156 \ --drive file=/var/lib/libvirt/images/disk-f-b.img,if=none,id=drive-virtio-disk157 \ +-drive file=/var/lib/libvirt/images/disk-f-b.img,if=none,id=drive-virtio-disk157,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x1b,drive=drive-virtio-disk157,\ id=virtio-disk157 \ --drive file=/var/lib/libvirt/images/disk-f-c.img,if=none,id=drive-virtio-disk158 \ +-drive file=/var/lib/libvirt/images/disk-f-c.img,if=none,id=drive-virtio-disk158,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x1c,drive=drive-virtio-disk158,\ id=virtio-disk158 \ --drive file=/var/lib/libvirt/images/disk-f-d.img,if=none,id=drive-virtio-disk159 \ +-drive file=/var/lib/libvirt/images/disk-f-d.img,if=none,id=drive-virtio-disk159,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x1d,drive=drive-virtio-disk159,\ id=virtio-disk159 \ --drive file=/var/lib/libvirt/images/disk-g-a.img,if=none,id=drive-virtio-disk182 \ +-drive file=/var/lib/libvirt/images/disk-g-a.img,if=none,id=drive-virtio-disk182,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=drive-virtio-disk182,\ id=virtio-disk182 \ --drive file=/var/lib/libvirt/images/disk-g-b.img,if=none,id=drive-virtio-disk183 \ +-drive file=/var/lib/libvirt/images/disk-g-b.img,if=none,id=drive-virtio-disk183,\ +format=raw \ -device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=drive-virtio-disk183,\ id=virtio-disk183 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args index f1440d5..58f038c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,addr=0x3,\ rombar=1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args index 8a67d63..e7b9975 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args @@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev tty,id=charserial0,path=/dev/ttyS2 \ -device pci-serial,chardev=charserial0,id=serial0,bus=pci.0,addr=0x4 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args index 5c9b55a..2803835 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args @@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ -device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \ -device ioh3420,port=0x1a,chassis=40,id=pci.4,bus=pcie.0,addr=0x3 \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0,format=raw \ -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ -vga qxl \ -global qxl-vga.ram_size=67108864 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args index a9ff9b9..3059e2d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args @@ -28,7 +28,7 @@ QEMU_AUDIO_DRV=none \ -device xio3130-downstream,port=0x4,chassis=10,id=pci.10,bus=pci.4,addr=0x4 \ -device xio3130-downstream,port=0x5,chassis=11,id=pci.11,bus=pci.4,addr=0x5 \ -device xio3130-downstream,port=0x6,chassis=12,id=pci.12,bus=pci.4,addr=0x6 \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0,format=raw \ -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ -vga qxl \ -global qxl-vga.ram_size=67108864 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args index 2d25b34..01c2693 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args @@ -22,7 +22,7 @@ QEMU_AUDIO_DRV=none \ -device ioh3420,port=0x18,chassis=4,id=pci.4,bus=pcie.0,addr=0x3 \ -device x3130-upstream,id=pci.5,bus=pci.3,addr=0x0 \ -device x3130-upstream,id=pci.6,bus=pci.4,addr=0x0 \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0,format=raw \ -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ -vga qxl \ -global qxl-vga.ram_size=67108864 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args index 5dd9e6c..cf20760 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args @@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \ -global q35-pcihost.pci-hole64-size=1048576K \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0,format=raw \ -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ -vga qxl \ -global qxl-vga.ram_size=67108864 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args index 17a8fab..413231b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args @@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \ -device spapr-vscsi,id=scsi0,reg=0x2000 \ -device spapr-vscsi,id=scsi1,reg=0x30000000 \ -usb \ --drive file=/tmp/scsidisk.img,if=none,id=drive-scsi1-0-0-0 \ +-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi1-0-0-0,format=raw \ -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 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args index bd2a89e..5962d4a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args @@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \ -device spapr-vscsi,id=scsi0,reg=0x2000 \ -device spapr-vscsi,id=scsi1,reg=0x3000 \ -usb \ --drive file=/tmp/scsidisk.img,if=none,id=drive-scsi1-0-0-0 \ +-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi1-0-0-0,format=raw \ -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 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-q35.args index faa407f..7020e60 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ -device pci-bridge,chassis_nr=56,id=pci.2,bus=pci.1,addr=0x1 \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0,format=raw \ -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ -vga qxl \ -global qxl-vga.ram_size=67108864 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args index d48f28d..a022600 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args index a517f16..b6f7627 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args @@ -18,7 +18,7 @@ BAR='' \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args index e03bb8d..a5e82fe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args index 2e814a3..44896c2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args index 4f85749..1b53ca9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -device virtio-serial-s390,id=virtio-serial0 \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ -chardev pty,id=charconsole0 \ -device virtconsole,chardev=charconsole0,id=console0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args index 4f85749..1b53ca9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -device virtio-serial-s390,id=virtio-serial0 \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ -chardev pty,id=charconsole0 \ -device virtconsole,chardev=charconsole0,id=console0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args index 7a531fb..6f74a49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args index 7a531fb..6f74a49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args index 7a531fb..6f74a49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args index b0c3b26..49709c3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args @@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ --drive file=/dev/HostVG/QEMUGuest2,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ +-drive file=/dev/HostVG/QEMUGuest2,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args index 7a531fb..6f74a49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args index 7a531fb..6f74a49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args index 7a531fb..6f74a49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args index 7a531fb..6f74a49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args index 7a531fb..6f74a49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args index 7a531fb..6f74a49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args index edfb9c6..1ad0975 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args @@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev tty,id=charserial0,path=/dev/ttyS2 \ -device isa-serial,chardev=charserial0,id=serial0,iobase=0x3f8,irq=0x4 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args index 0a77fba..0b5b488 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args @@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev tty,id=charserial0,path=/dev/ttyS2 \ -device isa-serial,chardev=charserial0,id=serial0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args index 6cc64ef..778421e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial /dev/ttyS2 \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args index e2e8ba8..64fcd29 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args @@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev file,id=charserial0,path=/tmp/serial.log \ -device isa-serial,chardev=charserial0,id=serial0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args index 9fced8f..14e07da 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial file:/tmp/serial.log \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args index 07c2301..963fcdf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args @@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev pty,id=charserial0 \ -device isa-serial,chardev=charserial0,id=serial0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args index e71522c..8ab4d8c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial pty \ -serial file:/tmp/serial.log \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args index 1e07163..38b140c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args @@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev pty,id=charserial0 \ -device isa-serial,chardev=charserial0,id=serial0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args index 8dab65c..a4e4df7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial pty \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args index 7a531fb..6f74a49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args index fa229c4..99aeccf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev spiceport,id=charserial0,name=org.qemu.console.serial.0 \ -device isa-serial,chardev=charserial0,id=serial0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args index a934726..c589dc4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args @@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev socket,id=charserial0,host=127.0.0.1,port=9999 \ -device isa-serial,chardev=charserial0,id=serial0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args index 33a95e7..806cd0a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args @@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev socket,id=charserial0,host=127.0.0.1,port=9999,telnet,server,nowait \ -device isa-serial,chardev=charserial0,id=serial0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args index 10e9524..26e494a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial telnet:127.0.0.1:9999,server,nowait \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args index f2b56f4..dc0e722 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial tcp:127.0.0.1:9999 \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args index 610f223..dcc1b90 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args @@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev udp,id=charserial0,host=127.0.0.1,port=9998,localaddr=127.0.0.1,\ localport=9999 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args index 716e65e..df4bf2d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial udp:127.0.0.1:9998@127.0.0.1:9999 \ -serial udp::9999@:0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args index d5bab35..a427c51 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args @@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev socket,id=charserial0,path=/tmp/serial.sock \ -device isa-serial,chardev=charserial0,id=serial0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args index f9ace32..41e71cf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial unix:/tmp/serial.sock \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args index 3c475a6..ad6d151 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args @@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -chardev vc,id=charserial0 \ -device isa-serial,chardev=charserial0,id=serial0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args index 5768089..72c1aaa 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial vc \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args index 0203147..1d61a84 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args @@ -22,7 +22,7 @@ serial=CZC1065993,asset=CZC1065993,location=Upside down' \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smp.args b/tests/qemuxml2argvdata/qemuxml2argv-smp.args index 886cfd9..5ebbedd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smp.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args index 8974d50..5fea153 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -soundhw pcspk \ -device ES1370,id=sound1,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound.args b/tests/qemuxml2argvdata/qemuxml2argv-sound.args index e72b272..2d1e267 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args index 06f9407..3116c4f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -drive file=/var/lib/libvirt/images/QEMUGuest1,if=none,id=drive-ide0-0-0,\ -cache=none \ +format=qcow2,cache=none \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -vnc 127.0.0.1:-5900 \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args index 164f320..f85708c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -drive file=/var/lib/libvirt/images/QEMUGuest1,if=none,id=drive-ide0-0-0,\ -cache=none \ +format=qcow2,cache=none \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=16,\ bus=pci.0,addr=0x2 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args index 12ef653..ad5a775 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -drive file=/var/lib/libvirt/images/QEMUGuest1,if=none,id=drive-ide0-0-0,\ -cache=none \ +format=qcow2,cache=none \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,\ addr=0x2 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args index f9da7e0..8427c00 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args @@ -16,7 +16,8 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/var/lib/libvirt/images/QEMUGuest1,if=ide,bus=0,unit=0,cache=none \ +-drive file=/var/lib/libvirt/images/QEMUGuest1,if=ide,bus=0,unit=0,format=qcow2,\ +cache=none \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args index ac9a798..28dc75c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -drive file=/var/lib/libvirt/images/QEMUGuest1,if=none,id=drive-ide0-0-0,\ -cache=none \ +format=qcow2,cache=none \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=16,\ bus=pci.0,addr=0x2 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args index d4c386e..b7312c3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -drive file=/var/lib/libvirt/images/QEMUGuest1,if=none,id=drive-ide0-0-0,\ -cache=none \ +format=qcow2,cache=none \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,\ addr=0x2 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args index 7824a51..0935b7d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -drive file=/var/lib/libvirt/images/QEMUGuest1,if=none,id=drive-ide0-0-0,\ -cache=none \ +format=qcow2,cache=none \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device VGA,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args index c803e0b..6a21a79 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -drive file=/var/lib/libvirt/images/QEMUGuest1,if=none,id=drive-ide0-0-0,\ -cache=none \ +format=qcow2,cache=none \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device VGA,id=video0,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args index db2f87e..27e5b4e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args @@ -16,7 +16,8 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/var/lib/libvirt/images/QEMUGuest1,if=ide,bus=0,unit=0,cache=none \ +-drive file=/var/lib/libvirt/images/QEMUGuest1,if=ide,bus=0,unit=0,format=qcow2,\ +cache=none \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args index a014c55..302c634 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args @@ -18,10 +18,10 @@ QEMU_AUDIO_DRV=none \ -boot dc \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ -usb \ --drive file=/dev/sdfake,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/sdfake,if=none,id=drive-virtio-disk0,format=qcow2 \ -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 \ +-drive file=/dev/sdfake2,if=none,id=drive-virtio-disk1,format=qcow2 \ -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 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args index b849f13..2591c3d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0001 \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,\ bootindex=1 \ -chardev pty,id=charconsole0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args index 63b3f87..157f46b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args @@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ib700,id=watchdog0 \ -watchdog-action poweroff \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args index c384b63..c320656 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ -device diag288,id=watchdog0 \ -watchdog-action inject-nmi diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args index fe28c3c..ba12816 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args index 0dd622e..06af337 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args index 5eac1cf..6bd2f91 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index e03a53c..60905a3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -658,7 +658,7 @@ mymain(void) DO_TEST("bios", QEMU_CAPS_DEVICE, QEMU_CAPS_SGA); DO_TEST("bios-nvram", QEMU_CAPS_DEVICE, - QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_READONLY); + QEMU_CAPS_DRIVE_READONLY); DO_TEST("clock-utc", QEMU_CAPS_NODEFCONFIG); DO_TEST("clock-localtime", NONE); DO_TEST("clock-localtime-basis-localtime", QEMU_CAPS_RTC); @@ -756,66 +756,50 @@ mymain(void) DO_TEST("disk-drive-boot-cdrom", QEMU_CAPS_DRIVE_BOOT); DO_TEST("floppy-drive-fat", - QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_DRIVE_FORMAT); + QEMU_CAPS_DRIVE_BOOT); DO_TEST("disk-drive-fat", - QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_DRIVE_FORMAT); + QEMU_CAPS_DRIVE_BOOT); DO_TEST("disk-drive-readonly-disk", QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("disk-drive-readonly-no-device", QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_NODEFCONFIG); DO_TEST("disk-drive-fmt-qcow", - QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_DRIVE_FORMAT); + QEMU_CAPS_DRIVE_BOOT); DO_TEST("disk-drive-shared", - QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL); + QEMU_CAPS_DRIVE_SERIAL); DO_TEST("disk-drive-error-policy-stop", - QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_DRIVE_FORMAT); + QEMU_CAPS_MONITOR_JSON); DO_TEST("disk-drive-error-policy-enospace", - QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_DRIVE_FORMAT); + QEMU_CAPS_MONITOR_JSON); DO_TEST("disk-drive-error-policy-wreport-rignore", - QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_DRIVE_FORMAT); - DO_TEST("disk-drive-cache-v2-wt", - QEMU_CAPS_DRIVE_FORMAT); - DO_TEST("disk-drive-cache-v2-wb", - QEMU_CAPS_DRIVE_FORMAT); - DO_TEST("disk-drive-cache-v2-none", - QEMU_CAPS_DRIVE_FORMAT); + QEMU_CAPS_MONITOR_JSON); + DO_TEST("disk-drive-cache-v2-wt", NONE); + DO_TEST("disk-drive-cache-v2-wb", NONE); + DO_TEST("disk-drive-cache-v2-none", NONE); DO_TEST("disk-drive-cache-directsync", - QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC, QEMU_CAPS_DRIVE_FORMAT); + QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC); DO_TEST("disk-drive-cache-unsafe", - QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_DRIVE_FORMAT); + QEMU_CAPS_DRIVE_CACHE_UNSAFE); DO_TEST("disk-drive-copy-on-read", - QEMU_CAPS_DRIVE_COPY_ON_READ, QEMU_CAPS_DRIVE_FORMAT); - DO_TEST("disk-drive-network-nbd", - QEMU_CAPS_DRIVE_FORMAT); - DO_TEST("disk-drive-network-nbd-export", - QEMU_CAPS_DRIVE_FORMAT); - DO_TEST("disk-drive-network-nbd-ipv6", - QEMU_CAPS_DRIVE_FORMAT); - DO_TEST("disk-drive-network-nbd-ipv6-export", - QEMU_CAPS_DRIVE_FORMAT); - DO_TEST("disk-drive-network-nbd-unix", - QEMU_CAPS_DRIVE_FORMAT); - DO_TEST("disk-drive-network-iscsi", - QEMU_CAPS_DRIVE_FORMAT); - DO_TEST("disk-drive-network-iscsi-auth", - QEMU_CAPS_DRIVE_FORMAT); + QEMU_CAPS_DRIVE_COPY_ON_READ); + DO_TEST("disk-drive-network-nbd", NONE); + DO_TEST("disk-drive-network-nbd-export", NONE); + DO_TEST("disk-drive-network-nbd-ipv6", NONE); + DO_TEST("disk-drive-network-nbd-ipv6-export", NONE); + DO_TEST("disk-drive-network-nbd-unix", NONE); + DO_TEST("disk-drive-network-iscsi", NONE); + DO_TEST("disk-drive-network-iscsi-auth", NONE); DO_TEST("disk-drive-network-iscsi-lun", - QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE_FORMAT, + QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO, QEMU_CAPS_SCSI_BLOCK); - DO_TEST("disk-drive-network-gluster", - QEMU_CAPS_DRIVE_FORMAT); - DO_TEST("disk-drive-network-rbd", - QEMU_CAPS_DRIVE_FORMAT); - DO_TEST("disk-drive-network-sheepdog", - QEMU_CAPS_DRIVE_FORMAT); - DO_TEST("disk-drive-network-rbd-auth", - QEMU_CAPS_DRIVE_FORMAT); - DO_TEST("disk-drive-network-rbd-ipv6", - QEMU_CAPS_DRIVE_FORMAT); - DO_TEST_FAILURE("disk-drive-network-rbd-no-colon", - QEMU_CAPS_DRIVE_FORMAT); + DO_TEST("disk-drive-network-gluster", NONE); + DO_TEST("disk-drive-network-rbd", NONE); + DO_TEST("disk-drive-network-sheepdog", NONE); + DO_TEST("disk-drive-network-rbd-auth", NONE); + DO_TEST("disk-drive-network-rbd-ipv6", NONE); + DO_TEST_FAILURE("disk-drive-network-rbd-no-colon", NONE); DO_TEST("disk-drive-no-boot", QEMU_CAPS_DEVICE, QEMU_CAPS_BOOTINDEX); DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid", @@ -875,8 +859,7 @@ mymain(void) QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_ICH9_AHCI); DO_TEST("disk-aio", - QEMU_CAPS_DRIVE_AIO, - QEMU_CAPS_DRIVE_FORMAT); + QEMU_CAPS_DRIVE_AIO); DO_TEST("disk-source-pool", QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("disk-source-pool-mode", @@ -892,8 +875,7 @@ mymain(void) DO_TEST("disk-drive-discard", QEMU_CAPS_DRIVE_DISCARD, QEMU_CAPS_DEVICE); - DO_TEST("disk-snapshot", - QEMU_CAPS_DRIVE_FORMAT); + DO_TEST("disk-snapshot", NONE); DO_TEST_FAILURE("disk-same-targets", QEMU_CAPS_DEVICE, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_DEVICE_USB_STORAGE, QEMU_CAPS_NODEFCONFIG); diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args index d904244..c25a069 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none ARGUMENT diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args index d904244..c25a069 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none ARGUMENT diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args index d904244..c25a069 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none ARGUMENT diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args index d904244..c25a069 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none ARGUMENT diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args index d904244..c25a069 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none ARGUMENT diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args index d904244..c25a069 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none ARGUMENT diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args index 37a02e8..fc42040 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -net none \ -serial none \ -parallel none -- 2.5.0

The -sdl and -net ...name=XXX arguments were both introduced in QEMU 0.10, so the QEMU driver can assume they are always available. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 4 ---- src/qemu/qemu_capabilities.h | 6 +---- src/qemu/qemu_command.c | 27 ++++++++-------------- src/qemu/qemu_hotplug.c | 9 +------- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 - tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 - tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 - tests/qemucaps2xmldata/all_1.6.0-1.caps | 1 - tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps | 1 - tests/qemuhelptest.c | 8 ------- tests/qemuhotplugtest.c | 1 - .../qemuxml2argv-graphics-sdl-fullscreen.args | 1 + .../qemuxml2argv-graphics-sdl.args | 1 + .../qemuxml2argvdata/qemuxml2argv-net-client.args | 4 ++-- .../qemuxml2argv-net-eth-ifname.args | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 4 ++-- .../qemuxml2argvdata/qemuxml2argv-net-server.args | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-net-udp.args | 5 ++-- tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 4 ++-- .../qemuxml2argvdata/qemuxml2argv-net-virtio.args | 4 ++-- tests/qemuxml2argvtest.c | 6 ++--- 26 files changed, 33 insertions(+), 72 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5780c22..5abc9e7 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1227,9 +1227,6 @@ virQEMUCapsComputeCmdFlags(const char *help, if (strstr(help, "-machine")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT); - if (version >= 10000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_0_10); - if (version >= 11000) virQEMUCapsSet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_SG_IO); @@ -3165,7 +3162,6 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_0_10); virQEMUCapsSet(qemuCaps, QEMU_CAPS_MEM_PATH); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL); virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 4b0008e..8591d01 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -68,7 +68,7 @@ typedef enum { /* 15 */ X_QEMU_CAPS_VGA, /* Is -vga avail */ - QEMU_CAPS_0_10, /* features added in qemu-0.10.0 or later */ + X_QEMU_CAPS_0_10, /* features added in qemu-0.10.0 or later */ QEMU_CAPS_PCIDEVICE, /* PCI device assignment supported */ QEMU_CAPS_MEM_PATH, /* mmap'ped guest backing supported */ QEMU_CAPS_DRIVE_SERIAL, /* -driver serial= available */ @@ -328,10 +328,6 @@ typedef enum { QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; -/* Aliases for some of the capabilities defined above */ -# define QEMU_CAPS_NET_NAME QEMU_CAPS_0_10 /* -net ...,name=str */ -# define QEMU_CAPS_HOST_NET_ADD QEMU_CAPS_0_10 /* host_net_add command */ - typedef struct _virQEMUCaps virQEMUCaps; typedef virQEMUCaps *virQEMUCapsPtr; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a29cd08..5086c40 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1164,17 +1164,14 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) if (qemuAssignDeviceDiskAlias(def, def->disks[i], qemuCaps) < 0) return -1; } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NET_NAME) || - virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { - for (i = 0; i < def->nnets; i++) { - /* type='hostdev' interfaces are also on the hostdevs list, - * and will have their alias assigned with other hostdevs. - */ - if (virDomainNetGetActualType(def->nets[i]) - != VIR_DOMAIN_NET_TYPE_HOSTDEV && - qemuAssignDeviceNetAlias(def, def->nets[i], i) < 0) { - return -1; - } + for (i = 0; i < def->nnets; i++) { + /* type='hostdev' interfaces are also on the hostdevs list, + * and will have their alias assigned with other hostdevs. + */ + if (virDomainNetGetActualType(def->nets[i]) + != VIR_DOMAIN_NET_TYPE_HOSTDEV && + qemuAssignDeviceNetAlias(def, def->nets[i], i) < 0) { + return -1; } } @@ -8514,8 +8511,7 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfigPtr cfg, { switch ((virDomainGraphicsType) graphics->type) { case VIR_DOMAIN_GRAPHICS_TYPE_SDL: - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_0_10) && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_SDL)) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SDL)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("sdl not supported by '%s'"), def->emulator); return -1; @@ -10551,11 +10547,6 @@ qemuBuildCommandLine(virConnectPtr conn, } } - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_0_10) && sdl + vnc + spice > 1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("only 1 graphics device is supported")); - goto error; - } if (sdl > 1 || vnc > 1 || spice > 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("only 1 graphics device of each type " diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4a98bdf..99b6542 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -908,12 +908,6 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, goto cleanup; } - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_HOST_NET_ADD)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("installed qemu version does not support host_net_add")); - goto cleanup; - } - /* Currently nothing besides TAP devices supports multiqueue. */ if (net->driver.virtio.queues > 0 && !(actualType == VIR_DOMAIN_NET_TYPE_NETWORK || @@ -998,8 +992,7 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, goto cleanup; } - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NET_NAME) || - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { if (qemuAssignDeviceNetAlias(vm->def, net, -1) < 0) goto cleanup; } diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps index b0b9063..34ddd80 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='0.10'/> <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='chardev'/> diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps index 25c686c..cb8eac9 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='0.10'/> <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='chardev'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps index c24d79a..86982f1 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='0.10'/> <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='chardev'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps index 0616abf..5401d65 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='0.10'/> <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='chardev'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index 4ccaa7b..63536a7 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='0.10'/> <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='chardev'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps index dba50a5..6717a94 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='0.10'/> <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='chardev'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps index 92ca440..1098dcf 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps +++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='0.10'/> <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='chardev'/> diff --git a/tests/qemucaps2xmldata/all_1.6.0-1.caps b/tests/qemucaps2xmldata/all_1.6.0-1.caps index a50a3e4..1484c79 100644 --- a/tests/qemucaps2xmldata/all_1.6.0-1.caps +++ b/tests/qemucaps2xmldata/all_1.6.0-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='0.10'/> <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='chardev'/> diff --git a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps index f93b0a1..8bd8a18 100644 --- a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps +++ b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps @@ -1,5 +1,4 @@ <qemuCaps> - <flag name='0.10'/> <flag name='mem-path'/> <flag name='drive-serial'/> <flag name='chardev'/> diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 371ff35..35fc9c7 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -154,7 +154,6 @@ mymain(void) DO_TEST("qemu-0.12.1", 12001, 0, 0, QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_DRIVE_READONLY, - QEMU_CAPS_0_10, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_SDL, QEMU_CAPS_CHARDEV, @@ -179,7 +178,6 @@ mymain(void) QEMU_CAPS_KVM, QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_DRIVE_READONLY, - QEMU_CAPS_0_10, QEMU_CAPS_PCIDEVICE, QEMU_CAPS_MEM_PATH, QEMU_CAPS_CHARDEV, @@ -229,7 +227,6 @@ mymain(void) QEMU_CAPS_KVM, QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_DRIVE_READONLY, - QEMU_CAPS_0_10, QEMU_CAPS_PCIDEVICE, QEMU_CAPS_MEM_PATH, QEMU_CAPS_SDL, @@ -260,7 +257,6 @@ mymain(void) QEMU_CAPS_KVM, QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_DRIVE_READONLY, - QEMU_CAPS_0_10, QEMU_CAPS_PCIDEVICE, QEMU_CAPS_MEM_PATH, QEMU_CAPS_SDL, @@ -320,7 +316,6 @@ mymain(void) QEMU_CAPS_KVM, QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_DRIVE_READONLY, - QEMU_CAPS_0_10, QEMU_CAPS_PCIDEVICE, QEMU_CAPS_MEM_PATH, QEMU_CAPS_CHARDEV, @@ -377,7 +372,6 @@ mymain(void) QEMU_CAPS_KVM, QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_DRIVE_READONLY, - QEMU_CAPS_0_10, QEMU_CAPS_PCIDEVICE, QEMU_CAPS_MEM_PATH, QEMU_CAPS_CHARDEV, @@ -441,7 +435,6 @@ mymain(void) QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_DRIVE_READONLY, - QEMU_CAPS_0_10, QEMU_CAPS_MEM_PATH, QEMU_CAPS_SDL, QEMU_CAPS_CHARDEV, @@ -521,7 +514,6 @@ mymain(void) QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_DRIVE_READONLY, - QEMU_CAPS_0_10, QEMU_CAPS_MEM_PATH, QEMU_CAPS_SDL, QEMU_CAPS_CHARDEV, diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index af64067..102e052 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -72,7 +72,6 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt, /* for attach & detach qemu must support -device */ virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE); - virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_NET_NAME); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VIRTIO_SCSI); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE); if (event) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args index 48ec7de..04e00f7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args @@ -21,4 +21,5 @@ DISPLAY=:0.1 \ -serial none \ -parallel none \ -full-screen \ +-sdl \ -vga cirrus diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args index a0ea8d5..5615ad6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args @@ -20,4 +20,5 @@ DISPLAY=:0.1 \ -net none \ -serial none \ -parallel none \ +-sdl \ -vga std diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-client.args b/tests/qemuxml2argvdata/qemuxml2argv-net-client.args index d2d4ac5..267fbf2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-client.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-client.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ --net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 \ --net socket,connect=192.168.0.1:5558,vlan=0 \ +-net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139,name=net0 \ +-net socket,connect=192.168.0.1:5558,vlan=0,name=hostnet0 \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args index 02679aa..26992ce 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ --net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 \ --net tap,ifname=nic02,script=/etc/qemu-ifup,vlan=0 \ +-net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139,name=net0 \ +-net tap,ifname=nic02,script=/etc/qemu-ifup,vlan=0,name=hostnet0 \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args index d4db71c..ddc5fa1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ --net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 \ --net tap,script=/etc/qemu-ifup,vlan=0 \ +-net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139,name=net0 \ +-net tap,script=/etc/qemu-ifup,vlan=0,name=hostnet0 \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args index 77bb706..5594ce7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ --net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 \ --net socket,mcast=192.0.0.1:5558,vlan=0 \ +-net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139,name=net0 \ +-net socket,mcast=192.0.0.1:5558,vlan=0,name=hostnet0 \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-server.args b/tests/qemuxml2argvdata/qemuxml2argv-net-server.args index ddbc0da..e5474f8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-server.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-server.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ --net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 \ --net socket,listen=192.168.0.1:5558,vlan=0 \ +-net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139,name=net0 \ +-net socket,listen=192.168.0.1:5558,vlan=0,name=hostnet0 \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args b/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args index 650fe6b..fcbf3ff 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args @@ -17,7 +17,8 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ --net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 \ --net socket,udp=192.168.10.1:5555,localaddr=192.168.10.1:5556,vlan=0 \ +-net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139,name=net0 \ +-net socket,udp=192.168.10.1:5555,localaddr=192.168.10.1:5556,vlan=0,\ +name=hostnet0 \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user.args b/tests/qemuxml2argvdata/qemuxml2argv-net-user.args index 7fc1ec9..b4db69f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-user.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-user.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ --net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 \ --net user,vlan=0 \ +-net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139,name=net0 \ +-net user,vlan=0,name=hostnet0 \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args index a4f2175..169c57b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args @@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ --net nic,macaddr=00:11:22:33:44:55,vlan=0,model=virtio \ --net user,vlan=0 \ +-net nic,macaddr=00:11:22:33:44:55,vlan=0,model=virtio,name=net0 \ +-net user,vlan=0,name=hostnet0 \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0314699..489515d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -912,8 +912,8 @@ mymain(void) VIR_FREE(driver.config->vncSASLdir); VIR_FREE(driver.config->vncTLSx509certdir); - DO_TEST("graphics-sdl", NONE); - DO_TEST("graphics-sdl-fullscreen", NONE); + DO_TEST("graphics-sdl", QEMU_CAPS_SDL); + DO_TEST("graphics-sdl-fullscreen", QEMU_CAPS_SDL); DO_TEST("nographics", NONE); DO_TEST("nographics-vga", QEMU_CAPS_VGA_NONE); @@ -990,7 +990,7 @@ mymain(void) QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); DO_TEST("net-eth", NONE); DO_TEST("net-eth-ifname", NONE); - DO_TEST("net-eth-names", QEMU_CAPS_NET_NAME); + DO_TEST("net-eth-names", NONE); DO_TEST("net-client", NONE); DO_TEST("net-server", NONE); DO_TEST("net-mcast", NONE); -- 2.5.0

On Mon, Nov 09, 2015 at 06:28:03PM -0500, John Ferlan wrote: Rather than ignoring it, I added this: virDomainGraphicsDefPtr sdl; if (VIR_ALLOC(sdl) < 0) goto error; sdl->type = VIR_DOMAIN_GRAPHICS_TYPE_SDL; Yep, you're right. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

On Tue, Nov 10, 2015 at 06:22:32AM -0500, John Ferlan wrote: That deals with case where QEMU would previously default to SDL if no args are listed. If you specified '-vnc blah -sdl' it would not trigger though, so we need to improve that. Sigh, so how about this instead, so we just explicitly trigger the existing SDL codepath: diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c016d43..792ada3 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -12759,6 +12759,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps, qemuDomainCmdlineDefPtr cmd = NULL; virDomainDiskDefPtr disk = NULL; const char *ceph_args = qemuFindEnv(progenv, "CEPH_ARGS"); + bool have_sdl = false; if (pidfile) *pidfile = NULL; @@ -12982,10 +12983,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps, goto error; } } else if (STREQ(arg, "-sdl")) { - virDomainGraphicsDefPtr sdl; - if (VIR_ALLOC(sdl) < 0) - goto error; - sdl->type = VIR_DOMAIN_GRAPHICS_TYPE_SDL; + have_sdl = true; } else if (STREQ(arg, "-m")) { int mem; WANT_VALUE(); @@ -13672,7 +13670,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps, VIR_FREE(capsdata); } - if (!nographics && def->ngraphics == 0) { + if (!nographics && (def->ngraphics == 0 || have_sdl)) { virDomainGraphicsDefPtr sdl; const char *display = qemuFindEnv(progenv, "DISPLAY"); const char *xauth = qemuFindEnv(progenv, "XAUTHORITY"); Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|