[PATCH 1/3] qemu: capabilities: Disable detection of QEMU_CAPS_BLOCK_EXPORT_ADD

We use the capability to switch to using 'block-export-add' in the upcoming qemu release instead of the at the same time deprecated 'nbd-server-add'. Unfortunately qemu wants to change the interface of 'block-export-add' before the release. Since we've tried to stay up to date and added the code before it was written in stone, we need to disable the use of the new interface for the upcoming libvirt release so that we don't have a version of libvirt which would not work with the upcoming qemu version. Remove the detection of 'block-export-add' until we are more sure how the qemu interface will look. This patch partially reverts commit adb9f7123adb94645 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - 2 files changed, 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a67fb785b5..78be372a0c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1172,7 +1172,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "block-dirty-bitmap-merge", QEMU_CAPS_BITMAP_MERGE }, { "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 }, }; struct virQEMUCapsStringFlags virQEMUCapsMigration[] = { diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 7e07ac486d..63e947c1b3 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -246,7 +246,6 @@ <flag name='blockdev-hostdev-scsi'/> <flag name='usb-host.hostdevice'/> <flag name='virtio-balloon.free-page-reporting'/> - <flag name='block-export-add'/> <flag name='netdev.vhost-vdpa'/> <version>5001050</version> <kvmVersion>0</kvmVersion> -- 2.26.2