[PATCH v2 01/17] qemu: mandate QEMU version 0.12.0 or newer

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxx>
---
 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

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]