openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: detect -display 

Add a new capability for the -display command line option, which has
been present since QEMU 1.0.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2016-07-05 14:35:27 +02:00 committed by Michal Privoznik
parent f3d3be3d48
commit ca57b5d60c
16 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_capabilities.c
View File

@ -337,6 +337,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"drive-detect-zeroes",
"tls-creds-x509", /* 230 */
"display",
);
@ -1149,6 +1150,8 @@ virQEMUCapsComputeCmdFlags(const char *help,
if (strstr(help, "bps="))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE);
if (strstr(help, "-display"))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DISPLAY);
if ((p = strstr(help, "-vga")) && !strstr(help, "-std-vga")) {
const char *nl = strstr(p, "\n");
if (strstr(p, "|qxl"))
@ -3411,6 +3414,7 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_HOST_PCI_MULTIDOMAIN);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DISPLAY);
}
/* Capabilities that are architecture depending

1
src/qemu/qemu_capabilities.h
View File

@ -370,6 +370,7 @@ typedef enum {
/* 230 */
QEMU_CAPS_OBJECT_TLS_CREDS_X509, /* -object tls-creds-x509 */
QEMU_CAPS_DISPLAY, /* -display */
QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags;

1
tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
View File

@ -114,6 +114,7 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='qxl-vga.vram64_size_mb'/>
<flag name='device-tray-moved-event'/>
<flag name='display'/>
<version>1002002</version>
<kvmVersion>0</kvmVersion>
<package></package>

1
tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
View File

@ -132,6 +132,7 @@
<flag name='qxl-vga.vram64_size_mb'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='display'/>
<version>1003001</version>
<kvmVersion>0</kvmVersion>
<package></package>

1
tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
View File

@ -133,6 +133,7 @@
<flag name='qxl-vga.vram64_size_mb'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='display'/>
<version>1004002</version>
<kvmVersion>0</kvmVersion>
<package></package>

1
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
View File

@ -143,6 +143,7 @@
<flag name='qxl-vga.vram64_size_mb'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='display'/>
<version>1005003</version>
<kvmVersion>0</kvmVersion>
<package></package>

1
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
View File

@ -148,6 +148,7 @@
<flag name='qxl-vga.vram64_size_mb'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='display'/>
<version>1006000</version>
<kvmVersion>0</kvmVersion>
<package></package>

1
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
View File

@ -150,6 +150,7 @@
<flag name='qxl-vga.vram64_size_mb'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='display'/>
<version>1007000</version>
<kvmVersion>0</kvmVersion>
<package></package>

1
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
View File

@ -165,6 +165,7 @@
<flag name='nec-usb-xhci-ports'/>
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='display'/>
<version>2001001</version>
<kvmVersion>0</kvmVersion>
<package></package>

1
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
View File

@ -182,6 +182,7 @@
<flag name='qxl-vga.max_outputs'/>
<flag name='spice-unix'/>
<flag name='drive-detect-zeroes'/>
<flag name='display'/>
<version>2004000</version>
<kvmVersion>0</kvmVersion>
<package></package>

1
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
View File

@ -187,6 +187,7 @@
<flag name='spice-unix'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
<flag name='display'/>
<version>2005000</version>
<kvmVersion>0</kvmVersion>
<package></package>

1
tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
View File

@ -157,6 +157,7 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
<flag name='display'/>
<version>2005094</version>
<kvmVersion>0</kvmVersion>
<package></package>

1
tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
View File

@ -157,6 +157,7 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
<flag name='display'/>
<version>2005094</version>
<kvmVersion>0</kvmVersion>
<package></package>

1
tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
View File

@ -151,6 +151,7 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
<flag name='display'/>
<version>2005094</version>
<kvmVersion>0</kvmVersion>
<package></package>

1
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
View File

@ -193,6 +193,7 @@
<flag name='spice-unix'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
<flag name='display'/>
<version>2006000</version>
<kvmVersion>0</kvmVersion>
<package></package>

6
tests/qemuhelptest.c
View File

@ -460,7 +460,8 @@ mymain(void)
QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM,
QEMU_CAPS_DEVICE_RTL8139,
QEMU_CAPS_DEVICE_E1000,
QEMU_CAPS_DEVICE_VIRTIO_NET);
QEMU_CAPS_DEVICE_VIRTIO_NET,
QEMU_CAPS_DISPLAY);
DO_TEST("qemu-1.1.0", 1001000, 0, 0,
QEMU_CAPS_DRIVE_CACHE_UNSAFE,
QEMU_CAPS_DRIVE_SERIAL,
@ -546,7 +547,8 @@ mymain(void)
QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM,
QEMU_CAPS_DEVICE_RTL8139,
QEMU_CAPS_DEVICE_E1000,
QEMU_CAPS_DEVICE_VIRTIO_NET);
QEMU_CAPS_DEVICE_VIRTIO_NET,
QEMU_CAPS_DISPLAY);
DO_TEST_FULL("qemu-1.2.0", 1002000, 0, 0, VIR_ERR_CONFIG_UNSUPPORTED,
QEMU_CAPS_LAST);
DO_TEST_FULL("qemu-kvm-1.2.0", 1002000, 1, 0, VIR_ERR_CONFIG_UNSUPPORTED,