From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 26 Oct 2020 12:09:17 +0000 (+0100)
Subject: qemu: capabilities: Re-enable detection of QEMU_CAPS_BLOCK_EXPORT_ADD
X-Git-Tag: v6.10.0-rc1~406
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42558a43f87f5a3e73bacb88baf425648415a06f;p=thirdparty%2Flibvirt.git

qemu: capabilities: Re-enable detection of QEMU_CAPS_BLOCK_EXPORT_ADD

Now that qemu stabilized it's interface and we've switched to the new
design we can re-enable use of 'block-export-add'

This reverts commit b87cfc957f57c1d9f7e5bf828ee4b23972085991

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 78be372a0c..a67fb785b5 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1172,6 +1172,7 @@ 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 6ee4d946aa..7cd8af31be 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -246,6 +246,7 @@
   <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>