diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3840b418da..861d3c43cc 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1393,10 +1393,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUsbHost[] = { { "bootindex", QEMU_CAPS_USB_HOST_BOOTINDEX }, }; -static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxlVga[] = { - { "surfaces", QEMU_CAPS_DEVICE_VIDEO_PRIMARY }, -}; - struct virQEMUCapsObjectTypeProps { const char *type; struct virQEMUCapsStringFlags *props; @@ -1430,8 +1426,6 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = { ARRAY_CARDINALITY(virQEMUCapsObjectPropsUsbRedir) }, { "usb-host", virQEMUCapsObjectPropsUsbHost, ARRAY_CARDINALITY(virQEMUCapsObjectPropsUsbHost) }, - { "qxl-vga", virQEMUCapsObjectPropsQxlVga, - ARRAY_CARDINALITY(virQEMUCapsObjectPropsQxlVga) }, }; @@ -1629,7 +1623,6 @@ virQEMUCapsExtractDeviceStr(const char *qemu, "-device", "usb-redir,?", "-device", "ide-drive,?", "-device", "usb-host,?", - "-device", "qxl-vga,?", NULL); /* qemu -help goes to stdout, but qemu -device ? goes to stderr. */ virCommandSetErrorBuffer(cmd, &output); diff --git a/tests/qemuhelpdata/qemu-1.2.0-device b/tests/qemuhelpdata/qemu-1.2.0-device index 027d99a2d1..5613e00a15 100644 --- a/tests/qemuhelpdata/qemu-1.2.0-device +++ b/tests/qemuhelpdata/qemu-1.2.0-device @@ -208,19 +208,3 @@ usb-host.bootindex=int32 usb-host.pipeline=on/off usb-host.port=string usb-host.full-path=on/off -qxl-vga.ram_size=uint32 -qxl-vga.vram_size=uint32 -qxl-vga.revision=uint32 -qxl-vga.debug=uint32 -qxl-vga.guestdebug=uint32 -qxl-vga.cmdlog=uint32 -qxl-vga.ram_size_mb=uint32 -qxl-vga.vram_size_mb=uint32 -qxl-vga.vram64_size_mb=uint32 -qxl-vga.vgamem_mb=uint32 -qxl-vga.surfaces=int32 -qxl-vga.addr=pci-devfn -qxl-vga.romfile=string -qxl-vga.rombar=uint32 -qxl-vga.multifunction=on/off -qxl-vga.command_serr_enable=on/off diff --git a/tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device b/tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device index 5eab539245..ee0fd78bfd 100644 --- a/tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device +++ b/tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device @@ -118,13 +118,3 @@ virtio-net-pci.addr=pci-devfn virtio-net-pci.romfile=string virtio-net-pci.rombar=uint32 virtio-net-pci.multifunction=on/off -qxl-vga.ram_size=uint32 -qxl-vga.vram_size=uint32 -qxl-vga.revision=uint32 -qxl-vga.debug=uint32 -qxl-vga.guestdebug=uint32 -qxl-vga.cmdlog=uint32 -qxl-vga.addr=pci-devfn -qxl-vga.romfile=string -qxl-vga.rombar=uint32 -qxl-vga.multifunction=on/off diff --git a/tests/qemuhelpdata/qemu-kvm-1.2.0-device b/tests/qemuhelpdata/qemu-kvm-1.2.0-device index ebc27f0715..879a04959e 100644 --- a/tests/qemuhelpdata/qemu-kvm-1.2.0-device +++ b/tests/qemuhelpdata/qemu-kvm-1.2.0-device @@ -220,19 +220,3 @@ usb-host.bootindex=int32 usb-host.pipeline=on/off usb-host.port=string usb-host.full-path=on/off -qxl-vga.ram_size=uint32 -qxl-vga.vram_size=uint32 -qxl-vga.revision=uint32 -qxl-vga.debug=uint32 -qxl-vga.guestdebug=uint32 -qxl-vga.cmdlog=uint32 -qxl-vga.ram_size_mb=uint32 -qxl-vga.vram_size_mb=uint32 -qxl-vga.vram64_size_mb=uint32 -qxl-vga.vgamem_mb=uint32 -qxl-vga.surfaces=int32 -qxl-vga.addr=pci-devfn -qxl-vga.romfile=string -qxl-vga.rombar=uint32 -qxl-vga.multifunction=on/off -qxl-vga.command_serr_enable=on/off