qemu_capabilities: Introduce QEMU_CAPS_DRIVE_NVME

This capability tracks if qemu is capable of: -drive file.driver=nvme The feature was added in QEMU's commit of v2.12.0-rc0~104^2~2. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Cole Robinson <crobinso@redhat.com>
2024-10-05 22:05:47 +00:00 · 2019-06-05 16:11:03 +02:00 · 2019-06-05 16:11:03 +02:00 · c4062d5620
commit c4062d5620
parent 284a12bae0
24 changed files with 25 additions and 0 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -552,6 +552,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              "arm-max-cpu",
              "blockdev-file-dynamic-auto-read-only",
              "savevm-monitor-nodes",
+              "drive-nvme",
    );


@ -1399,6 +1400,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
    { "blockdev-add/arg-type/+file/drop-cache", QEMU_CAPS_MIGRATION_FILE_DROP_CACHE },
    { "blockdev-add/arg-type/+file/$dynamic-auto-read-only", QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC },
    { "human-monitor-command/$savevm-monitor-nodes", QEMU_CAPS_SAVEVM_MONITOR_NODES },
+    { "blockdev-add/arg-type/+nvme", QEMU_CAPS_DRIVE_NVME },
 };

 typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps;
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -533,6 +533,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    QEMU_CAPS_ARM_MAX_CPU, /* max-arm-cpu type exists */
    QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC, /* the auto-read-only property of block backends for files is dynamic */
    QEMU_CAPS_SAVEVM_MONITOR_NODES, /* 'savevm' handles monitor-owned nodes properly */
+    QEMU_CAPS_DRIVE_NVME, /* -drive file.driver=nvme */

    QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@ -154,6 +154,7 @@
  <flag name='iothread.poll-max-ns'/>
  <flag name='memory-backend-file.align'/>
  <flag name='arm-max-cpu'/>
+  <flag name='drive-nvme'/>
  <version>2012000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700289</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@ -151,6 +151,7 @@
  <flag name='memory-backend-memfd.hugetlb'/>
  <flag name='iothread.poll-max-ns'/>
  <flag name='memory-backend-file.align'/>
+  <flag name='drive-nvme'/>
  <version>2011090</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900289</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@ -123,6 +123,7 @@
  <flag name='memory-backend-file.align'/>
  <flag name='query-cpu-model-baseline'/>
  <flag name='query-cpu-model-comparison'/>
+  <flag name='drive-nvme'/>
  <version>2012000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100289</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@ -195,6 +195,7 @@
  <flag name='iothread.poll-max-ns'/>
  <flag name='memory-backend-file.align'/>
  <flag name='x86-max-cpu'/>
+  <flag name='drive-nvme'/>
  <version>2011090</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100289</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@ -153,6 +153,7 @@
  <flag name='memory-backend-file.align'/>
  <flag name='bochs-display'/>
  <flag name='ramfb'/>
+  <flag name='drive-nvme'/>
  <version>2012050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900239</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@ -93,6 +93,7 @@
  <flag name='iothread.poll-max-ns'/>
  <flag name='memory-backend-file.align'/>
  <flag name='ramfb'/>
+  <flag name='drive-nvme'/>
  <version>3000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@ -93,6 +93,7 @@
  <flag name='iothread.poll-max-ns'/>
  <flag name='memory-backend-file.align'/>
  <flag name='ramfb'/>
+  <flag name='drive-nvme'/>
  <version>3000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@ -126,6 +126,7 @@
  <flag name='query-cpu-model-baseline'/>
  <flag name='query-cpu-model-comparison'/>
  <flag name='ramfb'/>
+  <flag name='drive-nvme'/>
  <version>3000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100239</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@ -200,6 +200,7 @@
  <flag name='x86-max-cpu'/>
  <flag name='bochs-display'/>
  <flag name='ramfb'/>
+  <flag name='drive-nvme'/>
  <version>3000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100239</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@ -157,6 +157,7 @@
  <flag name='memory-backend-file.pmem'/>
  <flag name='overcommit'/>
  <flag name='bochs-display'/>
+  <flag name='drive-nvme'/>
  <version>3000091</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@ -203,6 +203,7 @@
  <flag name='x86-max-cpu'/>
  <flag name='bochs-display'/>
  <flag name='ramfb'/>
+  <flag name='drive-nvme'/>
  <version>3000092</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@ -167,6 +167,7 @@
  <flag name='migration-file-drop-cache'/>
  <flag name='ramfb'/>
  <flag name='arm-max-cpu'/>
+  <flag name='drive-nvme'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@ -171,6 +171,7 @@
  <flag name='bochs-display'/>
  <flag name='migration-file-drop-cache'/>
  <flag name='machine.pseries.cap-ccf-assist'/>
+  <flag name='drive-nvme'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@ -168,6 +168,7 @@
  <flag name='nbd-bitmap'/>
  <flag name='bochs-display'/>
  <flag name='migration-file-drop-cache'/>
+  <flag name='drive-nvme'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@ -168,6 +168,7 @@
  <flag name='nbd-bitmap'/>
  <flag name='bochs-display'/>
  <flag name='migration-file-drop-cache'/>
+  <flag name='drive-nvme'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@ -134,6 +134,7 @@
  <flag name='migration-file-drop-cache'/>
  <flag name='query-cpu-model-baseline'/>
  <flag name='query-cpu-model-comparison'/>
+  <flag name='drive-nvme'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@ -208,6 +208,7 @@
  <flag name='bochs-display'/>
  <flag name='migration-file-drop-cache'/>
  <flag name='ramfb'/>
+  <flag name='drive-nvme'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@ -213,6 +213,7 @@
  <flag name='vhost-user-vga'/>
  <flag name='ramfb'/>
  <flag name='blockdev-file-dynamic-auto-read-only'/>
+  <flag name='drive-nvme'/>
  <version>4001000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100241</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -173,6 +173,7 @@
  <flag name='arm-max-cpu'/>
  <flag name='blockdev-file-dynamic-auto-read-only'/>
  <flag name='savevm-monitor-nodes'/>
+  <flag name='drive-nvme'/>
  <version>4001050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -174,6 +174,7 @@
  <flag name='vhost-user-vga'/>
  <flag name='machine.pseries.cap-ccf-assist'/>
  <flag name='blockdev-file-dynamic-auto-read-only'/>
+  <flag name='drive-nvme'/>
  <version>4001050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -133,6 +133,7 @@
  <flag name='query-cpu-model-baseline'/>
  <flag name='query-cpu-model-comparison'/>
  <flag name='blockdev-file-dynamic-auto-read-only'/>
+  <flag name='drive-nvme'/>
  <version>4001050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -216,6 +216,7 @@
  <flag name='ramfb'/>
  <flag name='blockdev-file-dynamic-auto-read-only'/>
  <flag name='savevm-monitor-nodes'/>
+  <flag name='drive-nvme'/>
  <version>4001092</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100242</microcodeVersion>