[PATCH 00/17] qemu: Clean up various unneeded capabilities
The recent bump of minimum qemu version resulted into some capabilities always being present. I've noticed one while doing a review and from there I removed a few others, mostly storage related ones as well. Peter Krempa (17): qemuBuildCompatDeprecatedCommandLine: Assume that QEMU_CAPS_COMPAT_DEPRECATED is supported qemu: capabilities: Retire QEMU_CAPS_COMPAT_DEPRECATED qemuBuildObjectCommandlineFromJSON: Assume all qemus support QEMU_CAPS_OBJECT_JSON qemu: monitor: Drop support for extra wrapper for 'object_add' util: Drop 'virQEMUBuildCommandLineJSONArrayBitmap' qemu: capabilities: Retire QEMU_CAPS_OBJECT_JSON qemu: monitor: Always assume support for QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT qemu: capabilities: Retire QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT qemu: Always assume supprot for QEMU_CAPS_BLOCKDEV_REOPEN qemu: capabilities: Retire QEMU_CAPS_BLOCKDEV_REOPEN qemu: Always assume support for QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY qemu: capabilities: Retire QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY qemu: Always assume support for QEMU_CAPS_INCREMENTAL_BACKUP qemu: capabilites: Retire QEMU_CAPS_INCREMENTAL_BACKUP qemu: domain: Remove qemuDomainSupportsCheckpointsBlockjobs qemu: migration: Always assume support for QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING qemu: capabilites: Retire QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING src/libvirt_private.syms | 1 - src/qemu/qemu_backup.c | 18 --------- src/qemu/qemu_block.c | 4 -- src/qemu/qemu_blockjob.c | 20 ++-------- src/qemu/qemu_capabilities.c | 33 +++++------------ src/qemu/qemu_capabilities.h | 14 +++---- src/qemu/qemu_checkpoint.c | 18 +-------- src/qemu/qemu_command.c | 31 +++------------- src/qemu/qemu_domain.c | 23 ------------ src/qemu/qemu_domain.h | 4 -- src/qemu/qemu_driver.c | 37 +++++-------------- src/qemu/qemu_migration.c | 10 +---- src/qemu/qemu_monitor.c | 28 +------------- src/qemu/qemu_monitor_json.c | 2 +- src/qemu/qemu_monitor_priv.h | 4 -- src/qemu/qemu_snapshot.c | 4 -- src/util/virqemu.c | 36 ------------------ src/util/virqemu.h | 3 -- .../caps_10.0.0_s390x.xml | 7 ---- .../caps_10.0.0_x86_64+amdsev.xml | 7 ---- .../caps_10.0.0_x86_64.xml | 7 ---- .../qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 7 ---- .../caps_6.2.0_x86_64.xml | 7 ---- .../qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 7 ---- .../caps_7.0.0_x86_64.xml | 7 ---- .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 7 ---- .../caps_7.1.0_x86_64.xml | 7 ---- tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 7 ---- .../caps_7.2.0_x86_64+hvf.xml | 7 ---- .../caps_7.2.0_x86_64.xml | 7 ---- .../caps_8.0.0_x86_64.xml | 7 ---- .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 7 ---- .../caps_8.1.0_x86_64.xml | 7 ---- .../caps_8.2.0_aarch64.xml | 7 ---- .../caps_8.2.0_armv7l.xml | 7 ---- .../caps_8.2.0_loongarch64.xml | 7 ---- .../qemucapabilitiesdata/caps_8.2.0_s390x.xml | 7 ---- .../caps_8.2.0_x86_64.xml | 7 ---- .../qemucapabilitiesdata/caps_9.0.0_sparc.xml | 7 ---- .../caps_9.0.0_x86_64.xml | 7 ---- .../caps_9.1.0_riscv64.xml | 7 ---- .../qemucapabilitiesdata/caps_9.1.0_s390x.xml | 7 ---- .../caps_9.1.0_x86_64.xml | 7 ---- .../caps_9.2.0_aarch64+hvf.xml | 7 ---- .../qemucapabilitiesdata/caps_9.2.0_s390x.xml | 7 ---- .../caps_9.2.0_x86_64+amdsev.xml | 7 ---- .../caps_9.2.0_x86_64.xml | 7 ---- tests/qemucommandutiltest.c | 30 --------------- 48 files changed, 40 insertions(+), 483 deletions(-) -- 2.48.1
Bumping minimum version of qemu to 6.2 means that the '-compat' option is now always supported. As we were unable to detect it in any other way we based this capability on QEMU_CAPS_OBJECT_JSON. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_command.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 07cdadfd73..2b0e3dd53a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10339,8 +10339,7 @@ VIR_ENUM_IMPL(qemuCommandDeprecationBehavior, static void qemuBuildCompatDeprecatedCommandLine(virCommand *cmd, virQEMUDriverConfig *cfg, - virDomainDef *def, - virQEMUCaps *qemuCaps) + virDomainDef *def) { g_autoptr(virJSONValue) props = NULL; g_autofree char *propsstr = NULL; @@ -10365,13 +10364,6 @@ qemuBuildCompatDeprecatedCommandLine(virCommand *cmd, if (behavior == QEMU_COMMAND_DEPRECATION_BEHAVIOR_NONE) return; - /* we don't try to enable this feature at all if qemu doesn't support it, - * so that a downgrade of qemu version doesn't impact startup of the VM */ - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_COMPAT_DEPRECATED)) { - VIR_DEBUG("-compat not supported for VM '%s'", def->name); - return; - } - switch (behavior) { case QEMU_COMMAND_DEPRECATION_BEHAVIOR_OMIT: case QEMU_COMMAND_DEPRECATION_BEHAVIOR_NONE: @@ -10455,7 +10447,7 @@ qemuBuildCommandLine(virDomainObj *vm, if (qemuBuildNameCommandLine(cmd, cfg, def) < 0) return NULL; - qemuBuildCompatDeprecatedCommandLine(cmd, cfg, def, qemuCaps); + qemuBuildCompatDeprecatedCommandLine(cmd, cfg, def); virCommandAddArg(cmd, "-S"); /* freeze CPUs during startup */ -- 2.48.1
The capability always exists in qemu and is no longer checked. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 9 +-------- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml | 1 - tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml | 1 - tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml | 1 - 31 files changed, 2 insertions(+), 38 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 1262d4b39d..df9e630fbf 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -626,7 +626,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "rotation-rate", /* QEMU_CAPS_ROTATION_RATE */ /* 400 */ - "compat-deprecated", /* QEMU_CAPS_COMPAT_DEPRECATED */ + "compat-deprecated", /* X_QEMU_CAPS_COMPAT_DEPRECATED */ "acpi-index", /* QEMU_CAPS_ACPI_INDEX */ "input-linux", /* QEMU_CAPS_INPUT_LINUX */ "virtio-gpu-gl-pci", /* QEMU_CAPS_VIRTIO_GPU_GL_PCI */ @@ -5599,13 +5599,6 @@ virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qemuCaps) if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING)) virQEMUCapsSet(qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP); - - /* The -compat qemu command line argument is implemented using a newer - * method which doesn't show up in query-command-line-options. As we'll use - * it only for development and testing purposes we can base the capability - * on a not entirely related witness. */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_JSON)) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_COMPAT_DEPRECATED); } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 840cb97dbe..d4e5be6918 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -605,7 +605,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_ROTATION_RATE, /* scsi-disk / ide-drive rotation-rate prop */ /* 400 */ - QEMU_CAPS_COMPAT_DEPRECATED, /* -compat deprecated-(input|output) is supported */ + X_QEMU_CAPS_COMPAT_DEPRECATED, /* -compat deprecated-(input|output) is supported */ QEMU_CAPS_ACPI_INDEX, /* PCI device 'acpi-index' property */ QEMU_CAPS_INPUT_LINUX, /* -object input-linux */ QEMU_CAPS_VIRTIO_GPU_GL_PCI, /* -device virtio-gpu-gl-pci */ diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml index e0ad72d5d4..3d4c715396 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml @@ -86,7 +86,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml index f8c3bbab2d..951e16dffb 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml @@ -150,7 +150,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml index 3585d4bd8b..f0f3bf774f 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml @@ -150,7 +150,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml index d4172c3146..6e695335ab 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml @@ -116,7 +116,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='confidential-guest-support'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml index 582b0e9b52..227dbdcddd 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -152,7 +152,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml index e02f42c5e0..744c62d798 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml @@ -127,7 +127,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml index fd317a9afa..ee810d5a44 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -152,7 +152,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml index 427aa1ace9..66faa7614c 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -123,7 +123,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml index 32e4e8e1bb..d826df0a4c 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -152,7 +152,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml index 56cb66d394..029f15b1f7 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -115,7 +115,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index 0ebcb94a31..e03b761eba 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -151,7 +151,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml index 025ced01d9..6568b222d6 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -152,7 +152,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml index 5f45788b77..0dcba6aa6b 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -152,7 +152,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml index 16a3e3fbe0..fc57166059 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml @@ -83,7 +83,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='confidential-guest-support'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml index 7dee7f94c2..08a319eeee 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -152,7 +152,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml index 78082dbf3f..712f4a9fec 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml @@ -122,7 +122,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='confidential-guest-support'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml index 912eb45db6..784e0e0436 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml @@ -126,7 +126,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml index 60b980e256..05b64ae401 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml @@ -115,7 +115,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='confidential-guest-support'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml index 8f36104080..c94aaaf92b 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml @@ -83,7 +83,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='confidential-guest-support'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml index 51e14736cd..e5780d38fa 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml @@ -152,7 +152,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml index 1b56aebd48..2e6b3b1faf 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml @@ -45,7 +45,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='input-linux'/> <flag name='confidential-guest-support'/> <flag name='set-action'/> diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml index 4b64547b11..43958ed4bc 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml @@ -152,7 +152,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml index ccc7673ba9..de48bf5501 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml @@ -118,7 +118,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml index a20b63051e..ca5f53cdc3 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml @@ -86,7 +86,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml index 196bab7797..87b5f1ed1d 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml @@ -150,7 +150,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml index b508eaf01f..d9a438d4dd 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml @@ -95,7 +95,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='confidential-guest-support'/> <flag name='set-action'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml index 49a4a14dc1..9b961310f9 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml @@ -86,7 +86,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml index 6c9a3f6b5b..51227bcddc 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml @@ -151,7 +151,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml index 824504dba0..106d257a6e 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml @@ -150,7 +150,6 @@ <flag name='vnc-power-control'/> <flag name='object.qapified'/> <flag name='rotation-rate'/> - <flag name='compat-deprecated'/> <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='virtio-gpu-gl-pci'/> -- 2.48.1
'-object' was qapified (meaning it supports JSON props) in qemu-6.0, thus now that we require qemu-6.2 we can drop the compatibility code. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_command.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2b0e3dd53a..51e428e017 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -185,25 +185,12 @@ qemuOnOffAuto(virTristateSwitch s) static int qemuBuildObjectCommandlineFromJSON(virCommand *cmd, virJSONValue *props, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { g_autofree char *arg = NULL; - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_JSON)) { - if (!(arg = virJSONValueToString(props, false))) - return -1; - } else { - const char *type = virJSONValueObjectGetString(props, "qom-type"); - g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - - virBufferAsprintf(&buf, "%s,", type); - - if (virQEMUBuildCommandLineJSON(props, &buf, "qom-type", - virQEMUBuildCommandLineJSONArrayBitmap) < 0) - return -1; - - arg = virBufferContentAndReset(&buf); - } + if (!(arg = virJSONValueToString(props, false))) + return -1; virCommandAddArgList(cmd, "-object", arg, NULL); return 0; -- 2.48.1
The QAPIfication of objects removed the extra warapper object which we were adding in the monitor code to simplify the other callers. Now that we support only qemus which don't require this we can drop the support code. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_monitor.c | 27 +-------------------------- src/qemu/qemu_monitor_priv.h | 2 -- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index c069d17265..724e82e8a4 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -600,7 +600,6 @@ qemuMonitorOpenInternal(virDomainObj *vm, mon->cb = cb; if (priv) { - mon->objectAddNoWrap = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_JSON); mon->queryNamedBlockNodesFlat = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT); mon->blockjobMaskProtocol = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJOB_BACKING_MASK_PROTOCOL); } @@ -2660,7 +2659,6 @@ qemuMonitorAddObject(qemuMonitor *mon, virJSONValue **props, char **alias) { - g_autoptr(virJSONValue) pr = NULL; const char *type = NULL; const char *id = NULL; g_autofree char *aliasCopy = NULL; @@ -2688,30 +2686,7 @@ qemuMonitorAddObject(qemuMonitor *mon, if (alias) aliasCopy = g_strdup(id); - if (mon->objectAddNoWrap) { - pr = g_steal_pointer(props); - } else { - /* we need to create a wrapper which has the 'qom-type' and 'id' and - * store everything else under a 'props' sub-object */ - g_autoptr(virJSONValue) typeobj = NULL; - g_autoptr(virJSONValue) idobj = NULL; - - ignore_value(virJSONValueObjectRemoveKey(*props, "qom-type", &typeobj)); - ignore_value(virJSONValueObjectRemoveKey(*props, "id", &idobj)); - - /* avoid empty 'props' member */ - if (!virJSONValueObjectGetKey(*props, 0)) - g_clear_pointer(props, virJSONValueFree); - - if (virJSONValueObjectAdd(&pr, - "s:qom-type", type, - "s:id", id, - "A:props", props, - NULL) < 0) - return -1; - } - - if (qemuMonitorJSONAddObject(mon, &pr) < 0) + if (qemuMonitorJSONAddObject(mon, props) < 0) return -1; if (alias) diff --git a/src/qemu/qemu_monitor_priv.h b/src/qemu/qemu_monitor_priv.h index 0c2098c456..8cb5e2c3a4 100644 --- a/src/qemu/qemu_monitor_priv.h +++ b/src/qemu/qemu_monitor_priv.h @@ -88,8 +88,6 @@ struct _qemuMonitor { void *logOpaque; virFreeCallback logDestroy; - /* true if qemu no longer wants 'props' sub-object of object-add */ - bool objectAddNoWrap; /* query-named-block-nodes supports the 'flat' option */ bool queryNamedBlockNodesFlat; /* use the backing-mask-protocol flag of block-commit/stream */ -- 2.48.1
On Wed, Mar 12, 2025 at 05:31:14PM +0100, Peter Krempa wrote:
The QAPIfication of objects removed the extra warapper object which we
s/warapper/wrapper/
were adding in the monitor code to simplify the other callers.
Now that we support only qemus which don't require this we can drop the support code.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On a Wednesday in 2025, Peter Krempa wrote:
The QAPIfication of objects removed the extra warapper object which we
wrapper
were adding in the monitor code to simplify the other callers.
Now that we support only qemus which don't require this we can drop the support code.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_monitor.c | 27 +-------------------------- src/qemu/qemu_monitor_priv.h | 2 -- 2 files changed, 1 insertion(+), 28 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
It was used to convert JSON arrays in legacy -object commandline conversion. Since we now exclusively use JSON with -object, this infrastructure is no longer needed. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/libvirt_private.syms | 1 - src/util/virqemu.c | 36 ------------------------------------ src/util/virqemu.h | 3 --- tests/qemucommandutiltest.c | 30 ------------------------------ 4 files changed, 70 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e63939e2b5..e78abdad15 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3279,7 +3279,6 @@ virProcessWait; # util/virqemu.h virQEMUBuildBufferEscapeComma; virQEMUBuildCommandLineJSON; -virQEMUBuildCommandLineJSONArrayBitmap; virQEMUBuildCommandLineJSONArrayNumbered; virQEMUBuildCommandLineJSONArrayObjectsStr; diff --git a/src/util/virqemu.c b/src/util/virqemu.c index c9fac5956a..d2a69026c8 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -50,42 +50,6 @@ virQEMUBuildCommandLineJSONRecurse(const char *key, -int -virQEMUBuildCommandLineJSONArrayBitmap(const char *key, - virJSONValue *array, - virBuffer *buf) -{ - ssize_t pos = -1; - ssize_t end; - g_autoptr(virBitmap) bitmap = virBitmapNew(0); - size_t i; - - for (i = 0; i < virJSONValueArraySize(array); i++) { - virJSONValue *member = virJSONValueArrayGet(array, i); - unsigned long long value; - - if (virJSONValueGetNumberUlong(member, &value) < 0) - return -1; - - virBitmapSetBitExpand(bitmap, value); - } - - while ((pos = virBitmapNextSetBit(bitmap, pos)) > -1) { - if ((end = virBitmapNextClearBit(bitmap, pos)) < 0) - end = virBitmapLastSetBit(bitmap) + 1; - - if (end - 1 > pos) { - virBufferAsprintf(buf, "%s=%zd-%zd,", key, pos, end - 1); - pos = end; - } else { - virBufferAsprintf(buf, "%s=%zd,", key, pos); - } - } - - return 0; -} - - int virQEMUBuildCommandLineJSONArrayNumbered(const char *key, virJSONValue *array, diff --git a/src/util/virqemu.h b/src/util/virqemu.h index be083d7545..e5d36b95c4 100644 --- a/src/util/virqemu.h +++ b/src/util/virqemu.h @@ -32,9 +32,6 @@ typedef int (*virQEMUBuildCommandLineJSONArrayFormatFunc)(const char *key, int virQEMUBuildCommandLineJSONArrayObjectsStr(const char *key, virJSONValue *array, virBuffer *buf); -int virQEMUBuildCommandLineJSONArrayBitmap(const char *key, - virJSONValue *array, - virBuffer *buf); int virQEMUBuildCommandLineJSONArrayNumbered(const char *key, virJSONValue *array, virBuffer *buf); diff --git a/tests/qemucommandutiltest.c b/tests/qemucommandutiltest.c index f92fb8f177..58493c703f 100644 --- a/tests/qemucommandutiltest.c +++ b/tests/qemucommandutiltest.c @@ -83,39 +83,9 @@ mymain(void) ret = -1; \ } while (0) -#define DO_TEST_COMMAND_OBJECT_FROM_JSON(PROPS, EXPECT) \ - DO_TEST_COMMAND_FROM_JSON(PROPS, virQEMUBuildCommandLineJSONArrayBitmap, EXPECT) - #define DO_TEST_COMMAND_DRIVE_FROM_JSON(PROPS, EXPECT) \ DO_TEST_COMMAND_FROM_JSON(PROPS, virQEMUBuildCommandLineJSONArrayNumbered, EXPECT) - DO_TEST_COMMAND_OBJECT_FROM_JSON("{}", NULL); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"string\":\"qwer\"}", "string=qwer"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"string\":\"qw,e,r\"}", "string=qw,,e,,r"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"number\":1234}", "number=1234"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"boolean\":true}", "boolean=on"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"boolean\":false}", "boolean=off"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[]}", NULL); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[0]}", "bitmap=0"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[1,3,5]}", - "bitmap=1,bitmap=3,bitmap=5"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[0,1,2,3]}", "bitmap=0-3"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[1,2,3,5]}", - "bitmap=1-3,bitmap=5"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[1,2,3,5,7,8,9]}", - "bitmap=1-3,bitmap=5,bitmap=7-9"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"array\":[\"bleah\",\"qwerty\",1]}", - "array=bleah,array=qwerty,array=1"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"boolean\":true,\"hyphen-name\":1234,\"some_string\":\"bleah\"}", - "boolean=on,hyphen-name=1234,some_string=bleah"); - DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"nest\": {\"boolean\":true," - "\"hyphen-name\":1234," - "\"some_string\":\"bleah\"," - "\"bleah\":\"bl,eah\"" - "}" - "}", - "nest.boolean=on,nest.hyphen-name=1234," - "nest.some_string=bleah,nest.bleah=bl,,eah"); DO_TEST_COMMAND_DRIVE_FROM_JSON("{\"driver\":\"gluster\"," "\"volume\":\"test\"," "\"path\":\"img\"," -- 2.48.1
Now that we dropped support for old qemus which didn't support JSON props for -object we can retire the capability. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml | 1 - tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml | 1 - tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml | 1 - 31 files changed, 2 insertions(+), 32 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index df9e630fbf..b6eb923763 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -622,7 +622,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "vnc-power-control", /* QEMU_CAPS_VNC_POWER_CONTROL */ "audiodev", /* X_QEMU_CAPS_AUDIODEV */ "blockdev-backup", /* X_QEMU_CAPS_BLOCKDEV_BACKUP */ - "object.qapified", /* QEMU_CAPS_OBJECT_JSON */ + "object.qapified", /* X_QEMU_CAPS_OBJECT_JSON */ "rotation-rate", /* QEMU_CAPS_ROTATION_RATE */ /* 400 */ @@ -1590,7 +1590,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = { { "netdev_add/arg-type/type/^dgram", QEMU_CAPS_NETDEV_JSON }, { "netdev_add/arg-type/+user", QEMU_CAPS_NETDEV_USER }, { "netdev_add/arg-type/+stream/reconnect-ms", QEMU_CAPS_NETDEV_STREAM_RECONNECT_MILISECONDS }, - { "object-add/arg-type/qom-type/^secret", QEMU_CAPS_OBJECT_JSON }, { "object-add/arg-type/+sev-guest/kernel-hashes", QEMU_CAPS_SEV_GUEST_KERNEL_HASHES }, { "object-add/arg-type/+iothread/thread-pool-max", QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX }, { "query-display-options/ret-type/+egl-headless/rendernode", QEMU_CAPS_EGL_HEADLESS_RENDERNODE }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index d4e5be6918..4e247193e3 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -601,7 +601,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_VNC_POWER_CONTROL, /* -vnc power-control option */ X_QEMU_CAPS_AUDIODEV, /* -audiodev instead of QEMU_AUDIO_DRV */ X_QEMU_CAPS_BLOCKDEV_BACKUP, /* qemu supports the blockdev-backup job */ - QEMU_CAPS_OBJECT_JSON, /* parameters for object-add are formally described */ + X_QEMU_CAPS_OBJECT_JSON, /* parameters for object-add are formally described */ QEMU_CAPS_ROTATION_RATE, /* scsi-disk / ide-drive rotation-rate prop */ /* 400 */ diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml index 3d4c715396..041b480b21 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml @@ -84,7 +84,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml index 951e16dffb..3adef15db3 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml @@ -148,7 +148,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml index f0f3bf774f..66932b6dde 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml @@ -148,7 +148,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml index 6e695335ab..dd59c4da90 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml @@ -114,7 +114,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml index 227dbdcddd..2653be7df1 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -150,7 +150,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml index 744c62d798..307f257fc6 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml @@ -125,7 +125,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml index ee810d5a44..6e3d24ddff 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -150,7 +150,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml index 66faa7614c..9e6e14d449 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -121,7 +121,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml index d826df0a4c..023a70affa 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -150,7 +150,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml index 029f15b1f7..4acb0e816a 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -113,7 +113,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index e03b761eba..fab8967f5f 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -149,7 +149,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml index 6568b222d6..8b6cca995e 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -150,7 +150,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml index 0dcba6aa6b..35a65f569a 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -150,7 +150,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml index fc57166059..e52114ec58 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml @@ -81,7 +81,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml index 08a319eeee..11f3dbecf1 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -150,7 +150,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml index 712f4a9fec..306d25c4eb 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml @@ -120,7 +120,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml index 784e0e0436..d6ecec4232 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml @@ -124,7 +124,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml index 05b64ae401..f3f0d74bb2 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml @@ -113,7 +113,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml index c94aaaf92b..95a44e1f77 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml @@ -81,7 +81,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml index e5780d38fa..0fcac90965 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml @@ -150,7 +150,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml index 2e6b3b1faf..e84ab9da1a 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml @@ -43,7 +43,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='input-linux'/> <flag name='confidential-guest-support'/> diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml index 43958ed4bc..fd2a33125b 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml @@ -150,7 +150,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml index de48bf5501..9b725595d6 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml @@ -116,7 +116,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml index ca5f53cdc3..399351a715 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml @@ -84,7 +84,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml index 87b5f1ed1d..8a4f78278d 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml @@ -148,7 +148,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml index d9a438d4dd..7a77d92f3d 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml @@ -93,7 +93,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='confidential-guest-support'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml index 9b961310f9..9381c8b6d7 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml @@ -84,7 +84,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml index 51227bcddc..702698758f 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml @@ -149,7 +149,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml index 106d257a6e..fa66d6091a 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml @@ -148,7 +148,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> - <flag name='object.qapified'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> <flag name='input-linux'/> -- 2.48.1
The flat mode of 'query-named-block-nodes' is supported since qemu-5.0. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_monitor.c | 1 - src/qemu/qemu_monitor_json.c | 2 +- src/qemu/qemu_monitor_priv.h | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 724e82e8a4..8d8e73d38d 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -600,7 +600,6 @@ qemuMonitorOpenInternal(virDomainObj *vm, mon->cb = cb; if (priv) { - mon->queryNamedBlockNodesFlat = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT); mon->blockjobMaskProtocol = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJOB_BACKING_MASK_PROTOCOL); } diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 74420b2ee7..3caeb39a1b 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2085,7 +2085,7 @@ qemuMonitorJSONQueryNamedBlockNodes(qemuMonitor *mon) g_autoptr(virJSONValue) reply = NULL; if (!(cmd = qemuMonitorJSONMakeCommand("query-named-block-nodes", - "B:flat", mon->queryNamedBlockNodesFlat, + "b:flat", true, NULL))) return NULL; diff --git a/src/qemu/qemu_monitor_priv.h b/src/qemu/qemu_monitor_priv.h index 8cb5e2c3a4..60a3cedb64 100644 --- a/src/qemu/qemu_monitor_priv.h +++ b/src/qemu/qemu_monitor_priv.h @@ -88,8 +88,6 @@ struct _qemuMonitor { void *logOpaque; virFreeCallback logDestroy; - /* query-named-block-nodes supports the 'flat' option */ - bool queryNamedBlockNodesFlat; /* use the backing-mask-protocol flag of block-commit/stream */ bool blockjobMaskProtocol; }; -- 2.48.1
The capability is no longer used as all qemus already support the feature. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml | 1 - tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml | 1 - tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml | 1 - 31 files changed, 2 insertions(+), 32 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b6eb923763..f0c48bb2be 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -564,7 +564,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 355 */ "vhost-user-fs", /* QEMU_CAPS_DEVICE_VHOST_USER_FS */ - "query-named-block-nodes.flat", /* QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT */ + "query-named-block-nodes.flat", /* X_QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT */ "blockdev-snapshot.allow-write-only-overlay", /* QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY */ "blockdev-reopen", /* QEMU_CAPS_BLOCKDEV_REOPEN */ "storage.werror", /* X_QEMU_CAPS_STORAGE_WERROR */ @@ -1599,7 +1599,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = { { "query-hotpluggable-cpus/ret-type/props/die-id", QEMU_CAPS_SMP_DIES }, { "query-hotpluggable-cpus/ret-type/props/cluster-id", QEMU_CAPS_SMP_CLUSTERS }, { "query-migrate/ret-type/blocked-reasons", QEMU_CAPS_MIGRATION_BLOCKED_REASONS }, - { "query-named-block-nodes/arg-type/flat", QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT }, { "screendump/arg-type/device", QEMU_CAPS_SCREENDUMP_DEVICE }, { "screendump/arg-type/format/^png", QEMU_CAPS_SCREENSHOT_FORMAT_PNG }, { "set-numa-node/arg-type/+hmat-lb", QEMU_CAPS_NUMA_HMAT }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 4e247193e3..1fedfdaeb1 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -543,7 +543,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 355 */ QEMU_CAPS_DEVICE_VHOST_USER_FS, /* -device vhost-user-fs */ - QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT, /* query-named-block-nodes supports the 'flat' option */ + X_QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT, /* query-named-block-nodes supports the 'flat' option */ QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY, /* blockdev-snapshot has the 'allow-write-only-overlay' feature */ QEMU_CAPS_BLOCKDEV_REOPEN, /* 'blockdev-reopen' qmp command is supported */ X_QEMU_CAPS_STORAGE_WERROR, /* virtio-blk,scsi-hd.werror */ diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml index 041b480b21..a35578fab4 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml @@ -67,7 +67,6 @@ <flag name='smp-dies'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml index 3adef15db3..6be2a75358 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml @@ -124,7 +124,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml index 66932b6dde..3b9dec3c67 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml @@ -124,7 +124,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml index dd59c4da90..4bc090f960 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml @@ -93,7 +93,6 @@ <flag name='rng-builtin'/> <flag name='tpm-spapr'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml index 2653be7df1..f24d1b00d5 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -125,7 +125,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml index 307f257fc6..c02c4a23b3 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml @@ -102,7 +102,6 @@ <flag name='rng-builtin'/> <flag name='tpm-spapr'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml index 6e3d24ddff..324e1b824f 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -125,7 +125,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml index 9e6e14d449..6a93c860e0 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -99,7 +99,6 @@ <flag name='rng-builtin'/> <flag name='tpm-spapr'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml index 023a70affa..77b6a93061 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -125,7 +125,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml index 4acb0e816a..bbf3dded5b 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -92,7 +92,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index fab8967f5f..3d3d729b72 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -124,7 +124,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml index 8b6cca995e..1472ed5556 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -125,7 +125,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml index 35a65f569a..29dd31151d 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -125,7 +125,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml index e52114ec58..44885a6e6d 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml @@ -64,7 +64,6 @@ <flag name='smp-dies'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml index 11f3dbecf1..4a67276bb9 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -125,7 +125,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml index 306d25c4eb..e19e15688a 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml @@ -98,7 +98,6 @@ <flag name='rng-builtin'/> <flag name='cpu.kvm-no-adjvtime'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml index d6ecec4232..ac856a760b 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml @@ -102,7 +102,6 @@ <flag name='smp-dies'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml index f3f0d74bb2..3a5d881db4 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml @@ -91,7 +91,6 @@ <flag name='smp-dies'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml index 95a44e1f77..558cf8654c 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml @@ -64,7 +64,6 @@ <flag name='smp-dies'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml index 0fcac90965..899cdb33ee 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml @@ -125,7 +125,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml index e84ab9da1a..10ac1add8f 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml @@ -30,7 +30,6 @@ <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='rng-builtin'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml index fd2a33125b..39939b367c 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml @@ -125,7 +125,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml index 9b725595d6..613c32f173 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml @@ -95,7 +95,6 @@ <flag name='smp-dies'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml index 399351a715..35b14f2ccc 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml @@ -67,7 +67,6 @@ <flag name='smp-dies'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml index 8a4f78278d..0c2b277a8c 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml @@ -124,7 +124,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml index 7a77d92f3d..f4552c3765 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml @@ -75,7 +75,6 @@ <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='rng-builtin'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml index 9381c8b6d7..643cdeb1e0 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml @@ -67,7 +67,6 @@ <flag name='smp-dies'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml index 702698758f..cd0adf5a64 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml @@ -125,7 +125,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml index fa66d6091a..bf2fafe2e0 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml @@ -124,7 +124,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> -- 2.48.1
'blockdev-reopen' is supported since qemu-6.1, thus we can now remove the interlocks. Document the change to 'mirror' as this patch removes the last clue why we overwrite the mirror's readonly state to false unconditionally. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_blockjob.c | 11 +---------- src/qemu/qemu_checkpoint.c | 6 ++---- src/qemu/qemu_driver.c | 11 +++-------- 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 3aef1ec285..be18f7b273 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -968,10 +968,6 @@ qemuBlockJobProcessEventCompletedCommitBitmaps(virDomainObj *vm, g_autoptr(virJSONValue) actions = NULL; bool active = job->type == QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT; - if (!active && - !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN)) - return 0; - if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, asyncJob))) return -1; @@ -1205,9 +1201,6 @@ qemuBlockJobProcessEventCompletedCopyBitmaps(virDomainObj *vm, g_autoptr(virJSONValue) actions = NULL; bool shallow = job->jobflags & VIR_DOMAIN_BLOCK_COPY_SHALLOW; - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN)) - return 0; - if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, asyncJob))) return -1; @@ -1237,7 +1230,6 @@ qemuBlockJobProcessEventConcludedCopyPivot(virQEMUDriver *driver, qemuBlockJobData *job, virDomainAsyncJob asyncJob) { - qemuDomainObjPrivate *priv = vm->privateData; g_autoptr(virStorageSource) src = NULL; VIR_DEBUG("copy job '%s' on VM '%s' pivoted", job->name, vm->def->name); @@ -1257,8 +1249,7 @@ qemuBlockJobProcessEventConcludedCopyPivot(virQEMUDriver *driver, !virStorageSourceIsBacking(job->disk->mirror->backingStore)) job->disk->mirror->backingStore = g_steal_pointer(&job->disk->src->backingStore); - if (job->disk->src->readonly && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN)) + if (job->disk->src->readonly) ignore_value(qemuBlockReopenReadOnly(vm, job->disk->mirror, asyncJob)); qemuBlockJobRewriteConfigDiskSource(vm, job->disk, job->disk->mirror); diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index ca58da8fcb..b05aaa246e 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -225,8 +225,7 @@ qemuCheckpointDiscardBitmaps(virDomainObj *vm, false, false, false) < 0) goto relabel; - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN) && - qemuBlockReopenReadWrite(vm, src, VIR_ASYNC_JOB_NONE) < 0) + if (qemuBlockReopenReadWrite(vm, src, VIR_ASYNC_JOB_NONE) < 0) goto relabel; relabelimages = g_slist_prepend(relabelimages, src); @@ -240,8 +239,7 @@ qemuCheckpointDiscardBitmaps(virDomainObj *vm, for (next = relabelimages; next; next = next->next) { virStorageSource *src = next->data; - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN)) - ignore_value(qemuBlockReopenReadOnly(vm, src, VIR_ASYNC_JOB_NONE)); + ignore_value(qemuBlockReopenReadOnly(vm, src, VIR_ASYNC_JOB_NONE)); ignore_value(qemuDomainStorageSourceAccessAllow(driver, vm, src, true, false, false)); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2364b4d312..ef731cb072 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14260,14 +14260,9 @@ qemuDomainBlockCopyCommon(virDomainObj *vm, keepParentLabel) < 0) goto endjob; - if (mirror->readonly) { - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("copy of read-only disks is not supported")); - goto endjob; - } - mirror->readonly = false; - } + /* In case we're copying a read-only disk we need to open the mirror image + * as read-write for the duration of the copy job */ + mirror->readonly = false; /* we must initialize XML-provided chain prior to detecting to keep semantics * with VM startup */ -- 2.48.1
On a Wednesday in 2025, Peter Krempa wrote:
'blockdev-reopen' is supported since qemu-6.1, thus we can now remove the interlocks.
Document the change to 'mirror' as this patch removes the last clue why we overwrite the mirror's readonly state to false unconditionally.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_blockjob.c | 11 +---------- src/qemu/qemu_checkpoint.c | 6 ++---- src/qemu/qemu_driver.c | 11 +++-------- 3 files changed, 6 insertions(+), 22 deletions(-)
*support in the commit summary Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
'blockdev-reopen' is supported since qemu-6.1. Since we now don't have any code using this capability we can retire it. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 6 ++---- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml | 1 - tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml | 1 - tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml | 1 - 31 files changed, 3 insertions(+), 34 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f0c48bb2be..82e7dc5ccc 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -566,7 +566,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "vhost-user-fs", /* QEMU_CAPS_DEVICE_VHOST_USER_FS */ "query-named-block-nodes.flat", /* X_QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT */ "blockdev-snapshot.allow-write-only-overlay", /* QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY */ - "blockdev-reopen", /* QEMU_CAPS_BLOCKDEV_REOPEN */ + "blockdev-reopen", /* X_QEMU_CAPS_BLOCKDEV_REOPEN */ "storage.werror", /* X_QEMU_CAPS_STORAGE_WERROR */ /* 360 */ @@ -1241,7 +1241,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "query-cpu-model-baseline", QEMU_CAPS_QUERY_CPU_MODEL_BASELINE }, { "query-cpu-model-comparison", QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON }, { "block-export-add", QEMU_CAPS_BLOCK_EXPORT_ADD }, - { "blockdev-reopen", QEMU_CAPS_BLOCKDEV_REOPEN }, { "set-action", QEMU_CAPS_SET_ACTION }, { "query-dirty-rate", QEMU_CAPS_QUERY_DIRTY_RATE }, { "sev-inject-launch-secret", QEMU_CAPS_SEV_INJECT_LAUNCH_SECRET }, @@ -5594,8 +5593,7 @@ virQEMUCapsInitQMPVersionCaps(virQEMUCaps *qemuCaps G_GNUC_UNUSED) void virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qemuCaps) { - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING)) + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING)) virQEMUCapsSet(qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP); } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 1fedfdaeb1..620289572e 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -545,7 +545,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_DEVICE_VHOST_USER_FS, /* -device vhost-user-fs */ X_QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT, /* query-named-block-nodes supports the 'flat' option */ QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY, /* blockdev-snapshot has the 'allow-write-only-overlay' feature */ - QEMU_CAPS_BLOCKDEV_REOPEN, /* 'blockdev-reopen' qmp command is supported */ + X_QEMU_CAPS_BLOCKDEV_REOPEN, /* 'blockdev-reopen' qmp command is supported */ X_QEMU_CAPS_STORAGE_WERROR, /* virtio-blk,scsi-hd.werror */ /* 360 */ diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml index a35578fab4..3f34d4853c 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml @@ -68,7 +68,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='aio.io_uring'/> <flag name='tcg'/> diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml index 6be2a75358..db1c649453 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml @@ -125,7 +125,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml index 3b9dec3c67..0c5336b9f4 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml @@ -125,7 +125,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml index 4bc090f960..2094c2e761 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml @@ -94,7 +94,6 @@ <flag name='tpm-spapr'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='tcg'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml index f24d1b00d5..0d74ef5490 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -126,7 +126,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml index c02c4a23b3..a19cdd7391 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml @@ -103,7 +103,6 @@ <flag name='tpm-spapr'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml index 324e1b824f..9fe235e7cb 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -126,7 +126,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml index 6a93c860e0..1cffb4d46c 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -100,7 +100,6 @@ <flag name='tpm-spapr'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml index 77b6a93061..2fd7c14d89 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -126,7 +126,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml index bbf3dded5b..775979c09e 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -93,7 +93,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index 3d3d729b72..8fdfa14e24 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -125,7 +125,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml index 1472ed5556..6c78c3e697 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -126,7 +126,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml index 29dd31151d..a0604e94b7 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -126,7 +126,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml index 44885a6e6d..c667c62418 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml @@ -65,7 +65,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='aio.io_uring'/> <flag name='tcg'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml index 4a67276bb9..b1f6c765fc 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -126,7 +126,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml index e19e15688a..7783054d8a 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml @@ -99,7 +99,6 @@ <flag name='cpu.kvm-no-adjvtime'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml index ac856a760b..4db71213c4 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml @@ -103,7 +103,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml index 3a5d881db4..2f710ae116 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml @@ -92,7 +92,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml index 558cf8654c..67afe4be0b 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml @@ -65,7 +65,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='aio.io_uring'/> <flag name='tcg'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml index 899cdb33ee..847f1bb11b 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml @@ -126,7 +126,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml index 10ac1add8f..15dc88b166 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml @@ -31,7 +31,6 @@ <flag name='smp-dies'/> <flag name='rng-builtin'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='aio.io_uring'/> <flag name='tcg'/> diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml index 39939b367c..12464925dc 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml @@ -126,7 +126,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml index 613c32f173..acba45001c 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml @@ -96,7 +96,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml index 35b14f2ccc..30704ce425 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml @@ -68,7 +68,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='aio.io_uring'/> <flag name='tcg'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml index 0c2b277a8c..d9ac11c13f 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml @@ -125,7 +125,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml index f4552c3765..2d1eb90d61 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml @@ -76,7 +76,6 @@ <flag name='smp-dies'/> <flag name='rng-builtin'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='tcg'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml index 643cdeb1e0..b7d7446c6d 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml @@ -68,7 +68,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='aio.io_uring'/> <flag name='tcg'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml index cd0adf5a64..ba0141f71e 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml @@ -126,7 +126,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml index bf2fafe2e0..d97b77fa42 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml @@ -125,7 +125,6 @@ <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> - <flag name='blockdev-reopen'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> -- 2.48.1
qemu supports the @allow-write-only-overlay feature since qemu-5.0. Remove the alternate code paths. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_block.c | 1 - src/qemu/qemu_blockjob.c | 9 +++------ src/qemu/qemu_driver.c | 20 ++++++-------------- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index eb0621463e..76e7f4ca83 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -3826,7 +3826,6 @@ qemuBlockPivot(virDomainObj *vm, * to copy data into the backing chain while the top image is being * copied shallow */ if (reuse && shallow && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY) && virStorageSourceHasBacking(disk->mirror)) { if (qemuProcessPrepareHostStorageSourceChain(vm, disk->mirror->backingStore) < 0) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index be18f7b273..7b7d54fdca 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -1268,7 +1268,6 @@ qemuBlockJobProcessEventConcludedCopyAbort(virQEMUDriver *driver, qemuBlockJobData *job, virDomainAsyncJob asyncJob) { - qemuDomainObjPrivate *priv = vm->privateData; g_autoptr(virStorageSource) mirror = NULL; VIR_DEBUG("copy job '%s' on VM '%s' aborted", job->name, vm->def->name); @@ -1283,12 +1282,10 @@ qemuBlockJobProcessEventConcludedCopyAbort(virQEMUDriver *driver, bool reuse = job->jobflags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT; /* In the special case of a shallow copy with reused image we don't - * hotplug the full chain when QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY - * is supported. Attempting to delete it would thus result in spurious - * errors as we'd attempt to blockdev-del images which were not added - * yet */ + * hotplug the full chain. Attempting to delete it would thus result in + * spurious errors as we'd attempt to blockdev-del images which were + * not added yet */ if (reuse && shallow && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY) && virStorageSourceHasBacking(job->disk->mirror)) g_clear_pointer(&job->disk->mirror->backingStore, virObjectUnref); } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ef731cb072..f974d2fba8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14299,22 +14299,14 @@ qemuDomainBlockCopyCommon(virDomainObj *vm, * level is being copied. To restore this semantics if * blockdev-reopen is supported defer opening of the backing chain * of 'mirror' to the pivot step */ - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY)) { - g_autoptr(virStorageSource) terminator = virStorageSourceNew(); + g_autoptr(virStorageSource) terminator = virStorageSourceNew(); - if (qemuProcessPrepareHostStorageSource(vm, mirror) < 0) - goto endjob; - - if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(mirror, - terminator))) - goto endjob; - } else { - if (qemuProcessPrepareHostStorageSourceChain(vm, mirror) < 0) - goto endjob; + if (qemuProcessPrepareHostStorageSource(vm, mirror) < 0) + goto endjob; - if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdev(mirror))) - goto endjob; - } + if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(mirror, + terminator))) + goto endjob; } else { if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, VIR_ASYNC_JOB_NONE))) goto endjob; -- 2.48.1
All supported qemus have this and we already deleted alternate code. Retire the feature flag. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml | 1 - tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml | 1 - tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml | 1 - 31 files changed, 2 insertions(+), 32 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 82e7dc5ccc..615efbf021 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -565,7 +565,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 355 */ "vhost-user-fs", /* QEMU_CAPS_DEVICE_VHOST_USER_FS */ "query-named-block-nodes.flat", /* X_QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT */ - "blockdev-snapshot.allow-write-only-overlay", /* QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY */ + "blockdev-snapshot.allow-write-only-overlay", /* X_QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY */ "blockdev-reopen", /* X_QEMU_CAPS_BLOCKDEV_REOPEN */ "storage.werror", /* X_QEMU_CAPS_STORAGE_WERROR */ @@ -1573,7 +1573,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = { { "blockdev-add/arg-type/+nbd/tls-hostname", QEMU_CAPS_BLOCKDEV_NBD_TLS_HOSTNAME }, { "blockdev-add/arg-type/+qcow2/discard-no-unref", QEMU_CAPS_QCOW2_DISCARD_NO_UNREF }, { "blockdev-add/arg-type/+virtio-blk-vhost-vdpa/$fdset", QEMU_CAPS_DEVICE_VIRTIO_BLK_VHOST_VDPA}, - { "blockdev-snapshot/$allow-write-only-overlay", QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY }, { "calc-dirty-rate/arg-type/mode", QEMU_CAPS_DIRTYRATE_MODE }, { "chardev-add/arg-type/backend/+socket/data/reconnect", QEMU_CAPS_CHARDEV_RECONNECT }, { "chardev-add/arg-type/backend/+socket/data/reconnect-ms", QEMU_CAPS_CHARDEV_RECONNECT_MILISECONDS }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 620289572e..4a865b13de 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -544,7 +544,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 355 */ QEMU_CAPS_DEVICE_VHOST_USER_FS, /* -device vhost-user-fs */ X_QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT, /* query-named-block-nodes supports the 'flat' option */ - QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY, /* blockdev-snapshot has the 'allow-write-only-overlay' feature */ + X_QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY, /* blockdev-snapshot has the 'allow-write-only-overlay' feature */ X_QEMU_CAPS_BLOCKDEV_REOPEN, /* 'blockdev-reopen' qmp command is supported */ X_QEMU_CAPS_STORAGE_WERROR, /* virtio-blk,scsi-hd.werror */ diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml index 3f34d4853c..2dede610ef 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml @@ -67,7 +67,6 @@ <flag name='smp-dies'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='aio.io_uring'/> <flag name='tcg'/> diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml index db1c649453..29f82b8a0c 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml @@ -124,7 +124,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml index 0c5336b9f4..d26fd44571 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml @@ -124,7 +124,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml index 2094c2e761..1c05e529c4 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml @@ -93,7 +93,6 @@ <flag name='rng-builtin'/> <flag name='tpm-spapr'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='tcg'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml index 0d74ef5490..81882a3c4e 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -125,7 +125,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml index a19cdd7391..01930afc18 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml @@ -102,7 +102,6 @@ <flag name='rng-builtin'/> <flag name='tpm-spapr'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml index 9fe235e7cb..b82a49fb99 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -125,7 +125,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml index 1cffb4d46c..d8c4e4ec1e 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -99,7 +99,6 @@ <flag name='rng-builtin'/> <flag name='tpm-spapr'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml index 2fd7c14d89..68c8d5f297 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -125,7 +125,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml index 775979c09e..ee49af7a57 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -92,7 +92,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index 8fdfa14e24..a42b4c30d9 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -124,7 +124,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml index 6c78c3e697..d4c8bcea18 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -125,7 +125,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml index a0604e94b7..9e8eac7391 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -125,7 +125,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml index c667c62418..439ccffcd5 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml @@ -64,7 +64,6 @@ <flag name='smp-dies'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='aio.io_uring'/> <flag name='tcg'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml index b1f6c765fc..d0d0b86c6e 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -125,7 +125,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml index 7783054d8a..310825c3fe 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml @@ -98,7 +98,6 @@ <flag name='rng-builtin'/> <flag name='cpu.kvm-no-adjvtime'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml index 4db71213c4..73b7f470a8 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml @@ -102,7 +102,6 @@ <flag name='smp-dies'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml index 2f710ae116..c924ef71ec 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml @@ -91,7 +91,6 @@ <flag name='smp-dies'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml index 67afe4be0b..5049ce8f66 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml @@ -64,7 +64,6 @@ <flag name='smp-dies'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='aio.io_uring'/> <flag name='tcg'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml index 847f1bb11b..be25027001 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml @@ -125,7 +125,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml index 15dc88b166..978f48ea36 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml @@ -30,7 +30,6 @@ <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='rng-builtin'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='aio.io_uring'/> <flag name='tcg'/> diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml index 12464925dc..4867768fbd 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml @@ -125,7 +125,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml index acba45001c..a86e2b5909 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml @@ -95,7 +95,6 @@ <flag name='smp-dies'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml index 30704ce425..1dce3b3420 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml @@ -67,7 +67,6 @@ <flag name='smp-dies'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='aio.io_uring'/> <flag name='tcg'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml index d9ac11c13f..5180ed9461 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml @@ -124,7 +124,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml index 2d1eb90d61..60e76ac09a 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml @@ -75,7 +75,6 @@ <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='rng-builtin'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='tcg'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml index b7d7446c6d..38f8d0fe57 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml @@ -67,7 +67,6 @@ <flag name='smp-dies'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='aio.io_uring'/> <flag name='tcg'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml index ba0141f71e..5cee701325 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml @@ -125,7 +125,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml index d97b77fa42..424c2b9147 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml @@ -124,7 +124,6 @@ <flag name='i8042'/> <flag name='rng-builtin'/> <flag name='vhost-user-fs'/> - <flag name='blockdev-snapshot.allow-write-only-overlay'/> <flag name='fsdev.multidevs'/> <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> -- 2.48.1
The support for incremental backup (not the backup api itself) was gated on support for migrating bitmaps. As the ability to migrate bitmaps was added in qemu-6.0 we can now assume that all supported qemu versions support incremental backup. Remove the interlocking. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_backup.c | 18 ------------------ src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_checkpoint.c | 12 ------------ src/qemu/qemu_domain.c | 11 +---------- 4 files changed, 2 insertions(+), 41 deletions(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index f64639d501..43576d135b 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -806,24 +806,6 @@ qemuBackupBegin(virDomainObj *vm, if (virDomainBackupAlignDisks(def, vm->def, suffix) < 0) goto endjob; - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP)) { - size_t i; - - if (chkdef) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("creating checkpoint for incremental backup is not supported yet")); - goto endjob; - } - - for (i = 0; i < def->ndisks; i++) { - if (def->disks[i].backupmode == VIR_DOMAIN_BACKUP_DISK_BACKUP_MODE_INCREMENTAL) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("incremental backup is not supported yet")); - goto endjob; - } - } - } - if (priv->backup) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("another backup job is already running")); diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 615efbf021..117648f03f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -6392,7 +6392,7 @@ static const struct virQEMUCapsDomainFeatureCapabilityTuple domCapsTuples[] = { { VIR_DOMAIN_CAPS_FEATURE_VMCOREINFO, QEMU_CAPS_DEVICE_VMCOREINFO }, { VIR_DOMAIN_CAPS_FEATURE_GENID, QEMU_CAPS_DEVICE_VMGENID }, { VIR_DOMAIN_CAPS_FEATURE_BACKING_STORE_INPUT, QEMU_CAPS_LAST }, - { VIR_DOMAIN_CAPS_FEATURE_BACKUP, QEMU_CAPS_INCREMENTAL_BACKUP }, + { VIR_DOMAIN_CAPS_FEATURE_BACKUP, QEMU_CAPS_LAST }, { VIR_DOMAIN_CAPS_FEATURE_ASYNC_TEARDOWN, QEMU_CAPS_RUN_WITH_ASYNC_TEARDOWN }, }; diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index b05aaa246e..cf44e45aa1 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -588,12 +588,6 @@ qemuCheckpointCreateXML(virDomainPtr domain, _("cannot create checkpoint for inactive domain")); return NULL; } - - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("incremental backup is not supported yet")); - return NULL; - } } if (!(def = virDomainCheckpointDefParseString(xmlDesc, driver->xmlopt, @@ -855,12 +849,6 @@ qemuCheckpointDelete(virDomainObj *vm, _("cannot delete checkpoint for inactive domain")); goto endjob; } - - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("incremental backup is not supported yet")); - goto endjob; - } } if (!(chk = qemuCheckpointObjFromCheckpoint(vm, checkpoint))) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 8be2181156..ea29765c61 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10178,17 +10178,8 @@ qemuDomainDefHasManagedPR(virDomainObj *vm) * 0 in case everything is supported. */ int -qemuDomainSupportsCheckpointsBlockjobs(virDomainObj *vm) +qemuDomainSupportsCheckpointsBlockjobs(virDomainObj *vm G_GNUC_UNUSED) { - qemuDomainObjPrivate *priv = vm->privateData; - - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP) && - virDomainListCheckpoints(vm->checkpoints, NULL, NULL, NULL, 0) > 0) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("cannot perform block operations while checkpoint exists")); - return -1; - } - return 0; } -- 2.48.1
All supported qemu versions now support this. Retire the capability. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 6 ++---- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml | 1 - tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml | 1 - tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml | 1 - 31 files changed, 3 insertions(+), 34 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 117648f03f..4e292053c9 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -542,7 +542,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "vhost-user-vga", /* QEMU_CAPS_DEVICE_VHOST_USER_VGA */ /* 340 */ - "incremental-backup", /* QEMU_CAPS_INCREMENTAL_BACKUP */ + "incremental-backup", /* X_QEMU_CAPS_INCREMENTAL_BACKUP */ "query-cpu-model-baseline", /* QEMU_CAPS_QUERY_CPU_MODEL_BASELINE */ "query-cpu-model-comparison", /* QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON */ "ramfb", /* QEMU_CAPS_DEVICE_RAMFB */ @@ -5590,10 +5590,8 @@ virQEMUCapsInitQMPVersionCaps(virQEMUCaps *qemuCaps G_GNUC_UNUSED) * for libvirt to be able to drive it properly should be processed here. */ void -virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qemuCaps) +virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qemuCaps G_GNUC_UNUSED) { - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING)) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP); } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 4a865b13de..f775735c29 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -521,7 +521,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_DEVICE_VHOST_USER_VGA, /* -device vhost-user-vga */ /* 340 */ - QEMU_CAPS_INCREMENTAL_BACKUP, /* incremental backup is supported */ + X_QEMU_CAPS_INCREMENTAL_BACKUP, /* incremental backup is supported */ QEMU_CAPS_QUERY_CPU_MODEL_BASELINE, /* qmp query-cpu-model-baseline */ QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON, /* qmp query-cpu-model-comparison */ QEMU_CAPS_DEVICE_RAMFB, /* -device ramfb */ diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml index 2dede610ef..33be470dce 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml @@ -60,7 +60,6 @@ <flag name='migration-file-drop-cache'/> <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> - <flag name='incremental-backup'/> <flag name='query-cpu-model-baseline'/> <flag name='query-cpu-model-comparison'/> <flag name='drive-nvme'/> diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml index 29f82b8a0c..8a2db4b408 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml @@ -117,7 +117,6 @@ <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> - <flag name='incremental-backup'/> <flag name='ramfb'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml index d26fd44571..4bc385a402 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml @@ -117,7 +117,6 @@ <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> - <flag name='incremental-backup'/> <flag name='ramfb'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml index 1c05e529c4..894c648d83 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml @@ -86,7 +86,6 @@ <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> - <flag name='incremental-backup'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='i8042'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml index 81882a3c4e..fd0a2f8995 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -118,7 +118,6 @@ <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> - <flag name='incremental-backup'/> <flag name='ramfb'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml index 01930afc18..f28b64bf7f 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml @@ -95,7 +95,6 @@ <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> - <flag name='incremental-backup'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='i8042'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml index b82a49fb99..67cca76dbd 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -118,7 +118,6 @@ <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> - <flag name='incremental-backup'/> <flag name='ramfb'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml index d8c4e4ec1e..55c4d52737 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -92,7 +92,6 @@ <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> - <flag name='incremental-backup'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='i8042'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml index 68c8d5f297..973d180093 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -118,7 +118,6 @@ <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> - <flag name='incremental-backup'/> <flag name='ramfb'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml index ee49af7a57..f11616ac18 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -86,7 +86,6 @@ <flag name='migration-file-drop-cache'/> <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> - <flag name='incremental-backup'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='i8042'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index a42b4c30d9..d978c6ac17 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -117,7 +117,6 @@ <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> - <flag name='incremental-backup'/> <flag name='ramfb'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml index d4c8bcea18..1638f26179 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -118,7 +118,6 @@ <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> - <flag name='incremental-backup'/> <flag name='ramfb'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml index 9e8eac7391..bcc83ac918 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -118,7 +118,6 @@ <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> - <flag name='incremental-backup'/> <flag name='ramfb'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml index 439ccffcd5..e9ceb5d77a 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml @@ -57,7 +57,6 @@ <flag name='migration-file-drop-cache'/> <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> - <flag name='incremental-backup'/> <flag name='query-cpu-model-baseline'/> <flag name='query-cpu-model-comparison'/> <flag name='drive-nvme'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml index d0d0b86c6e..e4677f8f69 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -118,7 +118,6 @@ <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> - <flag name='incremental-backup'/> <flag name='ramfb'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml index 310825c3fe..c74d9768f4 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml @@ -90,7 +90,6 @@ <flag name='migration-file-drop-cache'/> <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> - <flag name='incremental-backup'/> <flag name='ramfb'/> <flag name='arm-max-cpu'/> <flag name='drive-nvme'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml index 73b7f470a8..d529290b12 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml @@ -95,7 +95,6 @@ <flag name='migration-file-drop-cache'/> <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> - <flag name='incremental-backup'/> <flag name='ramfb'/> <flag name='arm-max-cpu'/> <flag name='drive-nvme'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml index c924ef71ec..444e8339fb 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml @@ -85,7 +85,6 @@ <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> - <flag name='incremental-backup'/> <flag name='ramfb'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml index 5049ce8f66..11d1dd3462 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml @@ -57,7 +57,6 @@ <flag name='migration-file-drop-cache'/> <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> - <flag name='incremental-backup'/> <flag name='query-cpu-model-baseline'/> <flag name='query-cpu-model-comparison'/> <flag name='drive-nvme'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml index be25027001..84ea25e2cf 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml @@ -118,7 +118,6 @@ <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> - <flag name='incremental-backup'/> <flag name='ramfb'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml index 978f48ea36..82d2b2137b 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml @@ -26,7 +26,6 @@ <flag name='nbd-bitmap'/> <flag name='migration-file-drop-cache'/> <flag name='dbus-vmstate'/> - <flag name='incremental-backup'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='rng-builtin'/> diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml index 4867768fbd..a5d8d13f8c 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml @@ -118,7 +118,6 @@ <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> - <flag name='incremental-backup'/> <flag name='ramfb'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml index a86e2b5909..a6f53f14f1 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml @@ -89,7 +89,6 @@ <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> - <flag name='incremental-backup'/> <flag name='ramfb'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml index 1dce3b3420..7bf37bfc86 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml @@ -60,7 +60,6 @@ <flag name='migration-file-drop-cache'/> <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> - <flag name='incremental-backup'/> <flag name='query-cpu-model-baseline'/> <flag name='query-cpu-model-comparison'/> <flag name='drive-nvme'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml index 5180ed9461..6eca845903 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml @@ -117,7 +117,6 @@ <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> - <flag name='incremental-backup'/> <flag name='ramfb'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml index 60e76ac09a..eb0d2c94bf 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml @@ -69,7 +69,6 @@ <flag name='nbd-bitmap'/> <flag name='bochs-display'/> <flag name='dbus-vmstate'/> - <flag name='incremental-backup'/> <flag name='ramfb'/> <flag name='arm-max-cpu'/> <flag name='drive-nvme'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml index 38f8d0fe57..0c99442c9a 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml @@ -60,7 +60,6 @@ <flag name='migration-file-drop-cache'/> <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> - <flag name='incremental-backup'/> <flag name='query-cpu-model-baseline'/> <flag name='query-cpu-model-comparison'/> <flag name='drive-nvme'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml index 5cee701325..5b31697fb1 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml @@ -118,7 +118,6 @@ <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> - <flag name='incremental-backup'/> <flag name='ramfb'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml index 424c2b9147..3d50ad1fd4 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml @@ -117,7 +117,6 @@ <flag name='dbus-vmstate'/> <flag name='vhost-user-gpu'/> <flag name='vhost-user-vga'/> - <flag name='incremental-backup'/> <flag name='ramfb'/> <flag name='drive-nvme'/> <flag name='smp-dies'/> -- 2.48.1
The function now serves no real purpose. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_block.c | 3 --- src/qemu/qemu_domain.c | 14 -------------- src/qemu/qemu_domain.h | 4 ---- src/qemu/qemu_driver.c | 6 ------ src/qemu/qemu_snapshot.c | 4 ---- 5 files changed, 31 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 76e7f4ca83..2468725bf7 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -3592,9 +3592,6 @@ qemuBlockCommit(virDomainObj *vm, if (qemuDomainDiskBlockJobIsActive(disk)) return NULL; - if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0) - return NULL; - if (topSource == disk->src) { /* XXX Should we auto-pivot when COMMIT_ACTIVE is not specified? */ if (!(flags & VIR_DOMAIN_BLOCK_COMMIT_ACTIVE)) { diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ea29765c61..29fac0034e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10169,20 +10169,6 @@ qemuDomainDefHasManagedPR(virDomainObj *vm) } -/** - * qemuDomainSupportsCheckpointsBlockjobs: - * @vm: domain object - * - * Checks whether a block job is supported in possible combination with - * checkpoints (qcow2 bitmaps). Returns -1 if unsupported and reports an error - * 0 in case everything is supported. - */ -int -qemuDomainSupportsCheckpointsBlockjobs(virDomainObj *vm G_GNUC_UNUSED) -{ - return 0; -} - /** * qemuDomainInitializePflashStorageSource: * diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 04577f1297..8e53a270a7 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -1053,10 +1053,6 @@ int qemuDomainValidateActualNetDef(const virDomainNetDef *net, virQEMUCaps *qemuCaps); -int -qemuDomainSupportsCheckpointsBlockjobs(virDomainObj *vm) - G_GNUC_WARN_UNUSED_RESULT; - int qemuDomainMakeCPUMigratable(virArch arch, virCPUDef *cpu, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f974d2fba8..af5445f78d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13624,9 +13624,6 @@ qemuDomainBlockPullCommon(virDomainObj *vm, if (virDomainObjCheckActive(vm) < 0) goto endjob; - if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0) - goto endjob; - if (!(disk = qemuDomainDiskByName(vm->def, path))) goto endjob; @@ -14150,9 +14147,6 @@ qemuDomainBlockCopyCommon(virDomainObj *vm, if (virDomainObjCheckActive(vm) < 0) goto endjob; - if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0) - goto endjob; - if (!(disk = qemuDomainDiskByName(vm->def, path))) goto endjob; diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 9556bd1216..9c2ab47c51 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1082,7 +1082,6 @@ qemuSnapshotPrepare(virDomainObj *vm, } /* Handle interlocking with 'checkpoints': - * - if the VM is online use qemuDomainSupportsCheckpointsBlockjobs * - if the VM is offline disallow external snapshots as the support for * propagating bitmaps into the would-be-created overlay is not yet implemented */ @@ -1093,9 +1092,6 @@ qemuSnapshotPrepare(virDomainObj *vm, _("support for offline external snapshots while checkpoint exists was not yet implemented")); return -1; } - } else { - if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0) - return -1; } /* Alter flags to let later users know what we learned. */ -- 2.48.1
The 'transform' attribute of 'bitmaps' was added in qemu-6.0, thus we can assume all qemus we're willing to use support it. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_migration.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e1399806d5..02ba35dc59 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2681,7 +2681,6 @@ qemuMigrationSrcBeginXML(virDomainObj *vm, return NULL; if (cookieFlags & QEMU_MIGRATION_COOKIE_NBD && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING) && qemuMigrationSrcBeginPhaseBlockDirtyBitmaps(mig, vm, migrate_disks) < 0) return NULL; @@ -3188,15 +3187,13 @@ qemuMigrationDstPrepareAnyBlockDirtyBitmaps(virDomainObj *vm, qemuMigrationParams *migParams, unsigned int flags) { - qemuDomainObjPrivate *priv = vm->privateData; g_autoptr(virJSONValue) mapping = NULL; g_autoptr(GHashTable) blockNamedNodeData = NULL; GSList *nextdisk; if (!mig->nbd || !mig->blockDirtyBitmaps || - !(flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC)) || - !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING)) + !(flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC))) return 0; if (qemuMigrationCookieBlockDirtyBitmapsMatchDisks(vm->def, mig->blockDirtyBitmaps) < 0) @@ -4936,10 +4933,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, if (storageMigration) { cookieFlags |= QEMU_MIGRATION_COOKIE_NBD; - - if (virQEMUCapsGet(priv->qemuCaps, - QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING)) - cookieFlags |= QEMU_MIGRATION_COOKIE_BLOCK_DIRTY_BITMAPS; + cookieFlags |= QEMU_MIGRATION_COOKIE_BLOCK_DIRTY_BITMAPS; } if (virLockManagerPluginUsesState(driver->lockManager) && -- 2.48.1
The capability is no logner used as all qemus support it. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml | 1 - tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml | 1 - tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml | 1 - 31 files changed, 2 insertions(+), 32 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 4e292053c9..d13b4c8109 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -616,7 +616,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "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", /* X_QEMU_CAPS_VNC_OPTS */ - "migration-param.block-bitmap-mapping", /* QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING */ + "migration-param.block-bitmap-mapping", /* X_QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING */ /* 395 */ "vnc-power-control", /* QEMU_CAPS_VNC_POWER_CONTROL */ @@ -1578,7 +1578,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = { { "chardev-add/arg-type/backend/+socket/data/reconnect-ms", QEMU_CAPS_CHARDEV_RECONNECT_MILISECONDS }, { "chardev-add/arg-type/backend/+qemu-vdagent", QEMU_CAPS_CHARDEV_QEMU_VDAGENT }, { "device_add/$json-cli-hotplug", QEMU_CAPS_DEVICE_JSON }, - { "migrate-set-parameters/arg-type/block-bitmap-mapping/bitmaps/transform", QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING }, { "nbd-server-start/arg-type/tls-creds", QEMU_CAPS_NBD_TLS }, { "nbd-server-add/arg-type/bitmap", QEMU_CAPS_NBD_BITMAP }, { "netdev_add/arg-type/+stream", QEMU_CAPS_NETDEV_STREAM }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index f775735c29..e836d107aa 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -595,7 +595,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ 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= */ 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 */ + X_QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING, /* block-bitmap-mapping in migrate-set-parameters */ /* 395 */ QEMU_CAPS_VNC_POWER_CONTROL, /* -vnc power-control option */ diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml index 33be470dce..0600cbda62 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml @@ -78,7 +78,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml index 8a2db4b408..ad7bb7ebc8 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml @@ -142,7 +142,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml index 4bc385a402..24509f6a0a 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml @@ -142,7 +142,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml index 894c648d83..e080352a4c 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml @@ -108,7 +108,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml index fd0a2f8995..1c7def169c 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -144,7 +144,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml index f28b64bf7f..a5dbf4fb13 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml @@ -119,7 +119,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml index 67cca76dbd..8e342bf4ad 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -144,7 +144,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml index 55c4d52737..610ca193d0 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -115,7 +115,6 @@ <flag name='vhost-user-fs.bootindex'/> <flag name='vhost-user-blk'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml index 973d180093..71e6c16e8f 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -144,7 +144,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml index f11616ac18..bba3376484 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -107,7 +107,6 @@ <flag name='vhost-user-fs.bootindex'/> <flag name='vhost-user-blk'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index d978c6ac17..7bdeb00f9a 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.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='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml index 1638f26179..54c72521b0 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -144,7 +144,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml index bcc83ac918..54db96d9c7 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -144,7 +144,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml index e9ceb5d77a..0de066b2d9 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml @@ -75,7 +75,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml index e4677f8f69..7d508a1601 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -144,7 +144,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml index c74d9768f4..047a08a20c 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml @@ -114,7 +114,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml index d529290b12..3bf741931d 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml @@ -118,7 +118,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml index 444e8339fb..73871a6880 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml @@ -107,7 +107,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml index 11d1dd3462..d1f4bd300e 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml @@ -75,7 +75,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml index 84ea25e2cf..2da46d944d 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml @@ -144,7 +144,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml index 82d2b2137b..698136134d 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml @@ -37,7 +37,6 @@ <flag name='netdev.vhost-vdpa'/> <flag name='ncr53c90'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='input-linux'/> diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml index a5d8d13f8c..b273193d35 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml @@ -144,7 +144,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml index a6f53f14f1..60eeb04fe7 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml @@ -110,7 +110,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml index 7bf37bfc86..91738c0204 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml @@ -78,7 +78,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml index 6eca845903..6b995c2f26 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml @@ -142,7 +142,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml index eb0d2c94bf..a7bfc10168 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml @@ -87,7 +87,6 @@ <flag name='am53c974'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml index 0c99442c9a..7427bab1e9 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml @@ -78,7 +78,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml index 5b31697fb1..2181b9432a 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.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='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml index 3d50ad1fd4..924f56d010 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml @@ -142,7 +142,6 @@ <flag name='vhost-user-blk'/> <flag name='cpu-max'/> <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> - <flag name='migration-param.block-bitmap-mapping'/> <flag name='vnc-power-control'/> <flag name='rotation-rate'/> <flag name='acpi-index'/> -- 2.48.1
On a Wednesday in 2025, Peter Krempa wrote:
The recent bump of minimum qemu version resulted into some capabilities always being present. I've noticed one while doing a review and from there I removed a few others, mostly storage related ones as well.
Peter Krempa (17): qemuBuildCompatDeprecatedCommandLine: Assume that QEMU_CAPS_COMPAT_DEPRECATED is supported qemu: capabilities: Retire QEMU_CAPS_COMPAT_DEPRECATED qemuBuildObjectCommandlineFromJSON: Assume all qemus support QEMU_CAPS_OBJECT_JSON qemu: monitor: Drop support for extra wrapper for 'object_add' util: Drop 'virQEMUBuildCommandLineJSONArrayBitmap' qemu: capabilities: Retire QEMU_CAPS_OBJECT_JSON qemu: monitor: Always assume support for QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT qemu: capabilities: Retire QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT qemu: Always assume supprot for QEMU_CAPS_BLOCKDEV_REOPEN qemu: capabilities: Retire QEMU_CAPS_BLOCKDEV_REOPEN qemu: Always assume support for QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY qemu: capabilities: Retire QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY qemu: Always assume support for QEMU_CAPS_INCREMENTAL_BACKUP qemu: capabilites: Retire QEMU_CAPS_INCREMENTAL_BACKUP qemu: domain: Remove qemuDomainSupportsCheckpointsBlockjobs qemu: migration: Always assume support for QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING qemu: capabilites: Retire QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
participants (3)
-
Daniel P. Berrangé -
Ján Tomko -
Peter Krempa