]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: add QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE capability
authorHiroki Narukawa <hnarukaw@yahoo-corp.jp>
Thu, 9 Sep 2021 03:34:47 +0000 (12:34 +0900)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 21 Sep 2021 10:22:49 +0000 (12:22 +0200)
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>
36 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml

index f27a621f8cf8e1b7b9708bc354fe428c7ffa70dd..3c04e9fb250a3307cf776ea2d7ba9d0a6a6f3439 100644 (file)
@@ -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 },
index f3379f556c91206b9df946faafed7bcdfdf7fcc7..4e8a4b6eae28d8f959a600cfa213fcc68813514d 100644 (file)
@@ -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;
index 3cd71919bc8a53efb80c620d077886180a0a07f3..4c7208d641e8416db0c8b395631e2c1166dc7227 100644 (file)
   <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>
index 2081592b51dba8dae0d72804f218893ee79f305b..2b6e7e71355a94b5ae5f1e1cbf863ab407944af8 100644 (file)
   <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>
index deabb614bafc73a09042f6aefc11c91736271dc6..05bd930e6429e56fcdddc889664c6dd78647dde1 100644 (file)
   <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>
index d74dc5ebd5149b9d88eff387331a6937edae0c69..ea9ed17e09b6d22ceb610c368127eff802794fb4 100644 (file)
   <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>
index 19af15c3458e29472f48cc49af96e27dd6a7e44e..ddb52837c9a4c075951c14ae5c36a9a03470c396 100644 (file)
   <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>
index 8e90d32de9005a77b9d25dbdd71cd26a795f4543..a573d88160cc56cad5398e056eae221d7a06ec6a 100644 (file)
   <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>
index 2cc3c1182089fb70e3e9b94447aa60cdbf2dbabb..b3c564e0b9aaacea6ec6539952ae6e122348e5ad 100644 (file)
   <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>
index 9c217263ca8be829d942780f083f364d463693c2..f384a7b9dbecf713072f8c7e9059b90b64c99e22 100644 (file)
   <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>
index bcc4c44d285bef1e1751f6166e62e557f13704cf..54a17f140b46658bde89ea61cc1e207d35c63b80 100644 (file)
   <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>
index efb891fa01c609eb83f53ca0fb7335d2306bfcfc..7b2f6c2f281322447eab14c62beb4a56c3cce55f 100644 (file)
   <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>
index 1e2b7c7fe6d5aafb90f13096df4d241a88c61e54..2107136a5db7eee7230d22dd7567414645778c1e 100644 (file)
   <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>
index 5872ecd491510de02f28f11e11bf92dabed368b5..9ec5904595cb4884deb1a166c0227f190f5b7a89 100644 (file)
   <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>
index bb76faae2b9afb457ac3cf522b23eb6a737f3193..d2d13be1293bddf82320550778cb64263405f445 100644 (file)
   <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>
index 51074b4f3775977229b0d28ab2061be5a2cb1133..9a5cc1fcc7ef3839f78c886fa38c19ecac8feb8a 100644 (file)
   <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>
index e999d7574cdaac94a51be3edf228f8007fd401c3..584d2f7aea74bbeefc8a177f11781dcea9e30198 100644 (file)
   <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>
index 80c3e3cbed5906b50426f6e5133dd89dcc973c2f..27eb5531bd6e340f0821e23e9d37c3c06923b273 100644 (file)
   <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>
index 8116624181565c26f69a748b94d2eb5603deb37c..600e4a5649b80177727f80ded17abcbba6f0f93e 100644 (file)
   <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>
index d37c9b342644f674ad04615c9a728a89437f7502..68318e2eaa23c7593183a8fe13b1532dec070554 100644 (file)
   <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>
index 258e382232ec6c566b6142cd483b106bbdcffe8f..5b3467d22cc0a54bb224ff3be19fd4361d1e571a 100644 (file)
   <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>
index 99f9375c049af6f4863c6803600972b590a821f3..193e401b20fa40100381d2e481d95a5e1f9c7be9 100644 (file)
   <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>
index 4ce824454073fc3f6469a6887f98562ce02a6097..826b398bd8386570a44f8cbafb6b73f5ed2bdc47 100644 (file)
   <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>
index 07e00008ee0cf9d0ff9127ec28d1ec945e96cf68..0365998fc77b3d8fb8aff4ba66067b955637edc6 100644 (file)
   <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>
index 1bbb9b98cd7d23d1eb9741b24a13fe04f99c83f1..fe09a6868af8905032f72f5074123c2af047778b 100644 (file)
   <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>
index 03fc7d41069104c5a881b84a65c4810322f794ce..aa3e922098955c2407ff69dd9da67d084ce39b00 100644 (file)
   <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>
index fc0b502ef9c49756b1a8904334e09854798dd2a3..a40a506f5c8217039c829b6e96eab03f0e51a1ea 100644 (file)
   <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>
index 4e31d8245e425fb7f39df3eb635333be3c9696b2..fc0fd3f5ec6f1a58918a40368ae8363d5f405ad9 100644 (file)
   <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>
index ac813648578607b10c613976681084175d5e0088..ea5c58a8c117bfa7612ed42a02c432e43071dcbf 100644 (file)
   <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>
index 21a1a5c3dde52e01ac322419f473e89bc032bf30..a23b4320374a5cf216eb49753e0708d6c40d174a 100644 (file)
   <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>
index 13caca96266dc6aac9c9a6b9e0fee458521c67ac..0dba47beedd9d48a48dc18700e68ff76cd96e4ee 100644 (file)
   <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>
index cb1226fc04b8867bc1d2a3d25455ac153394d947..4973b083782653340048cb81aa861406db352c2f 100644 (file)
   <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>
index dcc41ed0676e999a7b63684e0efbe17082e675c0..acf2a6bbdc52ee0d6de508cf870d3c3fee6b801b 100644 (file)
   <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>
index ebcca6e114b56ec5913b01536ed99ee8924fa8d2..c704f0085cf44ad681cae53ff58338012f5be732 100644 (file)
   <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>
index d03b8aa7265af52f6849cf3b11b16135f2166752..5c0391af34e41d6a1212a97e661a99c92561ad76 100644 (file)
   <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>
index 8239f4266a81864d971b85e60561db778a5f6042..9446fa274f190789f96a571deebfd8c958580300 100644 (file)
   <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>