From b04e1fddf707b0136d9504df0dbca778181fb6f6 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 3 Nov 2020 09:16:30 +0100
Subject: [PATCH] qemu: capabilities: Enable detection of
 QEMU_CAPS_BLOCKDEV_REOPEN

Base it on the presence of the "blockdev-reopen" QMP command.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
---
 src/qemu/qemu_capabilities.c                     | 1 +
 tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml   | 2 +-
 tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml   | 2 +-
 tests/domaincapsdata/qemu_6.1.0.x86_64.xml       | 2 +-
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 2 ++
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 3804687080..9558938866 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1182,6 +1182,7 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
     { "query-cpu-model-comparison", QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON },
     { "block-export-add", QEMU_CAPS_BLOCK_EXPORT_ADD },
     { "query-display-options", QEMU_CAPS_QUERY_DISPLAY_OPTIONS },
+    { "blockdev-reopen", QEMU_CAPS_BLOCKDEV_REOPEN },
 };
 
 struct virQEMUCapsStringFlags virQEMUCapsMigration[] = {
diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
index 62bc6bdf05..98b9c06cd1 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -216,7 +216,7 @@
     <vmcoreinfo supported='yes'/>
     <genid supported='yes'/>
     <backingStoreInput supported='yes'/>
-    <backup supported='no'/>
+    <backup supported='yes'/>
     <sev supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
index 69d5f7e404..a9b4011557 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -219,7 +219,7 @@
     <vmcoreinfo supported='yes'/>
     <genid supported='yes'/>
     <backingStoreInput supported='yes'/>
-    <backup supported='no'/>
+    <backup supported='yes'/>
     <sev supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index a21c131d41..91a845204b 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -216,7 +216,7 @@
     <vmcoreinfo supported='yes'/>
     <genid supported='yes'/>
     <backingStoreInput supported='yes'/>
-    <backup supported='no'/>
+    <backup supported='yes'/>
     <sev supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index f5ada48bf2..933b8eb2b5 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -206,6 +206,7 @@
   <flag name='dbus-vmstate'/>
   <flag name='vhost-user-gpu'/>
   <flag name='vhost-user-vga'/>
+  <flag name='incremental-backup'/>
   <flag name='ramfb'/>
   <flag name='blockdev-file-dynamic-auto-read-only'/>
   <flag name='savevm-monitor-nodes'/>
@@ -217,6 +218,7 @@
   <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='storage.werror'/>
   <flag name='fsdev.multidevs'/>
   <flag name='virtio.packed'/>