qemu: probe for -vnc supporting use of QemuOpts syntax

This was introduced in QEMU 2.2.0, and is visible by -vnc appearing in
the "query-command-line-options" data.

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

src/qemu/qemu_capabilities.c

@@ -616,6 +616,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "vhost-user-blk",
               "cpu-max",
               "memory-backend-file.x-use-canonical-path-for-ramblock-id",
+              "vnc-opts",
     );
 
 
@@ -3295,6 +3296,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
     { "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS },
     { "fw_cfg", "file", QEMU_CAPS_FW_CFG },
     { "fsdev", "fmode", QEMU_CAPS_FSDEV_CREATEMODE }, /* Could have also checked fsdev->dmode */
+    { "vnc", "display", QEMU_CAPS_VNC_OPTS },
 };
 
 static int

src/qemu/qemu_capabilities.h

@@ -596,6 +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 */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;

tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml

@@ -149,6 +149,7 @@
   <flag name='fsdev.createmode'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
+  <flag name='vnc-opts'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700287</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml

@@ -149,6 +149,7 @@
   <flag name='fsdev.createmode'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
+  <flag name='vnc-opts'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900287</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml

@@ -113,6 +113,7 @@
   <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='fsdev.createmode'/>
+  <flag name='vnc-opts'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100287</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml

@@ -194,6 +194,7 @@
   <flag name='dc390'/>
   <flag name='am53c974'/>
   <flag name='cpu-max'/>
+  <flag name='vnc-opts'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100287</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml

@@ -121,6 +121,7 @@
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='fsdev.createmode'/>
+  <flag name='vnc-opts'/>
   <version>2011000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100288</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml

@@ -201,6 +201,7 @@
   <flag name='dc390'/>
   <flag name='am53c974'/>
   <flag name='cpu-max'/>
+  <flag name='vnc-opts'/>
   <version>2011000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100288</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml

@@ -168,6 +168,7 @@
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
+  <flag name='vnc-opts'/>
   <version>2012000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700289</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml

@@ -169,6 +169,7 @@
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
+  <flag name='vnc-opts'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900289</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml

@@ -134,6 +134,7 @@
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='fsdev.createmode'/>
   <flag name='vhost-user-blk'/>
+  <flag name='vnc-opts'/>
   <version>2012000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100289</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml

@@ -212,6 +212,7 @@
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
+  <flag name='vnc-opts'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100289</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml

@@ -140,6 +140,7 @@
   <flag name='fw_cfg'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
+  <flag name='vnc-opts'/>
   <version>2004000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml

@@ -146,6 +146,7 @@
   <flag name='fw_cfg'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
+  <flag name='vnc-opts'/>
   <version>2005000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml

@@ -129,6 +129,7 @@
   <flag name='fw_cfg'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
+  <flag name='vnc-opts'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700244</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml

@@ -125,6 +125,7 @@
   <flag name='fw_cfg'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
+  <flag name='vnc-opts'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900244</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml

@@ -158,6 +158,7 @@
   <flag name='fw_cfg'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
+  <flag name='vnc-opts'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml

@@ -94,6 +94,7 @@
   <flag name='storage.werror'/>
   <flag name='tcg'/>
   <flag name='fw_cfg'/>
+  <flag name='vnc-opts'/>
   <version>2007000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100245</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml

@@ -163,6 +163,7 @@
   <flag name='fw_cfg'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
+  <flag name='vnc-opts'/>
   <version>2007000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100245</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml

@@ -101,6 +101,7 @@
   <flag name='fw_cfg'/>
   <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
+  <flag name='vnc-opts'/>
   <version>2007093</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100246</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml

@@ -168,6 +168,7 @@
   <flag name='migration-param.downtime'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
+  <flag name='vnc-opts'/>
   <version>2008000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100246</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml

@@ -140,6 +140,7 @@
   <flag name='migration-param.downtime'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
+  <flag name='vnc-opts'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900247</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml

@@ -106,6 +106,7 @@
   <flag name='fw_cfg'/>
   <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
+  <flag name='vnc-opts'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100247</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml

@@ -187,6 +187,7 @@
   <flag name='dc390'/>
   <flag name='am53c974'/>
   <flag name='cpu-max'/>
+  <flag name='vnc-opts'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100247</microcodeVersion>

tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml

@@ -171,6 +171,7 @@
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
+  <flag name='vnc-opts'/>
   <version>2012050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900239</microcodeVersion>

tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml

@@ -104,6 +104,7 @@
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='fsdev.createmode'/>
   <flag name='vhost-user-blk'/>
+  <flag name='vnc-opts'/>
   <version>3000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>

tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml

@@ -104,6 +104,7 @@
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='fsdev.createmode'/>
   <flag name='vhost-user-blk'/>
+  <flag name='vnc-opts'/>
   <version>3000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>

tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml

@@ -137,6 +137,7 @@
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='fsdev.createmode'/>
   <flag name='vhost-user-blk'/>
+  <flag name='vnc-opts'/>
   <version>3000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100239</microcodeVersion>

tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml

@@ -218,6 +218,7 @@
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
+  <flag name='vnc-opts'/>
   <version>3000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100239</microcodeVersion>

tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml

@@ -176,6 +176,7 @@
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
+  <flag name='vnc-opts'/>
   <version>3000091</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900240</microcodeVersion>

tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml

@@ -221,6 +221,7 @@
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
+  <flag name='vnc-opts'/>
   <version>3000092</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100240</microcodeVersion>

tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml

@@ -183,6 +183,7 @@
   <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'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700240</microcodeVersion>

tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml

@@ -191,6 +191,7 @@
   <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'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900240</microcodeVersion>

tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml

@@ -183,6 +183,7 @@
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+  <flag name='vnc-opts'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>

tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml

@@ -183,6 +183,7 @@
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+  <flag name='vnc-opts'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>

tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml

@@ -147,6 +147,7 @@
   <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'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100240</microcodeVersion>

tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml

@@ -228,6 +228,7 @@
   <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'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100240</microcodeVersion>

tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml

@@ -235,6 +235,7 @@
   <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'/>
   <version>4001000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100241</microcodeVersion>

tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml

@@ -196,6 +196,7 @@
   <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'/>
   <version>4001050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700242</microcodeVersion>

tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml

@@ -197,6 +197,7 @@
   <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'/>
   <version>4001050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900242</microcodeVersion>

tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml

@@ -158,6 +158,7 @@
   <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'/>
   <version>4002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100242</microcodeVersion>

tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml

@@ -244,6 +244,7 @@
   <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'/>
   <version>4002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>

tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml

@@ -206,6 +206,7 @@
   <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'/>
   <version>5000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700241</microcodeVersion>

tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml

@@ -215,6 +215,7 @@
   <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'/>
   <version>5000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900241</microcodeVersion>

tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml

@@ -201,6 +201,7 @@
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+  <flag name='vnc-opts'/>
   <version>5000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>

tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml

@@ -251,6 +251,7 @@
   <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'/>
   <version>5000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100241</microcodeVersion>

tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml

@@ -116,6 +116,7 @@
   <flag name='fsdev.createmode'/>
   <flag name='ncr53c90'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+  <flag name='vnc-opts'/>
   <version>5001000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>

tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml

@@ -253,6 +253,7 @@
   <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'/>
   <version>5001000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>

tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml

@@ -210,6 +210,7 @@
   <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'/>
   <version>5002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700243</microcodeVersion>

tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml

@@ -217,6 +217,7 @@
   <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'/>
   <version>5002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900243</microcodeVersion>

tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml

@@ -203,6 +203,7 @@
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+  <flag name='vnc-opts'/>
   <version>5002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>

tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml

@@ -165,6 +165,7 @@
   <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'/>
   <version>5002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100243</microcodeVersion>

tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml

@@ -254,6 +254,7 @@
   <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'/>
   <version>5002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>

tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml

@@ -255,6 +255,7 @@
   <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'/>
   <version>5002050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>