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

qemu: Drop QEMU_CAPS_CHARDEV_SPICEPORT 

The capability was introduced in QEMU 1.5.0, which is our
minimum supported QEMU version these days.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Andrea Bolognani 2018-09-12 14:38:45 +02:00
parent d6a1d0af62
commit b38a85a321
34 changed files with 2 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_capabilities.c
View File

@ -4148,12 +4148,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
virQEMUCapsInitQMPBasicArch(qemuCaps);
/* -chardev spiceport is supported from 1.4.0, but usable through
* qapi only since 1.5.0, however, it still cannot be queried
* for as a capability */
if (qemuCaps->version >= 1005000)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEPORT);
if (qemuCaps->version >= 1006000)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);

2
src/qemu/qemu_capabilities.h
View File

@ -276,7 +276,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
QEMU_CAPS_DEVICE_PANIC, /* -device pvpanic */
QEMU_CAPS_ENABLE_FIPS, /* -enable-fips */
QEMU_CAPS_SPICE_FILE_XFER_DISABLE, /* -spice disable-agent-file-xfer */
QEMU_CAPS_CHARDEV_SPICEPORT, /* -chardev spiceport */
X_QEMU_CAPS_CHARDEV_SPICEPORT, /* -chardev spiceport */
/* 165 */
QEMU_CAPS_DEVICE_USB_KBD, /* -device usb-kbd */

5
src/qemu/qemu_command.c
View File

@ -5224,11 +5224,6 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
break;
case VIR_DOMAIN_CHR_TYPE_SPICEPORT:
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEPORT)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("spiceport not supported in this QEMU binary"));
goto cleanup;
}
virBufferAsprintf(&buf, "spiceport,id=%s,name=%s", charAlias,
dev->data.spiceport.channel);
break;

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

@ -74,7 +74,6 @@
<flag name='kvm-pit-lost-tick-policy'/>
<flag name='boot-strict'/>
<flag name='pvpanic'/>
<flag name='spiceport'/>
<flag name='usb-kbd'/>
<flag name='usb-audio'/>
<flag name='splash-timeout'/>

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

@ -78,7 +78,6 @@
<flag name='boot-strict'/>
<flag name='pvpanic'/>
<flag name='spice-file-xfer-disable'/>
<flag name='spiceport'/>
<flag name='usb-kbd'/>
<flag name='msg-timestamp'/>
<flag name='usb-audio'/>

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

@ -79,7 +79,6 @@
<flag name='boot-strict'/>
<flag name='pvpanic'/>
<flag name='spice-file-xfer-disable'/>
<flag name='spiceport'/>
<flag name='usb-kbd'/>
<flag name='msg-timestamp'/>
<flag name='usb-audio'/>

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

@ -81,7 +81,6 @@
<flag name='boot-strict'/>
<flag name='pvpanic'/>
<flag name='spice-file-xfer-disable'/>
<flag name='spiceport'/>
<flag name='usb-kbd'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
View File

@ -62,7 +62,6 @@
<flag name='virtio-mmio'/>
<flag name='ich9-intel-hda'/>
<flag name='boot-strict'/>
<flag name='spiceport'/>
<flag name='usb-kbd'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
View File

@ -61,7 +61,6 @@
<flag name='virtio-mmio'/>
<flag name='ich9-intel-hda'/>
<flag name='boot-strict'/>
<flag name='spiceport'/>
<flag name='usb-kbd'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
View File

@ -42,7 +42,6 @@
<flag name='device-del-event'/>
<flag name='virtio-mmio'/>
<flag name='boot-strict'/>
<flag name='spiceport'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>
<flag name='change-backing-file'/>

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

@ -81,7 +81,6 @@
<flag name='boot-strict'/>
<flag name='pvpanic'/>
<flag name='spice-file-xfer-disable'/>
<flag name='spiceport'/>
<flag name='usb-kbd'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>

1
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
View File

@ -42,7 +42,6 @@
<flag name='device-del-event'/>
<flag name='virtio-mmio'/>
<flag name='boot-strict'/>
<flag name='spiceport'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>
<flag name='change-backing-file'/>

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

@ -81,7 +81,6 @@
<flag name='boot-strict'/>
<flag name='pvpanic'/>
<flag name='spice-file-xfer-disable'/>
<flag name='spiceport'/>
<flag name='usb-kbd'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
View File

@ -62,7 +62,6 @@
<flag name='virtio-mmio'/>
<flag name='ich9-intel-hda'/>
<flag name='boot-strict'/>
<flag name='spiceport'/>
<flag name='usb-kbd'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
View File

@ -61,7 +61,6 @@
<flag name='virtio-mmio'/>
<flag name='ich9-intel-hda'/>
<flag name='boot-strict'/>
<flag name='spiceport'/>
<flag name='usb-kbd'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
View File

@ -42,7 +42,6 @@
<flag name='device-del-event'/>
<flag name='virtio-mmio'/>
<flag name='boot-strict'/>
<flag name='spiceport'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>
<flag name='change-backing-file'/>

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

@ -81,7 +81,6 @@
<flag name='boot-strict'/>
<flag name='pvpanic'/>
<flag name='spice-file-xfer-disable'/>
<flag name='spiceport'/>
<flag name='usb-kbd'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>

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

@ -81,7 +81,6 @@
<flag name='boot-strict'/>
<flag name='pvpanic'/>
<flag name='spice-file-xfer-disable'/>
<flag name='spiceport'/>
<flag name='usb-kbd'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>

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

@ -81,7 +81,6 @@
<flag name='boot-strict'/>
<flag name='pvpanic'/>
<flag name='spice-file-xfer-disable'/>
<flag name='spiceport'/>
<flag name='usb-kbd'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>

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

@ -64,7 +64,6 @@
<flag name='virtio-mmio'/>
<flag name='ich9-intel-hda'/>
<flag name='boot-strict'/>
<flag name='spiceport'/>
<flag name='usb-kbd'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>

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

@ -61,7 +61,6 @@
<flag name='virtio-mmio'/>
<flag name='ich9-intel-hda'/>
<flag name='boot-strict'/>
<flag name='spiceport'/>
<flag name='usb-kbd'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>

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

@ -81,7 +81,6 @@
<flag name='boot-strict'/>
<flag name='pvpanic'/>
<flag name='spice-file-xfer-disable'/>
<flag name='spiceport'/>
<flag name='usb-kbd'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>

1
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
View File

@ -42,7 +42,6 @@
<flag name='device-del-event'/>
<flag name='virtio-mmio'/>
<flag name='boot-strict'/>
<flag name='spiceport'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>
<flag name='change-backing-file'/>

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

@ -81,7 +81,6 @@
<flag name='boot-strict'/>
<flag name='pvpanic'/>
<flag name='spice-file-xfer-disable'/>
<flag name='spiceport'/>
<flag name='usb-kbd'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>

1
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
View File

@ -42,7 +42,6 @@
<flag name='device-del-event'/>
<flag name='virtio-mmio'/>
<flag name='boot-strict'/>
<flag name='spiceport'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>
<flag name='change-backing-file'/>

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

@ -81,7 +81,6 @@
<flag name='boot-strict'/>
<flag name='pvpanic'/>
<flag name='spice-file-xfer-disable'/>
<flag name='spiceport'/>
<flag name='usb-kbd'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
View File

@ -61,7 +61,6 @@
<flag name='virtio-mmio'/>
<flag name='ich9-intel-hda'/>
<flag name='boot-strict'/>
<flag name='spiceport'/>
<flag name='usb-kbd'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
View File

@ -42,7 +42,6 @@
<flag name='device-del-event'/>
<flag name='virtio-mmio'/>
<flag name='boot-strict'/>
<flag name='spiceport'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>
<flag name='change-backing-file'/>

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

@ -81,7 +81,6 @@
<flag name='boot-strict'/>
<flag name='pvpanic'/>
<flag name='spice-file-xfer-disable'/>
<flag name='spiceport'/>
<flag name='usb-kbd'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
View File

@ -60,7 +60,6 @@
<flag name='usb-storage.removable'/>
<flag name='ich9-intel-hda'/>
<flag name='boot-strict'/>
<flag name='spiceport'/>
<flag name='usb-kbd'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
View File

@ -32,7 +32,6 @@
<flag name='device-del-event'/>
<flag name='virtio-mmio'/>
<flag name='boot-strict'/>
<flag name='spiceport'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>
<flag name='change-backing-file'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
View File

@ -32,7 +32,6 @@
<flag name='device-del-event'/>
<flag name='virtio-mmio'/>
<flag name='boot-strict'/>
<flag name='spiceport'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>
<flag name='change-backing-file'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
View File

@ -80,7 +80,6 @@
<flag name='boot-strict'/>
<flag name='pvpanic'/>
<flag name='spice-file-xfer-disable'/>
<flag name='spiceport'/>
<flag name='usb-kbd'/>
<flag name='msg-timestamp'/>
<flag name='active-commit'/>

3
tests/qemuxml2argvtest.c
View File

@ -1393,8 +1393,7 @@ mymain(void)
QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL,
QEMU_CAPS_SPICE,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_CHARDEV_SPICEPORT);
QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST("serial-spiceport-nospice", NONE);
DO_TEST("console-compat",