qemu: Introduce fw_cfg capability

This capability tracks whether QEMU supports -fw_cfg command line option, more specifically whether it allows specifying filename. There are some releases of QEMU which support -fw_cfg but not filename. If this is ever a problem we can refine the capability later on. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2020-06-02 16:57:56 +02:00 · 2020-06-02 16:57:56 +02:00 · 9ce32b0935
parent b5f8f04989
commit 9ce32b0935
47 changed files with 48 additions and 0 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -586,6 +586,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              /* 370 */
              "cpu.migratable",
              "query-cpu-model-expansion.migratable",
+              "fw_cfg",
    );


@ -3285,6 +3286,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
    { "overcommit", NULL, QEMU_CAPS_OVERCOMMIT },
    { "smp-opts", "dies", QEMU_CAPS_SMP_DIES },
    { "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS },
+    { "fw_cfg", "file", QEMU_CAPS_FW_CFG },
 };

 static int
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -567,6 +567,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    /* 370 */
    QEMU_CAPS_CPU_MIGRATABLE, /* -cpu ...,migratable=on|off */
    QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE, /* query-cpu-model-expansion supports migratable:false */
+    QEMU_CAPS_FW_CFG, /* -fw_cfg command line option */

    QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@ -142,6 +142,7 @@
  <flag name='iothread.poll-max-ns'/>
  <flag name='tcg'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>2010000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700287</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@ -142,6 +142,7 @@
  <flag name='i8042'/>
  <flag name='tcg'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>2010000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900287</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@ -108,6 +108,7 @@
  <flag name='query-cpu-model-comparison'/>
  <flag name='storage.werror'/>
  <flag name='tcg'/>
+  <flag name='fw_cfg'/>
  <version>2010000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100287</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@ -186,6 +186,7 @@
  <flag name='tcg'/>
  <flag name='pvscsi'/>
  <flag name='query-cpu-model-expansion.migratable'/>
+  <flag name='fw_cfg'/>
  <version>2010000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100287</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@ -115,6 +115,7 @@
  <flag name='query-cpu-model-comparison'/>
  <flag name='storage.werror'/>
  <flag name='tcg'/>
+  <flag name='fw_cfg'/>
  <version>2011000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100288</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@ -192,6 +192,7 @@
  <flag name='tcg'/>
  <flag name='pvscsi'/>
  <flag name='query-cpu-model-expansion.migratable'/>
+  <flag name='fw_cfg'/>
  <version>2011000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100288</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@ -158,6 +158,7 @@
  <flag name='drive-nvme'/>
  <flag name='tcg'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>2012000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700289</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@ -159,6 +159,7 @@
  <flag name='machine.pseries.cap-ibs'/>
  <flag name='tcg'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>2011090</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900289</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@ -127,6 +127,7 @@
  <flag name='drive-nvme'/>
  <flag name='storage.werror'/>
  <flag name='tcg'/>
+  <flag name='fw_cfg'/>
  <version>2012000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100289</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@ -202,6 +202,7 @@
  <flag name='pvscsi'/>
  <flag name='cpu.migratable'/>
  <flag name='query-cpu-model-expansion.migratable'/>
+  <flag name='fw_cfg'/>
  <version>2011090</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100289</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@ -136,6 +136,7 @@
  <flag name='i8042'/>
  <flag name='tcg'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>2004000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@ -142,6 +142,7 @@
  <flag name='i8042'/>
  <flag name='tcg'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>2005000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100243</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@ -125,6 +125,7 @@
  <flag name='hda-output'/>
  <flag name='tcg'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>2006000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700244</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@ -121,6 +121,7 @@
  <flag name='i8042'/>
  <flag name='tcg'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>2006000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900244</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@ -154,6 +154,7 @@
  <flag name='i8042'/>
  <flag name='tcg'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>2006000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100244</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@ -92,6 +92,7 @@
  <flag name='zpci'/>
  <flag name='storage.werror'/>
  <flag name='tcg'/>
+  <flag name='fw_cfg'/>
  <version>2007000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100245</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@ -159,6 +159,7 @@
  <flag name='i8042'/>
  <flag name='tcg'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>2007000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100245</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@ -97,6 +97,7 @@
  <flag name='query-cpu-model-comparison'/>
  <flag name='storage.werror'/>
  <flag name='tcg'/>
+  <flag name='fw_cfg'/>
  <version>2007093</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100246</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@ -162,6 +162,7 @@
  <flag name='i8042'/>
  <flag name='tcg'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>2008000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100246</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@ -134,6 +134,7 @@
  <flag name='i8042'/>
  <flag name='tcg'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>2009000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900247</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@ -102,6 +102,7 @@
  <flag name='query-cpu-model-comparison'/>
  <flag name='storage.werror'/>
  <flag name='tcg'/>
+  <flag name='fw_cfg'/>
  <version>2009000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100247</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@ -180,6 +180,7 @@
  <flag name='tcg'/>
  <flag name='pvscsi'/>
  <flag name='query-cpu-model-expansion.migratable'/>
+  <flag name='fw_cfg'/>
  <version>2009000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100247</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@ -161,6 +161,7 @@
  <flag name='machine.pseries.cap-ibs'/>
  <flag name='tcg'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>2012050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900239</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@ -97,6 +97,7 @@
  <flag name='drive-nvme'/>
  <flag name='storage.werror'/>
  <flag name='tcg'/>
+  <flag name='fw_cfg'/>
  <version>3000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@ -97,6 +97,7 @@
  <flag name='drive-nvme'/>
  <flag name='storage.werror'/>
  <flag name='tcg'/>
+  <flag name='fw_cfg'/>
  <version>3000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@ -130,6 +130,7 @@
  <flag name='drive-nvme'/>
  <flag name='storage.werror'/>
  <flag name='tcg'/>
+  <flag name='fw_cfg'/>
  <version>3000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100239</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@ -208,6 +208,7 @@
  <flag name='pvscsi'/>
  <flag name='cpu.migratable'/>
  <flag name='query-cpu-model-expansion.migratable'/>
+  <flag name='fw_cfg'/>
  <version>3000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100239</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@ -166,6 +166,7 @@
  <flag name='machine.pseries.cap-ibs'/>
  <flag name='tcg'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>3000091</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@ -211,6 +211,7 @@
  <flag name='pvscsi'/>
  <flag name='cpu.migratable'/>
  <flag name='query-cpu-model-expansion.migratable'/>
+  <flag name='fw_cfg'/>
  <version>3000092</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@ -172,6 +172,7 @@
  <flag name='storage.werror'/>
  <flag name='tcg'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@ -180,6 +180,7 @@
  <flag name='machine.pseries.cap-ibs'/>
  <flag name='tcg'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@ -173,6 +173,7 @@
  <flag name='storage.werror'/>
  <flag name='tcg'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@ -173,6 +173,7 @@
  <flag name='storage.werror'/>
  <flag name='tcg'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@ -138,6 +138,7 @@
  <flag name='drive-nvme'/>
  <flag name='storage.werror'/>
  <flag name='tcg'/>
+  <flag name='fw_cfg'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@ -216,6 +216,7 @@
  <flag name='pvscsi'/>
  <flag name='cpu.migratable'/>
  <flag name='query-cpu-model-expansion.migratable'/>
+  <flag name='fw_cfg'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@ -222,6 +222,7 @@
  <flag name='pvscsi'/>
  <flag name='cpu.migratable'/>
  <flag name='query-cpu-model-expansion.migratable'/>
+  <flag name='fw_cfg'/>
  <version>4001000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100241</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -184,6 +184,7 @@
  <flag name='virtio.packed'/>
  <flag name='tcg'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>4001050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -185,6 +185,7 @@
  <flag name='machine.pseries.cap-ibs'/>
  <flag name='tcg'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>4001050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -148,6 +148,7 @@
  <flag name='fsdev.multidevs'/>
  <flag name='virtio.packed'/>
  <flag name='tcg'/>
+  <flag name='fw_cfg'/>
  <version>4002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -230,6 +230,7 @@
  <flag name='pvscsi'/>
  <flag name='cpu.migratable'/>
  <flag name='query-cpu-model-expansion.migratable'/>
+  <flag name='fw_cfg'/>
  <version>4002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -193,6 +193,7 @@
  <flag name='tcg'/>
  <flag name='virtio-blk-pci.scsi.default.disabled'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>5000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700241</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -201,6 +201,7 @@
  <flag name='tcg'/>
  <flag name='virtio-blk-pci.scsi.default.disabled'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>5000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900241</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -189,6 +189,7 @@
  <flag name='tcg'/>
  <flag name='virtio-blk-pci.scsi.default.disabled'/>
  <flag name='pvscsi'/>
+  <flag name='fw_cfg'/>
  <version>5000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -236,6 +236,7 @@
  <flag name='pvscsi'/>
  <flag name='cpu.migratable'/>
  <flag name='query-cpu-model-expansion.migratable'/>
+  <flag name='fw_cfg'/>
  <version>5000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100241</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@ -236,6 +236,7 @@
  <flag name='pvscsi'/>
  <flag name='cpu.migratable'/>
  <flag name='query-cpu-model-expansion.migratable'/>
+  <flag name='fw_cfg'/>
  <version>5000050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100242</microcodeVersion>