qemu: pvscsi: Add capability

This capability flags support for `-device pvscsi`, which provides the VMware paravirtual SCSI controller. Signed-off-by: Chris Jester-Young <cky@cky.nz> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
2025-03-20 07:59:00 +00:00 · 2020-05-12 21:55:45 -04:00 · 2020-05-12 21:55:45 -04:00 · 1ca9b8ff9d
commit 1ca9b8ff9d
parent 65a12c467c
40 changed files with 41 additions and 0 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -581,6 +581,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              "machine.pseries.cap-ibs",
              "tcg",
              "virtio-blk-pci.scsi.default.disabled",
+              "pvscsi",
    );


@ -1302,6 +1303,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
    { "tpm-spapr", QEMU_CAPS_DEVICE_TPM_SPAPR },
    { "vhost-user-fs-device", QEMU_CAPS_DEVICE_VHOST_USER_FS },
    { "tcg-accel", QEMU_CAPS_TCG },
+    { "pvscsi", QEMU_CAPS_SCSI_PVSCSI },
 };


--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -562,6 +562,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    QEMU_CAPS_MACHINE_PSERIES_CAP_IBS, /* -machine pseries.cap-ibs */
    QEMU_CAPS_TCG, /* QEMU does support TCG */
    QEMU_CAPS_VIRTIO_BLK_SCSI_DEFAULT_DISABLED, /* virtio-blk-pci.scsi disabled by default */
+    QEMU_CAPS_SCSI_PVSCSI, /* -device pvscsi */

    QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@ -86,6 +86,7 @@
  <flag name='mch'/>
  <flag name='i8042'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <version>1005003</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100245</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@ -91,6 +91,7 @@
  <flag name='mch'/>
  <flag name='i8042'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <version>1006000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100243</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@ -93,6 +93,7 @@
  <flag name='mch'/>
  <flag name='i8042'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <version>1007000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100244</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@ -109,6 +109,7 @@
  <flag name='mch'/>
  <flag name='i8042'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <version>2001001</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@ -141,6 +141,7 @@
  <flag name='egl-headless'/>
  <flag name='iothread.poll-max-ns'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <version>2010000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700287</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@ -141,6 +141,7 @@
  <flag name='iothread.poll-max-ns'/>
  <flag name='i8042'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <version>2010000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900287</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@ -184,6 +184,7 @@
  <flag name='x86-max-cpu'/>
  <flag name='i8042'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <version>2010000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100287</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@ -190,6 +190,7 @@
  <flag name='x86-max-cpu'/>
  <flag name='i8042'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <version>2011000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100288</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@ -157,6 +157,7 @@
  <flag name='arm-max-cpu'/>
  <flag name='drive-nvme'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <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
@ -158,6 +158,7 @@
  <flag name='machine.pseries.cap-sbbc'/>
  <flag name='machine.pseries.cap-ibs'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <version>2011090</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900289</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@ -199,6 +199,7 @@
  <flag name='drive-nvme'/>
  <flag name='i8042'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <version>2011090</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100289</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@ -135,6 +135,7 @@
  <flag name='mch'/>
  <flag name='i8042'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <version>2004000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@ -141,6 +141,7 @@
  <flag name='mch'/>
  <flag name='i8042'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <version>2005000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100243</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@ -124,6 +124,7 @@
  <flag name='sdl-gl'/>
  <flag name='hda-output'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <version>2006000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700244</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@ -120,6 +120,7 @@
  <flag name='hda-output'/>
  <flag name='i8042'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <version>2006000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900244</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@ -153,6 +153,7 @@
  <flag name='mch'/>
  <flag name='i8042'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <version>2006000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100244</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@ -158,6 +158,7 @@
  <flag name='mch'/>
  <flag name='i8042'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <version>2007000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100245</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@ -161,6 +161,7 @@
  <flag name='mch'/>
  <flag name='i8042'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <version>2008000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100246</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@ -133,6 +133,7 @@
  <flag name='iothread.poll-max-ns'/>
  <flag name='i8042'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <version>2009000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900247</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@ -178,6 +178,7 @@
  <flag name='x86-max-cpu'/>
  <flag name='i8042'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <version>2009000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100247</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@ -160,6 +160,7 @@
  <flag name='machine.pseries.cap-sbbc'/>
  <flag name='machine.pseries.cap-ibs'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <version>2012050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900239</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@ -205,6 +205,7 @@
  <flag name='i8042'/>
  <flag name='storage.werror'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <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
@ -165,6 +165,7 @@
  <flag name='machine.pseries.cap-sbbc'/>
  <flag name='machine.pseries.cap-ibs'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <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
@ -208,6 +208,7 @@
  <flag name='i8042'/>
  <flag name='storage.werror'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <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
@ -171,6 +171,7 @@
  <flag name='drive-nvme'/>
  <flag name='storage.werror'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <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
@ -179,6 +179,7 @@
  <flag name='machine.pseries.cap-sbbc'/>
  <flag name='machine.pseries.cap-ibs'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <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
@ -172,6 +172,7 @@
  <flag name='drive-nvme'/>
  <flag name='storage.werror'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <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
@ -172,6 +172,7 @@
  <flag name='drive-nvme'/>
  <flag name='storage.werror'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@ -213,6 +213,7 @@
  <flag name='i8042'/>
  <flag name='storage.werror'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <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
@ -219,6 +219,7 @@
  <flag name='i8042'/>
  <flag name='storage.werror'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <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
@ -183,6 +183,7 @@
  <flag name='fsdev.multidevs'/>
  <flag name='virtio.packed'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <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
@ -184,6 +184,7 @@
  <flag name='machine.pseries.cap-sbbc'/>
  <flag name='machine.pseries.cap-ibs'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <version>4001050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -227,6 +227,7 @@
  <flag name='fsdev.multidevs'/>
  <flag name='virtio.packed'/>
  <flag name='tcg'/>
+  <flag name='pvscsi'/>
  <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
@ -192,6 +192,7 @@
  <flag name='pcie-root-port.hotplug'/>
  <flag name='tcg'/>
  <flag name='virtio-blk-pci.scsi.default.disabled'/>
+  <flag name='pvscsi'/>
  <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
@ -200,6 +200,7 @@
  <flag name='machine.pseries.cap-ibs'/>
  <flag name='tcg'/>
  <flag name='virtio-blk-pci.scsi.default.disabled'/>
+  <flag name='pvscsi'/>
  <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
@ -188,6 +188,7 @@
  <flag name='aio.io_uring'/>
  <flag name='tcg'/>
  <flag name='virtio-blk-pci.scsi.default.disabled'/>
+  <flag name='pvscsi'/>
  <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
@ -233,6 +233,7 @@
  <flag name='aio.io_uring'/>
  <flag name='tcg'/>
  <flag name='virtio-blk-pci.scsi.default.disabled'/>
+  <flag name='pvscsi'/>
  <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
@ -233,6 +233,7 @@
  <flag name='aio.io_uring'/>
  <flag name='tcg'/>
  <flag name='virtio-blk-pci.scsi.default.disabled'/>
+  <flag name='pvscsi'/>
  <version>5000050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100242</microcodeVersion>