qemu: caps: Add capability for blockdev-add/blockdev-del

The capability also represents that 'blockdev-add' is functional. It's
necessary to detect it via presence of 'blockdev-del' since blockdev-add
did not have the unsupported 'x-blockdev-add' version previously and
thus would be marked as present even if we could not use it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>

src/qemu/qemu_capabilities.c

@@ -488,6 +488,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "sdl-gl",
               "screendump_device",
               "hda-output",
+              "blockdev-del",
     );
 
 
@@ -997,6 +998,7 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
     { "query-named-block-nodes", QEMU_CAPS_QUERY_NAMED_BLOCK_NODES },
     { "query-cpus-fast", QEMU_CAPS_QUERY_CPUS_FAST },
     { "qom-list-properties", QEMU_CAPS_QOM_LIST_PROPERTIES },
+    { "blockdev-del", QEMU_CAPS_BLOCKDEV_DEL },
 };
 
 struct virQEMUCapsStringFlags virQEMUCapsMigration[] = {

src/qemu/qemu_capabilities.h

@@ -472,6 +472,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_SDL_GL, /* -sdl gl */
     QEMU_CAPS_SCREENDUMP_DEVICE, /* screendump command accepts device & head */
     QEMU_CAPS_HDA_OUTPUT, /* -device hda-output */
+    QEMU_CAPS_BLOCKDEV_DEL, /* blockdev-del is supported */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;

tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml

@@ -157,6 +157,7 @@
   <flag name='nbd-tls'/>
   <flag name='sdl-gl'/>
   <flag name='hda-output'/>
+  <flag name='blockdev-del'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>303541</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml

@@ -156,6 +156,7 @@
   <flag name='nbd-tls'/>
   <flag name='sdl-gl'/>
   <flag name='hda-output'/>
+  <flag name='blockdev-del'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>382824</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml

@@ -117,6 +117,7 @@
   <flag name='nbd-tls'/>
   <flag name='virtual-css-bridge'/>
   <flag name='sdl-gl'/>
+  <flag name='blockdev-del'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>303434</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml

@@ -199,6 +199,7 @@
   <flag name='nbd-tls'/>
   <flag name='sdl-gl'/>
   <flag name='hda-output'/>
+  <flag name='blockdev-del'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>344938</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml

@@ -123,6 +123,7 @@
   <flag name='pr-manager-helper'/>
   <flag name='virtual-css-bridge'/>
   <flag name='sdl-gl'/>
+  <flag name='blockdev-del'/>
   <version>2011000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>342166</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml

@@ -165,6 +165,7 @@
   <flag name='sdl-gl'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
+  <flag name='blockdev-del'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>343099</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml

@@ -162,6 +162,7 @@
   <flag name='sdl-gl'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
+  <flag name='blockdev-del'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>419968</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml

@@ -129,6 +129,7 @@
   <flag name='vfio-ccw'/>
   <flag name='sdl-gl'/>
   <flag name='screendump_device'/>
+  <flag name='blockdev-del'/>
   <version>2012000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>371055</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml

@@ -203,6 +203,7 @@
   <flag name='sdl-gl'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
+  <flag name='blockdev-del'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>390813</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml

@@ -148,6 +148,7 @@
   <flag name='nbd-tls'/>
   <flag name='sdl-gl'/>
   <flag name='hda-output'/>
+  <flag name='blockdev-del'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>346538</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml

@@ -112,6 +112,7 @@
   <flag name='nbd-tls'/>
   <flag name='virtual-css-bridge'/>
   <flag name='sdl-gl'/>
+  <flag name='blockdev-del'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>265159</microcodeVersion>

tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml

@@ -194,6 +194,7 @@
   <flag name='nbd-tls'/>
   <flag name='sdl-gl'/>
   <flag name='hda-output'/>
+  <flag name='blockdev-del'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>320947</microcodeVersion>