qemuhelptest: regenerate data for qemu-kvm-0.13.0

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

diff --git a/tests/qemuhelpdata/qemu-kvm-0.13.0 b/tests/qemuhelpdata/qemu-kvm-0.13.0
index be2c8a55bdd1fb0bc1e9e405db6b0bd3fb5ce07f..af29d11f7d2800df332b56971c888afd02ec4968 100644 (file)
--- a/tests/qemuhelpdata/qemu-kvm-0.13.0
+++ b/tests/qemuhelpdata/qemu-kvm-0.13.0
@@ -72,7 +72,6 @@ Display options:
 -ctrl-grab      use Right-Ctrl to grab mouse (instead of Ctrl-Alt)
 -no-quit        disable SDL window close capability
 -sdl            enable SDL
--spice <args>   use spice
 -portrait       rotate graphical output 90 deg left (only PXA LCD)
 -vga [std|cirrus|vmware|xenfb|none]
                 select video card type

diff --git a/tests/qemuhelpdata/qemu-kvm-0.13.0-device b/tests/qemuhelpdata/qemu-kvm-0.13.0-device
index 4888d187f71f722085965ce41c18f4f4bff83c49..6dd2d09c56c507cb2496f6bc28c34e6747f96062 100644 (file)
--- a/tests/qemuhelpdata/qemu-kvm-0.13.0-device
+++ b/tests/qemuhelpdata/qemu-kvm-0.13.0-device
@@ -22,8 +22,8 @@ name "usb-braille", bus USB
 name "usb-serial", bus USB
 name "usb-net", bus USB
 name "usb-bt-dongle", bus USB
-name "virtconsole", bus virtio-serial-bus
 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
@@ -62,8 +62,6 @@ name "ib700", bus ISA
 name "isa-debugcon", bus ISA
 name "testdev", bus ISA
 name "PIIX4_PM", bus PCI, desc "PM"
-name "qxl", bus PCI, desc "Spice QXL GPU"
-name "spicevmc", bus virtio-serial-bus
 name "pci-assign", bus PCI, desc "pass through host pci devices to the guest"
 pci-assign.host=pci-hostaddr
 pci-assign.iommu=uint32

diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index 5dc02d4eebe836757218d277fd5379c1ff0b5e8b..2fc030e17d13a550d92fe26711c8ee2971293f67 100644 (file)
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -242,10 +242,8 @@ mymain(void)
             QEMU_CAPS_NESTING,
             QEMU_CAPS_NAME_PROCESS,
             QEMU_CAPS_SMBIOS_TYPE,
-            QEMU_CAPS_SPICE,
             QEMU_CAPS_VGA_NONE,
             QEMU_CAPS_DRIVE_AIO,
-            QEMU_CAPS_DEVICE_SPICEVMC,
             QEMU_CAPS_PCI_MULTIFUNCTION,
             QEMU_CAPS_PIIX3_USB_UHCI,
             QEMU_CAPS_PIIX4_USB_UHCI,
@@ -256,7 +254,6 @@ mymain(void)
             QEMU_CAPS_NO_ACPI,
             QEMU_CAPS_SCSI_LSI,
             QEMU_CAPS_VNC,
-            QEMU_CAPS_DEVICE_QXL,
             QEMU_CAPS_DEVICE_VGA,
             QEMU_CAPS_DEVICE_CIRRUS_VGA,
             QEMU_CAPS_DEVICE_VMWARE_SVGA,