[libvirt] [PATCH 2/8] Mandate QEMU >= 0.15.0

In Nov 2015 commit fc604c1 mandated at least QEMU 0.12.0, which was released in Dec 2009. Increase the requirement to 0.15.0 (Aug 2011), which was the first release that stopped promising HMP compatibility. This lets us assume every QEMU supports JSON monitor. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 11 +- tests/qemuhelpdata/qemu-0.12.1 | 198 ------------------------ tests/qemuhelpdata/qemu-0.12.1-device | 62 -------- tests/qemuhelpdata/qemu-kvm-0.12.3 | 215 -------------------------- tests/qemuhelpdata/qemu-kvm-0.12.3-device | 63 -------- tests/qemuhelpdata/qemu-kvm-0.13.0 | 242 ------------------------------ tests/qemuhelpdata/qemu-kvm-0.13.0-device | 90 ----------- tests/qemuhelptest.c | 117 --------------- 8 files changed, 4 insertions(+), 994 deletions(-) delete mode 100644 tests/qemuhelpdata/qemu-0.12.1 delete mode 100644 tests/qemuhelpdata/qemu-0.12.1-device delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.3 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.3-device delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.13.0 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.13.0-device diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 73527820a..f2b385f4c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1368,7 +1368,7 @@ virQEMUCapsComputeCmdFlags(const char *help, * is most likely buggy when used with -no-shutdown (which applies for qemu * 0.14.* and 0.15.0) */ - if (strstr(help, "-no-shutdown") && (version < 14000 || version > 15000)) + if (strstr(help, "-no-shutdown") && version > 15000) virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_SHUTDOWN); if (strstr(help, "dump-guest-core=on|off")) @@ -1493,9 +1493,9 @@ int virQEMUCapsParseHelpStr(const char *qemu, *version = (major * 1000 * 1000) + (minor * 1000) + micro; - if (*version < 12000) { + if (*version < 15000) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("QEMU version >= 0.12.00 is required, but %d.%d.%d found"), + _("QEMU version >= 0.15.00 is required, but %d.%d.%d found"), major, minor, micro); goto cleanup; } @@ -4430,10 +4430,7 @@ virQEMUCapsInitHelp(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid, const c virQEMUCapsClear(qemuCaps, QEMU_CAPS_NO_ACPI); } - /* virQEMUCapsExtractDeviceStr will only set additional caps if qemu - * understands the 0.13.0+ notion of "-device driver,". */ - if (strstr(help, "-device driver,?") && - virQEMUCapsExtractDeviceStr(qemuCaps->binary, + if (virQEMUCapsExtractDeviceStr(qemuCaps->binary, qemuCaps, runUid, runGid) < 0) { goto cleanup; } diff --git a/tests/qemuhelpdata/qemu-0.12.1 b/tests/qemuhelpdata/qemu-0.12.1 deleted file mode 100644 index 0caa3b36a..000000000 --- a/tests/qemuhelpdata/qemu-0.12.1 +++ /dev/null @@ -1,198 +0,0 @@ -QEMU PC emulator version 0.12.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: --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[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets] - set the number of CPUs to 'n' [default=1] - maxcpus= maximum number of total cpus, including - offline CPUs for hotplug etc. - cores= number of CPU cores on one socket - threads= number of threads on one CPU core - sockets= number of discrete sockets in the system --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][,id=name][,aio=threads|native] - use 'file' as a drive image --set group.id.arg=value - set <arg> parameter for item <id> of type <group> - i.e. -set drive.$id.file=/path/to/image --global driver.property=value - set a global default for a driver property --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' --device driver[,options] add device --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) --ctrl-grab use Right-Ctrl 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 --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][,vnet_hdr=on|off] - 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' - use vnet_hdr=off to avoid enabling the IFF_VNET_HDR tap flag; use - vnet_hdr=on to make the lack of IFF_VNET_HDR support an error condition --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' --netdev [user|tap|socket],id=str[,option][,option][,...] - -Character device options: --chardev null,id=id --chardev socket,id=id[,host=host],port=host[,to=to][,ipv4][,ipv6][,nodelay] - [,server][,nowait][,telnet] (tcp) --chardev socket,id=id,path=path[,server][,nowait][,telnet] (unix) --chardev udp,id=id[,host=host],port=port[,localaddr=localaddr] - [,localport=localport][,ipv4][,ipv6] --chardev msmouse,id=id --chardev vc,id=id[[,width=width][,height=height]][[,cols=cols][,rows=rows]] --chardev file,id=id,path=path --chardev pipe,id=id,path=path --chardev pty,id=id --chardev stdio,id=id --chardev tty,id=id,path=path --chardev parport,id=id,path=path - -Bluetooth(R) options: --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' --qmp dev like -monitor but opens in 'control' mode. --mon chardev=[name][,mode=readline|control][,default] --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 ? --rtc [base=utc|localtime|date][,clock=host|vm][,driftfix=none|slew] - set the RTC base and clock, enable drift fix for clock ticks --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 --nodefaults don't create default devices. --chroot dir Chroot to dir just before starting the VM. --runas user Change to user id user just before starting the VM. --readconfig <file> --writeconfig <file> - read/write config file -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.12.1-device b/tests/qemuhelpdata/qemu-0.12.1-device deleted file mode 100644 index 63c7bef4d..000000000 --- a/tests/qemuhelpdata/qemu-0.12.1-device +++ /dev/null @@ -1,62 +0,0 @@ -name "pci-bridge", bus PCI -name "virtio-balloon-pci", bus PCI -name "virtio-console-pci", bus PCI -name "virtio-net-pci", bus PCI -name "virtio-blk-pci", bus PCI -name "i82562", bus PCI -name "i82559er", bus PCI -name "i82559c", bus PCI -name "i82559b", bus PCI -name "i82559a", bus PCI -name "i82558b", bus PCI -name "i82558a", bus PCI -name "i82557c", bus PCI -name "i82557b", bus PCI -name "i82557a", bus PCI -name "i82551", bus PCI -name "i82550", bus PCI -name "pcnet", bus PCI -name "rtl8139", bus PCI -name "e1000", bus PCI, desc "Intel Gigabit Ethernet" -name "ide-drive", bus IDE -name "isa-ide", bus ISA -name "piix4-ide", bus PCI, no-user -name "piix3-ide", bus PCI, no-user -name "i8042", bus ISA, no-user -name "sb16", bus ISA, desc "Creative Sound Blaster 16" -name "ES1370", bus PCI, desc "ENSONIQ AudioPCI ES1370" -name "AC97", bus PCI, desc "Intel 82801AA AC97 Audio" -name "VGA", bus PCI -name "SUNW,fdtwo", bus System -name "sysbus-fdc", bus System -name "isa-fdc", bus ISA, no-user -name "mc146818rtc", bus ISA, no-user -name "isa-serial", bus ISA -name "cirrus-vga", bus PCI, desc "Cirrus CLGD 54xx VGA" -name "isa-parallel", bus ISA -name "PIIX3", bus PCI, desc "ISA bridge", no-user -name "i440FX", bus PCI, desc "Host bridge", no-user -name "i440FX-pcihost", bus System, no-user -name "piix4-usb-uhci", bus PCI -name "piix3-usb-uhci", bus PCI -name "vmware-svga", bus PCI -name "ib700", bus ISA -name "ne2k_isa", bus ISA -name "smbus-eeprom", bus I2C -name "scsi-disk", bus SCSI, desc "virtual scsi disk or cdrom" -name "scsi-generic", bus SCSI, desc "pass through generic scsi device (/dev/sg*)" -name "usb-hub", bus USB -name "usb-host", bus USB -name "usb-kbd", bus USB -name "usb-mouse", bus USB -name "usb-tablet", bus USB -name "usb-storage", bus USB -name "usb-wacom-tablet", bus USB, desc "QEMU PenPartner Tablet" -name "usb-braille", bus USB -name "usb-serial", bus USB -name "usb-net", bus USB -name "usb-bt-dongle", bus USB -name "i6300esb", bus PCI -name "ne2k_pci", bus PCI -name "lsi53c895a", bus PCI, alias "lsi" -name "isabus-bridge", bus System, no-user diff --git a/tests/qemuhelpdata/qemu-kvm-0.12.3 b/tests/qemuhelpdata/qemu-kvm-0.12.3 deleted file mode 100644 index 268d36fbe..000000000 --- a/tests/qemuhelpdata/qemu-kvm-0.12.3 +++ /dev/null @@ -1,215 +0,0 @@ -QEMU PC emulator version 0.12.3 (qemu-kvm-0.12.3), 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[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets] - set the number of CPUs to 'n' [default=1] - maxcpus= maximum number of total cpus, including - offline CPUs for hotplug etc. - cores= number of CPU cores on one socket - threads= number of threads on one CPU core - sockets= number of discrete sockets in the system --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][,id=name][,aio=threads|native] - [,boot=on|off] - use 'file' as a drive image --set group.id.arg=value - set <arg> parameter for item <id> of type <group> - i.e. -set drive.$id.file=/path/to/image --global driver.property=value - set a global default for a driver property --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' --device driver[,options] add device --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) --ctrl-grab use Right-Ctrl 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 --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][,vnet_hdr=on|off] - 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' - use vnet_hdr=off to avoid enabling the IFF_VNET_HDR tap flag; use - vnet_hdr=on to make the lack of IFF_VNET_HDR support an error condition --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' --netdev [user|tap|socket],id=str[,option][,option][,...] - -Character device options: --chardev null,id=id --chardev socket,id=id[,host=host],port=host[,to=to][,ipv4][,ipv6][,nodelay] - [,server][,nowait][,telnet] (tcp) --chardev socket,id=id,path=path[,server][,nowait][,telnet] (unix) --chardev udp,id=id[,host=host],port=port[,localaddr=localaddr] - [,localport=localport][,ipv4][,ipv6] --chardev msmouse,id=id --chardev vc,id=id[[,width=width][,height=height]][[,cols=cols][,rows=rows]] --chardev file,id=id,path=path --chardev pipe,id=id,path=path --chardev pty,id=id --chardev stdio,id=id --chardev tty,id=id,path=path --chardev parport,id=id,path=path - -Bluetooth(R) options: --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' --qmp dev like -monitor but opens in 'control' mode. --mon chardev=[name][,mode=readline|control][,default] --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 ? --rtc [base=utc|localtime|date][,clock=host|vm][,driftfix=none|slew] - set the RTC base and clock, enable drift fix for clock ticks --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 --nodefaults don't create default devices. --chroot dir Chroot to dir just before starting the VM. --runas user Change to user id user just before starting the VM. --readconfig <file> --writeconfig <file> - read/write config file --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/qemuhelpdata/qemu-kvm-0.12.3-device b/tests/qemuhelpdata/qemu-kvm-0.12.3-device deleted file mode 100644 index 814dcaf74..000000000 --- a/tests/qemuhelpdata/qemu-kvm-0.12.3-device +++ /dev/null @@ -1,63 +0,0 @@ -name "pci-bridge", bus PCI -name "virtio-balloon-pci", bus PCI -name "virtio-console-pci", bus PCI -name "virtio-net-pci", bus PCI -name "virtio-blk-pci", bus PCI -name "i82562", bus PCI -name "i82559er", bus PCI -name "i82559c", bus PCI -name "i82559b", bus PCI -name "i82559a", bus PCI -name "i82558b", bus PCI -name "i82558a", bus PCI -name "i82557c", bus PCI -name "i82557b", bus PCI -name "i82557a", bus PCI -name "i82551", bus PCI -name "i82550", bus PCI -name "pcnet", bus PCI -name "rtl8139", bus PCI -name "e1000", bus PCI, desc "Intel Gigabit Ethernet" -name "ide-drive", bus IDE -name "isa-ide", bus ISA -name "piix4-ide", bus PCI, no-user -name "piix3-ide", bus PCI, no-user -name "i8042", bus ISA, no-user -name "sb16", bus ISA, desc "Creative Sound Blaster 16" -name "ES1370", bus PCI, desc "ENSONIQ AudioPCI ES1370" -name "AC97", bus PCI, desc "Intel 82801AA AC97 Audio" -name "VGA", bus PCI -name "SUNW,fdtwo", bus System -name "sysbus-fdc", bus System -name "isa-fdc", bus ISA, no-user -name "mc146818rtc", bus ISA, no-user -name "isa-serial", bus ISA -name "cirrus-vga", bus PCI, desc "Cirrus CLGD 54xx VGA" -name "isa-parallel", bus ISA -name "PIIX3", bus PCI, desc "ISA bridge", no-user -name "i440FX", bus PCI, desc "Host bridge", no-user -name "i440FX-pcihost", bus System, no-user -name "piix4-usb-uhci", bus PCI -name "piix3-usb-uhci", bus PCI -name "vmware-svga", bus PCI -name "ib700", bus ISA -name "ne2k_isa", bus ISA -name "testdev", bus ISA -name "smbus-eeprom", bus I2C -name "scsi-disk", bus SCSI, desc "virtual scsi disk or cdrom" -name "scsi-generic", bus SCSI, desc "pass through generic scsi device (/dev/sg*)" -name "usb-hub", bus USB -name "usb-host", bus USB -name "usb-kbd", bus USB -name "usb-mouse", bus USB -name "usb-tablet", bus USB -name "usb-storage", bus USB -name "usb-wacom-tablet", bus USB, desc "QEMU PenPartner Tablet" -name "usb-braille", bus USB -name "usb-serial", bus USB -name "usb-net", bus USB -name "usb-bt-dongle", bus USB -name "i6300esb", bus PCI -name "ne2k_pci", bus PCI -name "lsi53c895a", bus PCI, alias "lsi" -name "isabus-bridge", bus System, no-user diff --git a/tests/qemuhelpdata/qemu-kvm-0.13.0 b/tests/qemuhelpdata/qemu-kvm-0.13.0 deleted file mode 100644 index af29d11f7..000000000 --- a/tests/qemuhelpdata/qemu-kvm-0.13.0 +++ /dev/null @@ -1,242 +0,0 @@ -QEMU emulator version 0.13.0 (qemu-kvm-0.13.0), Copyright (c) 2003-2008 Fabrice Bellard -usage: qemu [options] [disk_image] - -'disk_image' is a raw hard disk 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[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets] - set the number of CPUs to 'n' [default=1] - maxcpus= maximum number of total cpus, including - offline CPUs for hotplug, etc - cores= number of CPU cores on one socket - threads= number of threads on one CPU core - sockets= number of discrete sockets in the system --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|unsafe][,format=f] - [,serial=s][,addr=A][,id=name][,aio=threads|native] - [,readonly=on|off][,boot=on|off] - use 'file' as a drive image --set group.id.arg=value - set <arg> parameter for item <id> of type <group> - i.e. -set drive.$id.file=/path/to/image --global driver.property=value - set a global default for a driver property --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] --mem-path FILE provide backing storage for guest RAM --mem-prealloc preallocate guest memory (use with -mem-path) --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' --device driver[,prop[=value][,...]] - add device (based on driver) - prop=value,... sets driver properties - use -device ? to print all possible drivers - use -device driver,? to print all possible properties -File system options: --fsdev local,id=id,path=path,security_model=[mapped|passthrough] -Virtual File system pass-through options: --virtfs local,path=path,mount_tag=tag,security_model=[mapped|passthrough] - --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) --ctrl-grab use Right-Ctrl 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 --g WxH[xDEPTH] Set the initial graphical resolution and depth --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 --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][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h] - 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') - use vnet_hdr=off to avoid enabling the IFF_VNET_HDR tap flag - use vnet_hdr=on to make the lack of IFF_VNET_HDR support an error condition - use vhost=on to enable experimental in kernel accelerator - use 'vhostfd=h' to connect to an already opened vhost net device --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' --netdev [user|tap|socket],id=str[,option][,option][,...] - -Character device options: --chardev null,id=id[,mux=on|off] --chardev socket,id=id[,host=host],port=host[,to=to][,ipv4][,ipv6][,nodelay] - [,server][,nowait][,telnet][,mux=on|off] (tcp) --chardev socket,id=id,path=path[,server][,nowait][,telnet],[mux=on|off] (unix) --chardev udp,id=id[,host=host],port=port[,localaddr=localaddr] - [,localport=localport][,ipv4][,ipv6][,mux=on|off] --chardev msmouse,id=id[,mux=on|off] --chardev vc,id=id[[,width=width][,height=height]][[,cols=cols][,rows=rows]] - [,mux=on|off] --chardev file,id=id,path=path[,mux=on|off] --chardev pipe,id=id,path=path[,mux=on|off] --chardev pty,id=id[,mux=on|off] --chardev stdio,id=id[,mux=on|off][,signal=on|off] --chardev tty,id=id,path=path[,mux=on|off] --chardev parport,id=id,path=path[,mux=on|off] - -Bluetooth(R) options: --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' --qmp dev like -monitor but opens in 'control' mode --mon chardev=[name][,mode=readline|control][,default] --debugcon dev redirect the debug console 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 --xen-domid id specify xen guest domain id --xen-create create domain using xen hypercalls, bypassing xend - warning: should not be used when xend is in use --xen-attach attach to existing xen domain - xend will use this when starting qemu --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 ? --rtc [base=utc|localtime|date][,clock=host|vm][,driftfix=none|slew] - set the RTC base and clock, enable drift fix for clock ticks (x86 only) --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 --nodefaults don't create default devices --chroot dir chroot to dir just before starting the VM --runas user change to user id user just before starting the VM --prom-env variable=value - set OpenBIOS nvram variables --semihosting semihosting mode --old-param old param mode --readconfig <file> --writeconfig <file> - read/write config file --nodefconfig - do not load default config files at startup --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=[seg:]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 - -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.13.0-device b/tests/qemuhelpdata/qemu-kvm-0.13.0-device deleted file mode 100644 index 6dd2d09c5..000000000 --- a/tests/qemuhelpdata/qemu-kvm-0.13.0-device +++ /dev/null @@ -1,90 +0,0 @@ -name "pci-bridge", bus PCI -name "virtio-balloon-pci", bus PCI -name "virtio-serial-pci", bus PCI, alias "virtio-serial" -name "virtio-net-pci", bus PCI -name "virtio-blk-pci", bus PCI -name "sysbus-ohci", bus System, desc "OHCI USB Controller" -name "pci-ohci", bus PCI, desc "Apple USB Controller" -name "rtl8139", bus PCI -name "e1000", bus PCI, desc "Intel Gigabit Ethernet" -name "ivshmem", bus PCI -name "smbus-eeprom", bus I2C -name "scsi-disk", bus SCSI, desc "virtual scsi disk or cdrom" -name "scsi-generic", bus SCSI, desc "pass through generic scsi device (/dev/sg*)" -name "usb-hub", bus USB -name "usb-host", bus USB -name "usb-kbd", bus USB -name "usb-mouse", bus USB -name "usb-tablet", bus USB -name "usb-storage", bus USB -name "usb-wacom-tablet", bus USB, desc "QEMU PenPartner Tablet" -name "usb-braille", bus USB -name "usb-serial", bus USB -name "usb-net", bus USB -name "usb-bt-dongle", bus USB -name "virtserialport", bus virtio-serial-bus -name "virtconsole", bus virtio-serial-bus -name "isa-serial", bus ISA -name "isa-parallel", bus ISA -name "vt82c686b-usb-uhci", bus PCI -name "piix4-usb-uhci", bus PCI -name "piix3-usb-uhci", bus PCI -name "SUNW,fdtwo", bus System -name "sysbus-fdc", bus System -name "i6300esb", bus PCI -name "ne2k_pci", bus PCI -name "i82801", bus PCI, desc "Intel i82801 Ethernet" -name "i82562", bus PCI, desc "Intel i82562 Ethernet" -name "i82559er", bus PCI, desc "Intel i82559ER Ethernet" -name "i82559c", bus PCI, desc "Intel i82559C Ethernet" -name "i82559b", bus PCI, desc "Intel i82559B Ethernet" -name "i82559a", bus PCI, desc "Intel i82559A Ethernet" -name "i82558b", bus PCI, desc "Intel i82558B Ethernet" -name "i82558a", bus PCI, desc "Intel i82558A Ethernet" -name "i82557c", bus PCI, desc "Intel i82557C Ethernet" -name "i82557b", bus PCI, desc "Intel i82557B Ethernet" -name "i82557a", bus PCI, desc "Intel i82557A Ethernet" -name "i82551", bus PCI, desc "Intel i82551 Ethernet" -name "i82550", bus PCI, desc "Intel i82550 Ethernet" -name "pcnet", bus PCI -name "ne2k_isa", bus ISA -name "ide-drive", bus IDE -name "isa-ide", bus ISA -name "lsi53c895a", bus PCI, alias "lsi" -name "VGA", bus PCI -name "vmware-svga", bus PCI -name "sb16", bus ISA, desc "Creative Sound Blaster 16" -name "ES1370", bus PCI, desc "ENSONIQ AudioPCI ES1370" -name "AC97", bus PCI, desc "Intel 82801AA AC97 Audio" -name "cirrus-vga", bus PCI, desc "Cirrus CLGD 54xx VGA" -name "isa-applesmc", bus ISA -name "ib700", bus ISA -name "isa-debugcon", bus ISA -name "testdev", bus ISA -name "PIIX4_PM", bus PCI, desc "PM" -name "pci-assign", bus PCI, desc "pass through host pci devices to the guest" -pci-assign.host=pci-hostaddr -pci-assign.iommu=uint32 -pci-assign.configfd=string -virtio-net-pci.vectors=uint32 -virtio-net-pci.indirect_desc=on/off -virtio-net-pci.csum=on/off -virtio-net-pci.guest_csum=on/off -virtio-net-pci.gso=on/off -virtio-net-pci.guest_tso4=on/off -virtio-net-pci.guest_tso6=on/off -virtio-net-pci.guest_ecn=on/off -virtio-net-pci.guest_ufo=on/off -virtio-net-pci.host_tso4=on/off -virtio-net-pci.host_tso6=on/off -virtio-net-pci.host_ecn=on/off -virtio-net-pci.host_ufo=on/off -virtio-net-pci.mrg_rxbuf=on/off -virtio-net-pci.status=on/off -virtio-net-pci.ctrl_vq=on/off -virtio-net-pci.ctrl_rx=on/off -virtio-net-pci.ctrl_vlan=on/off -virtio-net-pci.ctrl_rx_extra=on/off -virtio-net-pci.mac=macaddr -virtio-net-pci.vlan=vlan -virtio-net-pci.netdev=netdev diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 84f18c039..70f082156 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -145,123 +145,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.12.1", 12001, 0, 0, - QEMU_CAPS_DRIVE_SERIAL, - QEMU_CAPS_ENABLE_KVM, - QEMU_CAPS_SDL, - QEMU_CAPS_RTC, - QEMU_CAPS_NO_HPET, - QEMU_CAPS_BOOT_MENU, - QEMU_CAPS_NAME_PROCESS, - QEMU_CAPS_SMBIOS_TYPE, - QEMU_CAPS_VGA_NONE, - QEMU_CAPS_DRIVE_AIO, - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_PIIX4_USB_UHCI, - QEMU_CAPS_USB_HUB, - QEMU_CAPS_NO_SHUTDOWN, - QEMU_CAPS_NO_ACPI, - QEMU_CAPS_SCSI_LSI, - QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_VGA, - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_DEVICE_VMWARE_SVGA, - QEMU_CAPS_DEVICE_USB_SERIAL, - QEMU_CAPS_DEVICE_USB_NET, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_SCSI_GENERIC, - QEMU_CAPS_DEVICE_USB_STORAGE, - QEMU_CAPS_DEVICE_USB_KBD, - QEMU_CAPS_DEVICE_RTL8139, - QEMU_CAPS_DEVICE_E1000, - QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_DEVICE_VIRTIO_NET); - DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0, - QEMU_CAPS_DRIVE_BOOT, - QEMU_CAPS_KVM, - QEMU_CAPS_DRIVE_SERIAL, - QEMU_CAPS_MEM_PATH, - QEMU_CAPS_SDL, - QEMU_CAPS_ENABLE_KVM, - QEMU_CAPS_RTC, - 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_DRIVE_AIO, - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_PIIX4_USB_UHCI, - QEMU_CAPS_USB_HUB, - QEMU_CAPS_NO_SHUTDOWN, - QEMU_CAPS_NO_ACPI, - QEMU_CAPS_SCSI_LSI, - QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_VGA, - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_DEVICE_VMWARE_SVGA, - QEMU_CAPS_DEVICE_USB_SERIAL, - QEMU_CAPS_DEVICE_USB_NET, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_SCSI_GENERIC, - QEMU_CAPS_DEVICE_USB_STORAGE, - QEMU_CAPS_DEVICE_USB_KBD, - QEMU_CAPS_DEVICE_RTL8139, - QEMU_CAPS_DEVICE_E1000, - QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_DEVICE_VIRTIO_NET); - DO_TEST("qemu-kvm-0.13.0", 13000, 1, 0, - QEMU_CAPS_DRIVE_BOOT, - QEMU_CAPS_DRIVE_CACHE_UNSAFE, - QEMU_CAPS_KVM, - QEMU_CAPS_DRIVE_SERIAL, - QEMU_CAPS_MEM_PATH, - QEMU_CAPS_SDL, - QEMU_CAPS_ENABLE_KVM, - QEMU_CAPS_MONITOR_JSON, - QEMU_CAPS_NETDEV, - QEMU_CAPS_RTC, - QEMU_CAPS_VHOST_NET, - QEMU_CAPS_NO_HPET, - QEMU_CAPS_NO_KVM_PIT, - QEMU_CAPS_TDF, - QEMU_CAPS_PCI_CONFIGFD, - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_BOOT_MENU, - QEMU_CAPS_FSDEV, - QEMU_CAPS_NESTING, - QEMU_CAPS_NAME_PROCESS, - QEMU_CAPS_SMBIOS_TYPE, - QEMU_CAPS_VGA_NONE, - QEMU_CAPS_DRIVE_AIO, - QEMU_CAPS_PCI_MULTIFUNCTION, - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_PIIX4_USB_UHCI, - QEMU_CAPS_VT82C686B_USB_UHCI, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_USB_HUB, - QEMU_CAPS_NO_SHUTDOWN, - QEMU_CAPS_NO_ACPI, - QEMU_CAPS_SCSI_LSI, - QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_VGA, - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_DEVICE_VMWARE_SVGA, - QEMU_CAPS_DEVICE_USB_SERIAL, - QEMU_CAPS_DEVICE_USB_NET, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_SCSI_GENERIC, - QEMU_CAPS_DEVICE_USB_KBD, - QEMU_CAPS_DEVICE_USB_STORAGE, - QEMU_CAPS_HOST_PCI_MULTIDOMAIN, - QEMU_CAPS_DEVICE_IVSHMEM, - QEMU_CAPS_DEVICE_RTL8139, - QEMU_CAPS_DEVICE_E1000, - QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_DEVICE_VIRTIO_NET); DO_TEST("qemu-1.0", 1000000, 0, 0, QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_DRIVE_SERIAL, -- 2.16.1