qemu: capabilities: Retire QEMU_CAPS_VNC_OPTS

Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2025-02-04 21:47:16 +03:00 · 2021-09-23 10:11:39 +02:00 · 2021-09-23 10:11:39 +02:00 · 3fa36eeb7a
commit 3fa36eeb7a
parent 087dbb16c6
41 changed files with 2 additions and 42 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -616,7 +616,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              "vhost-user-blk", /* QEMU_CAPS_DEVICE_VHOST_USER_BLK */
              "cpu-max", /* QEMU_CAPS_CPU_MAX */
              "memory-backend-file.x-use-canonical-path-for-ramblock-id", /* QEMU_CAPS_X_USE_CANONICAL_PATH_FOR_RAMBLOCK_ID */
-              "vnc-opts", /* QEMU_CAPS_VNC_OPTS */
+              "vnc-opts", /* X_QEMU_CAPS_VNC_OPTS */
              "migration-param.block-bitmap-mapping", /* QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING */

              /* 395 */
@ -3215,7 +3215,6 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
    { "spice", "unix", QEMU_CAPS_SPICE_UNIX },
    { "spice", "rendernode", QEMU_CAPS_SPICE_RENDERNODE },
    { "vnc", "vnc", QEMU_CAPS_VNC_MULTI_SERVERS },
-    { "vnc", "display", QEMU_CAPS_VNC_OPTS },
    { "vnc", "power-control", QEMU_CAPS_VNC_POWER_CONTROL },
    { "vnc", "audiodev", QEMU_CAPS_AUDIODEV },
 };
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -596,7 +596,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    QEMU_CAPS_DEVICE_VHOST_USER_BLK, /* -device vhost-user-blk */
    QEMU_CAPS_CPU_MAX, /* -cpu max */
    QEMU_CAPS_X_USE_CANONICAL_PATH_FOR_RAMBLOCK_ID, /* -object memory-backend-file,x-use-canonical-path-for-ramblock-id= */
-    QEMU_CAPS_VNC_OPTS, /* -vnc uses QemuOpts parser instead of custom code */
+    X_QEMU_CAPS_VNC_OPTS, /* -vnc uses QemuOpts parser instead of custom code */
    QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING, /* block-bitmap-mapping in migrate-set-parameters */

    /* 395 */
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@ -99,7 +99,6 @@
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
  <flag name='fsdev.createmode'/>
-  <flag name='vnc-opts'/>
  <flag name='input-linux'/>
  <version>2011000</version>
  <kvmVersion>0</kvmVersion>
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@ -176,7 +176,6 @@
  <flag name='dc390'/>
  <flag name='am53c974'/>
  <flag name='cpu-max'/>
-  <flag name='vnc-opts'/>
  <flag name='input-linux'/>
  <version>2011000</version>
  <kvmVersion>0</kvmVersion>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@ -144,7 +144,6 @@
  <flag name='am53c974'/>
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
-  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='virtio-blk.queue-size'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@ -144,7 +144,6 @@
  <flag name='am53c974'/>
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
-  <flag name='vnc-opts'/>
  <flag name='input-linux'/>
  <flag name='virtio-blk.queue-size'/>
  <version>2011090</version>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@ -112,7 +112,6 @@
  <flag name='migration-param.xbzrle-cache-size'/>
  <flag name='fsdev.createmode'/>
  <flag name='vhost-user-blk'/>
-  <flag name='vnc-opts'/>
  <flag name='input-linux'/>
  <flag name='virtio-blk.queue-size'/>
  <version>2012000</version>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@ -187,7 +187,6 @@
  <flag name='am53c974'/>
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
-  <flag name='vnc-opts'/>
  <flag name='input-linux'/>
  <flag name='virtio-blk.queue-size'/>
  <version>2011090</version>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@ -146,7 +146,6 @@
  <flag name='am53c974'/>
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
-  <flag name='vnc-opts'/>
  <flag name='input-linux'/>
  <flag name='virtio-blk.queue-size'/>
  <version>2012050</version>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@ -79,7 +79,6 @@
  <flag name='migration-param.xbzrle-cache-size'/>
  <flag name='fsdev.createmode'/>
  <flag name='vhost-user-blk'/>
-  <flag name='vnc-opts'/>
  <flag name='input-linux'/>
  <version>3000000</version>
  <kvmVersion>0</kvmVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@ -79,7 +79,6 @@
  <flag name='migration-param.xbzrle-cache-size'/>
  <flag name='fsdev.createmode'/>
  <flag name='vhost-user-blk'/>
-  <flag name='vnc-opts'/>
  <flag name='input-linux'/>
  <version>3000000</version>
  <kvmVersion>0</kvmVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@ -115,7 +115,6 @@
  <flag name='migration-param.xbzrle-cache-size'/>
  <flag name='fsdev.createmode'/>
  <flag name='vhost-user-blk'/>
-  <flag name='vnc-opts'/>
  <flag name='input-linux'/>
  <flag name='virtio-blk.queue-size'/>
  <version>3000000</version>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@ -193,7 +193,6 @@
  <flag name='am53c974'/>
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
-  <flag name='vnc-opts'/>
  <flag name='input-linux'/>
  <flag name='virtio-blk.queue-size'/>
  <version>3000000</version>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@ -151,7 +151,6 @@
  <flag name='am53c974'/>
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
-  <flag name='vnc-opts'/>
  <flag name='input-linux'/>
  <flag name='virtio-blk.queue-size'/>
  <version>3000091</version>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@ -196,7 +196,6 @@
  <flag name='am53c974'/>
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
-  <flag name='vnc-opts'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
  <flag name='virtio-blk.queue-size'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@ -159,7 +159,6 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@ -166,7 +166,6 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@ -158,7 +158,6 @@
  <flag name='am53c974'/>
  <flag name='vhost-user-blk'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@ -158,7 +158,6 @@
  <flag name='am53c974'/>
  <flag name='vhost-user-blk'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@ -125,7 +125,6 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@ -203,7 +203,6 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@ -210,7 +210,6 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -172,7 +172,6 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -172,7 +172,6 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='audiodev'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -136,7 +136,6 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -219,7 +219,6 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -182,7 +182,6 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -190,7 +190,6 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -176,7 +176,6 @@
  <flag name='am53c974'/>
  <flag name='vhost-user-blk'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -226,7 +226,6 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@ -91,7 +91,6 @@
  <flag name='fsdev.createmode'/>
  <flag name='ncr53c90'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@ -228,7 +228,6 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@ -186,7 +186,6 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@ -192,7 +192,6 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@ -178,7 +178,6 @@
  <flag name='am53c974'/>
  <flag name='vhost-user-blk'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@ -143,7 +143,6 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@ -229,7 +229,6 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@ -187,7 +187,6 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='migration-param.block-bitmap-mapping'/>
  <flag name='vnc-power-control'/>
  <flag name='audiodev'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@ -143,7 +143,6 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='migration-param.block-bitmap-mapping'/>
  <flag name='vnc-power-control'/>
  <flag name='audiodev'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -230,7 +230,6 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='migration-param.block-bitmap-mapping'/>
  <flag name='vnc-power-control'/>
  <flag name='audiodev'/>
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@ -230,7 +230,6 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='vnc-opts'/>
  <flag name='migration-param.block-bitmap-mapping'/>
  <flag name='vnc-power-control'/>
  <flag name='audiodev'/>