qemu: add QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE capability

To support virtio-blk queue-size option, this commit adds capability detection to the option. Signed-off-by: Hiroki Narukawa <hnarukaw@yahoo-corp.jp> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
2024-12-23 21:34:54 +03:00 · 2021-09-09 12:34:47 +09:00 · 2021-09-09 12:34:47 +09:00 · ad209e7dbc
commit ad209e7dbc
parent 36560f3551
36 changed files with 37 additions and 0 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -638,6 +638,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              "query-display-options", /* QEMU_CAPS_QUERY_DISPLAY_OPTIONS */
              "s390-pv-guest", /* QEMU_CAPS_S390_PV_GUEST */
              "set-action", /* QEMU_CAPS_SET_ACTION */
+              "virtio-blk.queue-size", /* QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE */
    );


@ -1397,6 +1398,7 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[] = {
    { "scsi", QEMU_CAPS_VIRTIO_BLK_SCSI, virQEMUCapsDevicePropsVirtioBlkSCSIDefault },
    { "logical_block_size", QEMU_CAPS_BLOCKIO, NULL },
    { "num-queues", QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES, NULL },
+    { "queue-size", QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE, NULL },
    { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL },
    { "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, NULL },
    { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, NULL },
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -618,6 +618,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    QEMU_CAPS_QUERY_DISPLAY_OPTIONS, /* 'query-display-options' qmp command present */
    QEMU_CAPS_S390_PV_GUEST, /* -object s390-pv-guest,... */
    QEMU_CAPS_SET_ACTION, /* 'set-action' QMP command */
+    QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE, /* virtio-blk-*.queue-size */

    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
@ -158,6 +158,7 @@
  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='virtio-blk.queue-size'/>
  <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
@ -157,6 +157,7 @@
  <flag name='cpu-max'/>
  <flag name='vnc-opts'/>
  <flag name='input-linux'/>
+  <flag name='virtio-blk.queue-size'/>
  <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
@ -122,6 +122,7 @@
  <flag name='vhost-user-blk'/>
  <flag name='vnc-opts'/>
  <flag name='input-linux'/>
+  <flag name='virtio-blk.queue-size'/>
  <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
@ -200,6 +200,7 @@
  <flag name='cpu-max'/>
  <flag name='vnc-opts'/>
  <flag name='input-linux'/>
+  <flag name='virtio-blk.queue-size'/>
  <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
@ -159,6 +159,7 @@
  <flag name='cpu-max'/>
  <flag name='vnc-opts'/>
  <flag name='input-linux'/>
+  <flag name='virtio-blk.queue-size'/>
  <version>2012050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900239</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@ -125,6 +125,7 @@
  <flag name='vhost-user-blk'/>
  <flag name='vnc-opts'/>
  <flag name='input-linux'/>
+  <flag name='virtio-blk.queue-size'/>
  <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
@ -206,6 +206,7 @@
  <flag name='cpu-max'/>
  <flag name='vnc-opts'/>
  <flag name='input-linux'/>
+  <flag name='virtio-blk.queue-size'/>
  <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
@ -164,6 +164,7 @@
  <flag name='cpu-max'/>
  <flag name='vnc-opts'/>
  <flag name='input-linux'/>
+  <flag name='virtio-blk.queue-size'/>
  <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
@ -210,6 +210,7 @@
  <flag name='vnc-opts'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
+  <flag name='virtio-blk.queue-size'/>
  <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
@ -174,6 +174,7 @@
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
+  <flag name='virtio-blk.queue-size'/>
  <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
@ -181,6 +181,7 @@
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
+  <flag name='virtio-blk.queue-size'/>
  <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
@ -173,6 +173,7 @@
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
+  <flag name='virtio-blk.queue-size'/>
  <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
@ -173,6 +173,7 @@
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
+  <flag name='virtio-blk.queue-size'/>
  <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
@ -137,6 +137,7 @@
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
+  <flag name='virtio-blk.queue-size'/>
  <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
@ -218,6 +218,7 @@
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
+  <flag name='virtio-blk.queue-size'/>
  <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
@ -225,6 +225,7 @@
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
+  <flag name='virtio-blk.queue-size'/>
  <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
@ -189,6 +189,7 @@
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
+  <flag name='virtio-blk.queue-size'/>
  <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
@ -188,6 +188,7 @@
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
+  <flag name='virtio-blk.queue-size'/>
  <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
@ -150,6 +150,7 @@
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
+  <flag name='virtio-blk.queue-size'/>
  <version>4002000</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
@ -236,6 +236,7 @@
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
+  <flag name='virtio-blk.queue-size'/>
  <version>4002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -199,6 +199,7 @@
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
+  <flag name='virtio-blk.queue-size'/>
  <version>5000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700241</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -207,6 +207,7 @@
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
+  <flag name='virtio-blk.queue-size'/>
  <version>5000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900241</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -193,6 +193,7 @@
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
+  <flag name='virtio-blk.queue-size'/>
  <version>5000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -243,6 +243,7 @@
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
+  <flag name='virtio-blk.queue-size'/>
  <version>5000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100241</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@ -245,6 +245,7 @@
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
+  <flag name='virtio-blk.queue-size'/>
  <version>5001000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@ -203,6 +203,7 @@
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
+  <flag name='virtio-blk.queue-size'/>
  <version>5002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700243</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@ -209,6 +209,7 @@
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
+  <flag name='virtio-blk.queue-size'/>
  <version>5002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900243</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@ -195,6 +195,7 @@
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
+  <flag name='virtio-blk.queue-size'/>
  <version>5002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@ -157,6 +157,7 @@
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
+  <flag name='virtio-blk.queue-size'/>
  <version>5002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100243</microcodeVersion>
--- 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='rotation-rate'/>
  <flag name='input-linux'/>
  <flag name='query-display-options'/>
+  <flag name='virtio-blk.queue-size'/>
  <version>5002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100243</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@ -211,6 +211,7 @@
  <flag name='confidential-guest-support'/>
  <flag name='query-display-options'/>
  <flag name='set-action'/>
+  <flag name='virtio-blk.queue-size'/>
  <version>6000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@ -165,6 +165,7 @@
  <flag name='query-display-options'/>
  <flag name='s390-pv-guest'/>
  <flag name='set-action'/>
+  <flag name='virtio-blk.queue-size'/>
  <version>6000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -254,6 +254,7 @@
  <flag name='confidential-guest-support'/>
  <flag name='query-display-options'/>
  <flag name='set-action'/>
+  <flag name='virtio-blk.queue-size'/>
  <version>6000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@ -256,6 +256,7 @@
  <flag name='confidential-guest-support'/>
  <flag name='query-display-options'/>
  <flag name='set-action'/>
+  <flag name='virtio-blk.queue-size'/>
  <version>6001000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100243</microcodeVersion>