qemu: capabilities: Retire QEMU_CAPS_FW_CFG

The code assumes that all supported qemu versions have this capability
so we can retire it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa
2021-09-21 12:26:08 +02:00
parent 22c681256b
commit 4bf603a52c
41 changed files with 2 additions and 42 deletions
+1 -2
View File
@@ -587,7 +587,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 370 */
"cpu.migratable", /* QEMU_CAPS_CPU_MIGRATABLE */
"query-cpu-model-expansion.migratable", /* QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE */
"fw_cfg", /* QEMU_CAPS_FW_CFG */
"fw_cfg", /* X_QEMU_CAPS_FW_CFG */
"migration-param.bandwidth", /* QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH */
"migration-param.downtime", /* QEMU_CAPS_MIGRATION_PARAM_DOWNTIME */
@@ -3208,7 +3208,6 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
{ "chardev", "fd", QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE },
{ "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS },
{ "fsdev", "fmode", QEMU_CAPS_FSDEV_CREATEMODE }, /* Could have also checked fsdev->dmode */
{ "fw_cfg", "file", QEMU_CAPS_FW_CFG },
{ "machine", "kernel_irqchip", QEMU_CAPS_MACHINE_KERNEL_IRQCHIP },
{ "numa", NULL, QEMU_CAPS_NUMA }, /* not needed after qemuCaps->version < 3000000 */
{ "overcommit", NULL, QEMU_CAPS_OVERCOMMIT },
+1 -1
View File
@@ -567,7 +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 */
X_QEMU_CAPS_FW_CFG, /* -fw_cfg command line option */
QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH, /* max-bandwidth field in migrate-set-parameters */
QEMU_CAPS_MIGRATION_PARAM_DOWNTIME, /* downtime-limit field in migrate-set-parameters */
@@ -98,7 +98,6 @@
<flag name='query-cpu-model-comparison'/>
<flag name='storage.werror'/>
<flag name='tcg'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -172,7 +172,6 @@
<flag name='tcg'/>
<flag name='pvscsi'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -139,7 +139,6 @@
<flag name='drive-nvme'/>
<flag name='tcg'/>
<flag name='pvscsi'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -139,7 +139,6 @@
<flag name='machine.pseries.cap-ibs'/>
<flag name='tcg'/>
<flag name='pvscsi'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -110,7 +110,6 @@
<flag name='drive-nvme'/>
<flag name='storage.werror'/>
<flag name='tcg'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -182,7 +182,6 @@
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -141,7 +141,6 @@
<flag name='machine.pseries.cap-ibs'/>
<flag name='tcg'/>
<flag name='pvscsi'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -77,7 +77,6 @@
<flag name='drive-nvme'/>
<flag name='storage.werror'/>
<flag name='tcg'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -77,7 +77,6 @@
<flag name='drive-nvme'/>
<flag name='storage.werror'/>
<flag name='tcg'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -113,7 +113,6 @@
<flag name='drive-nvme'/>
<flag name='storage.werror'/>
<flag name='tcg'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -188,7 +188,6 @@
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -146,7 +146,6 @@
<flag name='machine.pseries.cap-ibs'/>
<flag name='tcg'/>
<flag name='pvscsi'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -191,7 +191,6 @@
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -153,7 +153,6 @@
<flag name='storage.werror'/>
<flag name='tcg'/>
<flag name='pvscsi'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -160,7 +160,6 @@
<flag name='machine.pseries.cap-ibs'/>
<flag name='tcg'/>
<flag name='pvscsi'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -153,7 +153,6 @@
<flag name='storage.werror'/>
<flag name='tcg'/>
<flag name='pvscsi'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -153,7 +153,6 @@
<flag name='storage.werror'/>
<flag name='tcg'/>
<flag name='pvscsi'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -121,7 +121,6 @@
<flag name='drive-nvme'/>
<flag name='storage.werror'/>
<flag name='tcg'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -196,7 +196,6 @@
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -202,7 +202,6 @@
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -165,7 +165,6 @@
<flag name='virtio.packed'/>
<flag name='tcg'/>
<flag name='pvscsi'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -165,7 +165,6 @@
<flag name='machine.pseries.cap-ibs'/>
<flag name='tcg'/>
<flag name='pvscsi'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -131,7 +131,6 @@
<flag name='fsdev.multidevs'/>
<flag name='virtio.packed'/>
<flag name='tcg'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -210,7 +210,6 @@
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -174,7 +174,6 @@
<flag name='tcg'/>
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -181,7 +181,6 @@
<flag name='tcg'/>
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -169,7 +169,6 @@
<flag name='tcg'/>
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -216,7 +216,6 @@
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -85,7 +85,6 @@
<flag name='fsdev.multidevs'/>
<flag name='aio.io_uring'/>
<flag name='tcg'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -215,7 +215,6 @@
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -174,7 +174,6 @@
<flag name='tcg'/>
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -179,7 +179,6 @@
<flag name='tcg'/>
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -167,7 +167,6 @@
<flag name='tcg'/>
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -134,7 +134,6 @@
<flag name='aio.io_uring'/>
<flag name='tcg'/>
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -215,7 +215,6 @@
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -174,7 +174,6 @@
<flag name='tcg'/>
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -133,7 +133,6 @@
<flag name='aio.io_uring'/>
<flag name='tcg'/>
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -215,7 +215,6 @@
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
@@ -215,7 +215,6 @@
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>