mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 17:34:18 +03:00
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>
This commit is contained in:
parent
36560f3551
commit
ad209e7dbc
@ -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 },
|
||||
|
@ -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;
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user