NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: assume -vga is always available

Browse Source 
As of QEMU 0.10.0 the -vga argument was introduced, so the
QEMU driver can assume it is always available.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange
2015-11-09 15:39:54 +00:00
parent f81e0d480e
commit 72edc90a65
27 changed files with 47 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/qemucapabilitiesdata/caps_1.2.2-1.caps
View File

@@ -1,5 +1,4 @@
<qemuCaps>
<flag name='vga'/>
<flag name='0.10'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>

1
tests/qemucapabilitiesdata/caps_1.3.1-1.caps
View File

@@ -1,5 +1,4 @@
<qemuCaps>
<flag name='vga'/>
<flag name='0.10'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>

1
tests/qemucapabilitiesdata/caps_1.4.2-1.caps
View File

@@ -1,5 +1,4 @@
<qemuCaps>
<flag name='vga'/>
<flag name='0.10'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>

1
tests/qemucapabilitiesdata/caps_1.5.3-1.caps
View File

@@ -1,5 +1,4 @@
<qemuCaps>
<flag name='vga'/>
<flag name='0.10'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>

1
tests/qemucapabilitiesdata/caps_1.6.0-1.caps
View File

@@ -1,5 +1,4 @@
<qemuCaps>
<flag name='vga'/>
<flag name='0.10'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>

1
tests/qemucapabilitiesdata/caps_1.6.50-1.caps
View File

@@ -1,5 +1,4 @@
<qemuCaps>
<flag name='vga'/>
<flag name='0.10'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>

1
tests/qemucapabilitiesdata/caps_2.1.1-1.caps
View File

@@ -1,5 +1,4 @@
<qemuCaps>
<flag name='vga'/>
<flag name='0.10'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>

1
tests/qemucaps2xmldata/all_1.6.0-1.caps
View File

@@ -1,5 +1,4 @@
<qemuCaps>
<flag name='vga'/>
<flag name='0.10'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>

1
tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps
View File

@@ -1,5 +1,4 @@
<qemuCaps>
<flag name='vga'/>
<flag name='0.10'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>

8
tests/qemuhelptest.c
View File

@@ -154,7 +154,6 @@ mymain(void)
DO_TEST("qemu-0.12.1", 12001, 0, 0,
QEMU_CAPS_DRIVE_SERIAL,
QEMU_CAPS_DRIVE_READONLY,
QEMU_CAPS_VGA,
QEMU_CAPS_0_10,
QEMU_CAPS_ENABLE_KVM,
QEMU_CAPS_SDL,
@@ -180,7 +179,6 @@ mymain(void)
QEMU_CAPS_KVM,
QEMU_CAPS_DRIVE_SERIAL,
QEMU_CAPS_DRIVE_READONLY,
QEMU_CAPS_VGA,
QEMU_CAPS_0_10,
QEMU_CAPS_PCIDEVICE,
QEMU_CAPS_MEM_PATH,
@@ -231,7 +229,6 @@ mymain(void)
QEMU_CAPS_KVM,
QEMU_CAPS_DRIVE_SERIAL,
QEMU_CAPS_DRIVE_READONLY,
QEMU_CAPS_VGA,
QEMU_CAPS_0_10,
QEMU_CAPS_PCIDEVICE,
QEMU_CAPS_MEM_PATH,
@@ -263,7 +260,6 @@ mymain(void)
QEMU_CAPS_KVM,
QEMU_CAPS_DRIVE_SERIAL,
QEMU_CAPS_DRIVE_READONLY,
QEMU_CAPS_VGA,
QEMU_CAPS_0_10,
QEMU_CAPS_PCIDEVICE,
QEMU_CAPS_MEM_PATH,
@@ -324,7 +320,6 @@ mymain(void)
QEMU_CAPS_KVM,
QEMU_CAPS_DRIVE_SERIAL,
QEMU_CAPS_DRIVE_READONLY,
QEMU_CAPS_VGA,
QEMU_CAPS_0_10,
QEMU_CAPS_PCIDEVICE,
QEMU_CAPS_MEM_PATH,
@@ -382,7 +377,6 @@ mymain(void)
QEMU_CAPS_KVM,
QEMU_CAPS_DRIVE_SERIAL,
QEMU_CAPS_DRIVE_READONLY,
QEMU_CAPS_VGA,
QEMU_CAPS_0_10,
QEMU_CAPS_PCIDEVICE,
QEMU_CAPS_MEM_PATH,
@@ -447,7 +441,6 @@ mymain(void)
QEMU_CAPS_DRIVE_CACHE_UNSAFE,
QEMU_CAPS_DRIVE_SERIAL,
QEMU_CAPS_DRIVE_READONLY,
QEMU_CAPS_VGA,
QEMU_CAPS_0_10,
QEMU_CAPS_MEM_PATH,
QEMU_CAPS_SDL,
@@ -528,7 +521,6 @@ mymain(void)
QEMU_CAPS_DRIVE_CACHE_UNSAFE,
QEMU_CAPS_DRIVE_SERIAL,
QEMU_CAPS_DRIVE_READONLY,
QEMU_CAPS_VGA,
QEMU_CAPS_0_10,
QEMU_CAPS_MEM_PATH,
QEMU_CAPS_SDL,

1
tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args
View File

@@ -23,4 +23,5 @@ QEMU_AUDIO_DRV=spice \
-device spicevmc,bus=virtio-serial1.0,nr=3,id=channel0 \
-spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\
tls-channel=main \
-vga cirrus \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

1
tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args
View File

@@ -25,4 +25,5 @@ QEMU_AUDIO_DRV=spice \
id=channel0,name=com.redhat.spice.0 \
-spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\
tls-channel=main \
-vga cirrus \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

1
tests/qemuxml2argvdata/qemuxml2argv-controller-order.args
View File

@@ -37,6 +37,7 @@ id=drive-ide0-1-0,format=raw \
id=channel0,name=com.redhat.spice.0 \
-device usb-tablet,id=input0 \
-spice port=0,addr=0.0.0.0 \
-vga cirrus \
-device intel-hda,id=sound0,bus=pci.0,addr=0x4 \
-device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 \
-device usb-host,hostbus=14,hostaddr=6,id=hostdev0 \

3
tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args
View File

@@ -20,4 +20,5 @@ DISPLAY=:0.1 \
-net none \
-serial none \
-parallel none \
-full-screen
-full-screen \
-vga cirrus

2
tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args
View File

@@ -20,4 +20,4 @@ DISPLAY=:0.1 \
-net none \
-serial none \
-parallel none \
-std-vga
-vga std

3
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args
View File

@@ -19,4 +19,5 @@ QEMU_AUDIO_DRV=none \
-net none \
-serial none \
-parallel none \
-vnc 127.0.0.1:59630,share=allow-exclusive
-vnc 127.0.0.1:59630,share=allow-exclusive \
-vga cirrus

3
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args
View File

@@ -19,4 +19,5 @@ QEMU_AUDIO_DRV=none \
-net none \
-serial none \
-parallel none \
-vnc unix:/tmp/foo.socket
-vnc unix:/tmp/foo.socket \
-vga cirrus

3
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
View File

@@ -20,4 +20,5 @@ QEMU_AUDIO_DRV=none \
-net none \
-serial none \
-parallel none \
-vnc 127.0.0.1:3,tls,x509verify=/etc/pki/libvirt-vnc,sasl
-vnc 127.0.0.1:3,tls,x509verify=/etc/pki/libvirt-vnc,sasl \
-vga cirrus

3
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args
View File

@@ -18,4 +18,5 @@ QEMU_AUDIO_DRV=none \
-net none \
-serial none \
-parallel none \
-vnc 127.0.0.1:0,websocket=5700
-vnc 127.0.0.1:0,websocket=5700 \
-vga cirrus

3
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args
View File

@@ -19,4 +19,5 @@ QEMU_AUDIO_DRV=none \
-net none \
-serial none \
-parallel none \
-vnc '[2001:1:2:3:4:5:1234:1234]:3'
-vnc '[2001:1:2:3:4:5:1234:1234]:3' \
-vga cirrus

1
tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args
View File

@@ -25,4 +25,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/var/iso/f18kde.iso,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
-vga cirrus \
-device virtio-balloon-pci,id=balloon0,bus=pci.7,addr=0x6

1
tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args
View File

@@ -26,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/var/iso/f18kde.iso,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
-vga cirrus \
-device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x6

1
tests/qemuxml2argvdata/qemuxml2argv-pci-many.args
View File

@@ -130,4 +130,5 @@ id=virtio-disk182 \
format=raw \
-device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=drive-virtio-disk183,\
id=virtio-disk183 \
-vga cirrus \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6

52
tests/qemuxml2argvtest.c
View File

@@ -699,7 +699,7 @@ mymain(void)
QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_PCI_MULTIFUNCTION,
QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC,
QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
QEMU_CAPS_VGA_QXL,
QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_USB_REDIR,
QEMU_CAPS_DEVICE_PC_DIMM,
QEMU_CAPS_MEM_PATH, QEMU_CAPS_OBJECT_MEMORY_FILE);
@@ -902,7 +902,7 @@ mymain(void)
driver.config->vncSASL = 1;
VIR_FREE(driver.config->vncSASLdir);
ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl2"));
DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_VGA);
DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC);
driver.config->vncTLS = 1;
driver.config->vncTLSx509verify = 1;
DO_TEST("graphics-vnc-tls", QEMU_CAPS_VNC);
@@ -912,49 +912,49 @@ mymain(void)
DO_TEST("graphics-sdl", NONE);
DO_TEST("graphics-sdl-fullscreen", NONE);
DO_TEST("nographics", QEMU_CAPS_VGA);
DO_TEST("nographics", NONE);
DO_TEST("nographics-vga",
QEMU_CAPS_VGA, QEMU_CAPS_VGA_NONE);
QEMU_CAPS_VGA_NONE);
DO_TEST("graphics-spice",
QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
QEMU_CAPS_VGA_QXL,
QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE,
QEMU_CAPS_DEVICE_QXL,
QEMU_CAPS_SPICE_FILE_XFER_DISABLE);
driver.config->spiceSASL = 1;
ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl2"));
DO_TEST("graphics-spice-sasl",
QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
QEMU_CAPS_VGA_QXL,
QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE,
QEMU_CAPS_DEVICE_QXL);
VIR_FREE(driver.config->spiceSASLdir);
driver.config->spiceSASL = 0;
DO_TEST("graphics-spice-agentmouse",
QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
QEMU_CAPS_VGA_QXL,
QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE,
QEMU_CAPS_CHARDEV_SPICEVMC,
QEMU_CAPS_NODEFCONFIG);
DO_TEST("graphics-spice-compression",
QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
QEMU_CAPS_VGA_QXL,
QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE,
QEMU_CAPS_DEVICE_QXL);
DO_TEST("graphics-spice-timeout",
QEMU_CAPS_KVM,
QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
QEMU_CAPS_VGA_QXL,
QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE,
QEMU_CAPS_DEVICE_QXL_VGA);
DO_TEST("graphics-spice-qxl-vga",
QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
QEMU_CAPS_VGA_QXL,
QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE,
QEMU_CAPS_DEVICE_QXL_VGA,
QEMU_CAPS_DEVICE_QXL);
DO_TEST("graphics-spice-usb-redir",
QEMU_CAPS_VGA, QEMU_CAPS_SPICE,
QEMU_CAPS_SPICE,
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_USB_HUB,
QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR,
QEMU_CAPS_CHARDEV_SPICEVMC);
DO_TEST("graphics-spice-agent-file-xfer",
QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
QEMU_CAPS_VGA_QXL,
QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE,
QEMU_CAPS_DEVICE_QXL_VGA,
QEMU_CAPS_DEVICE_QXL,
@@ -1400,18 +1400,18 @@ mymain(void)
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_QXL_VGA,
QEMU_CAPS_DEVICE_PCI_BRIDGE);
DO_TEST("video-vga-nodevice", QEMU_CAPS_VGA);
DO_TEST("video-vga-nodevice", NONE);
DO_TEST("video-vga-device", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VGA,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
DO_TEST("video-vga-device-vgamem", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VGA,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_VGA_VGAMEM);
DO_TEST("video-qxl-nodevice", QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL);
DO_TEST("video-qxl-nodevice", QEMU_CAPS_VGA_QXL);
DO_TEST("video-qxl-device", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_QXL_VGA,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
DO_TEST("video-qxl-device-vgamem", QEMU_CAPS_DEVICE,
QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_QXL_VGA_VGAMEM);
DO_TEST_FAILURE("video-qxl-sec-nodevice", QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL);
DO_TEST_FAILURE("video-qxl-sec-nodevice", QEMU_CAPS_VGA_QXL);
DO_TEST("video-qxl-sec-device", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_QXL_VGA,
QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
DO_TEST("video-qxl-sec-device-vgamem", QEMU_CAPS_DEVICE,
@@ -1474,23 +1474,23 @@ mymain(void)
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL);
QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL);
DO_TEST("pcie-root-port",
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL);
QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL);
DO_TEST_ERROR("pcie-root-port-too-many",
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL);
QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL);
DO_TEST("pcie-switch-upstream-port",
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE,
@@ -1498,8 +1498,8 @@ mymain(void)
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_DEVICE_X3130_UPSTREAM,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL);
QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL);
DO_TEST("pcie-switch-downstream-port",
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
@@ -1507,8 +1507,8 @@ mymain(void)
QEMU_CAPS_DEVICE_X3130_UPSTREAM,
QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL);
QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL);
DO_TEST("hostdev-scsi-lsi", QEMU_CAPS_DEVICE,
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
@@ -1559,7 +1559,7 @@ mymain(void)
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL,
QEMU_CAPS_Q35_PCI_HOLE64_SIZE);