qemuhelptest: regenerate data for qemu-kvm-0.12.3

Signed-off-by: NPavel Hrdina <phrdina@redhat.com>

tests/qemuhelpdata/qemu-kvm-0.12.3

@@ -66,7 +66,7 @@ Display options:
 -full-screen    start in full screen
 -vnc display    start a VNC server on display
 
-1 target only:
+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
@@ -92,7 +92,7 @@ Network options:
          [,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]
+-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);
@@ -102,8 +102,6 @@ Network options:
                 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]
@@ -163,6 +161,7 @@ Debug/Expert options:
                 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]

tests/qemuhelpdata/qemu-kvm-0.12.3-device

+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

tests/qemuhelptest.c

@@ -189,8 +189,8 @@ mymain(void)
             QEMU_CAPS_MEM_PATH,
             QEMU_CAPS_SDL,
             QEMU_CAPS_CHARDEV,
+            QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_RTC,
-            QEMU_CAPS_VHOST_NET,
             QEMU_CAPS_NO_HPET,
             QEMU_CAPS_NO_KVM_PIT,
             QEMU_CAPS_TDF,
@@ -200,9 +200,25 @@ mymain(void)
             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_VNC);
+            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_VIRTIO_NET);
     DO_TEST("qemu-kvm-0.13.0", 13000, 1, 0,
             QEMU_CAPS_DRIVE_BOOT,
             QEMU_CAPS_DRIVE_CACHE_UNSAFE,