]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: pvscsi: Add capability
authorChris Jester-Young <cky@cky.nz>
Wed, 13 May 2020 01:55:45 +0000 (21:55 -0400)
committerPeter Krempa <pkrempa@redhat.com>
Wed, 13 May 2020 07:30:20 +0000 (09:30 +0200)
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>
40 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.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.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.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

index 0e7db2643a81ad1ce47379af4b1288ec9ed9024f..7e711f22f8ec7a43bb576e35e9ceeae4739b796c 100644 (file)
@@ -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 },
 };
 
 
index db8bebe3dffb74324755fa16b5707f5232f694fa..6bfc7386e370d301f7ecc5ffdb2304a43e64d448 100644 (file)
@@ -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;
index 2ba184cddaafc67c52ffe1cb747abd9e2beae7a1..a4f6c3aa09269425125e9a8c8551295666510696 100644 (file)
@@ -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>
index fb160dfd4c61a60b105d13ae6c58eae7f96cdf48..9e5501bed96c6068196ee6b6fa0fe716c2e3e02a 100644 (file)
@@ -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>
index 732af17233d27679d6952ee4dd67311d680f1955..28eb61b38cb2c80c9a961fc008e79c4ec48c4a23 100644 (file)
@@ -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>
index 22b4817e4e55f6c9927efe42c9578433cad517e9..cfe79fef461fd76a9c1c38c19b4edd80d9bc1c04 100644 (file)
   <flag name='mch'/>
   <flag name='i8042'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>2001001</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100240</microcodeVersion>
index 8c2f8be55ddf00c769023c97abaee2031ab6e937..cfa1962e9819c0ec8a31211838066a5f17b6ec9d 100644 (file)
   <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>
index cec361b60cb9ee68435168b8f9c426892c74f65a..0eee26c3acccbdfa56fcc9512d519940ff70732f 100644 (file)
   <flag name='iothread.poll-max-ns'/>
   <flag name='i8042'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900287</microcodeVersion>
index 4a8bc4277821dec7ca027a07d2801373b9ec8d6c..205a0675db11a3204b84749756c9fc0a9802d947 100644 (file)
   <flag name='x86-max-cpu'/>
   <flag name='i8042'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100287</microcodeVersion>
index 03ba191bc2cdb25193c851fbc597b38b4e89ee67..15f59774f30d9833382d833512f02b0dc8b2d8e8 100644 (file)
   <flag name='x86-max-cpu'/>
   <flag name='i8042'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>2011000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100288</microcodeVersion>
index 025130c378fb0675455e1b6e5c30cb3c5fce612a..94a0344b1a7805ce48e005541439db2d925a0ce9 100644 (file)
   <flag name='arm-max-cpu'/>
   <flag name='drive-nvme'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>2012000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700289</microcodeVersion>
index 06ee1f4ec44e85a01d74e02eeadd32f9c8332061..3bf0e20c9b06194fc1f27c7318488c449e7294f9 100644 (file)
   <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>
index 3e86df890b26e1c340e30d132eaf00c715e47337..c24952554711d51e54f70503e636da33b886142f 100644 (file)
   <flag name='drive-nvme'/>
   <flag name='i8042'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100289</microcodeVersion>
index a11659d617a6d0d15028915678684c1e992d0408..6eebad8b034db1239823c042f3a6ce586d48ad5a 100644 (file)
   <flag name='mch'/>
   <flag name='i8042'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>2004000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>
index 432e3a5af40c31ba34f40e99e2ea87985b7242f1..662140e657ea86d3df6e683fe7d27d42aa449fa0 100644 (file)
   <flag name='mch'/>
   <flag name='i8042'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>2005000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
index 389f7af1d613035bb99801c52640e25acb85cbd2..f8f57a7eaa72585e03708c5d2996bdef37c5dfb7 100644 (file)
   <flag name='sdl-gl'/>
   <flag name='hda-output'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700244</microcodeVersion>
index cdf9450f4a4d9f8751d49e42aab7fa4611fe47a6..52592ad1389a069aa32b5a7f9bb3d90852a4034c 100644 (file)
   <flag name='hda-output'/>
   <flag name='i8042'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900244</microcodeVersion>
index 4b6b8404960620d6c6565283cfcfb1550b997c61..77297fff36c9e40b430e877767cdaaad25d6d5f2 100644 (file)
   <flag name='mch'/>
   <flag name='i8042'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>
index 1fa9a37102b4888c804aeaddc6a0c690f9ac24c2..e7d9808e28c83515400b1b4f31b363ae0e7143ea 100644 (file)
   <flag name='mch'/>
   <flag name='i8042'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>2007000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100245</microcodeVersion>
index 2847ad711f1e3c44a8c51a5d24f07a8bfbaf0acd..bfeb9c9b40a2ef2b6ca316fcc78accc7a0dc8d8c 100644 (file)
   <flag name='mch'/>
   <flag name='i8042'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>2008000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100246</microcodeVersion>
index 539b5e042d7540e8228106693272bb805caa3d1c..f32e233549d64005d7f74ac5b448660989b8a2e2 100644 (file)
   <flag name='iothread.poll-max-ns'/>
   <flag name='i8042'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900247</microcodeVersion>
index 765e469205b3e0c81761d5d2347e62612ca9411d..75e9905df7a268b83ac9a6f47b484f19090b6d00 100644 (file)
   <flag name='x86-max-cpu'/>
   <flag name='i8042'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100247</microcodeVersion>
index c9c2ac4a0b6b1a11938bcb3c0a22cd6aef434d06..a66008b0dede4c5a0f5d414c911436c0319d9eee 100644 (file)
   <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>
index 2f318640d8e488da9d7c34b99adf62cd6120ac7b..f5f1d5b466c4d5dc489faf6399fc5efe388e852a 100644 (file)
   <flag name='i8042'/>
   <flag name='storage.werror'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>3000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100239</microcodeVersion>
index 18fba375fb9730718869eedca33686abd954c2eb..ca9ff82e282673cb47309f8f8bc6b81ab5a3a0bd 100644 (file)
   <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>
index 6a05b3e719609fa78f8a8ff56b73df5232d510ed..11009a2f804b5c3db15402def09189772015f7df 100644 (file)
   <flag name='i8042'/>
   <flag name='storage.werror'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>3000092</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100240</microcodeVersion>
index 2e8460f82965eeec33c70935f2dc219ef2b550f2..c9199df2615cbef7a76d10187d145a582b5c4dc4 100644 (file)
   <flag name='drive-nvme'/>
   <flag name='storage.werror'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700240</microcodeVersion>
index 978fad0ba66f2e57128593d5d1ccefc19aaac0b8..f4294436a86bf6eb7bdd73a9c41d52c246bd83a4 100644 (file)
   <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>
index 4322ca3593878ab77dc3a9a8ba0800f922b91cde..f5c9d7f83e3457a4d339a406ca854d9d2f90f6c4 100644 (file)
   <flag name='drive-nvme'/>
   <flag name='storage.werror'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>
index 8df0e1eb792c1d83452a5ab9247bc90dfa6ce469..538ce225f8bc2251413fab09dd65280d52095cad 100644 (file)
   <flag name='drive-nvme'/>
   <flag name='storage.werror'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>
index 4285bec2bfe18f9effb7995fcc9e6bae80db12a8..9f45fe6359e3f18482cfcc4527eb7b369792caae 100644 (file)
   <flag name='i8042'/>
   <flag name='storage.werror'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100240</microcodeVersion>
index 1c960faa6cd948340e654c7542c5bcad4082449a..9ad50bc2b54ec1b6f803474b8f9f7c5ab0d17cfb 100644 (file)
   <flag name='i8042'/>
   <flag name='storage.werror'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>4001000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100241</microcodeVersion>
index 418b5937a07f5f001f326b3035432884005bc7df..7aca4fe02217fa77b44418e348640d937f4052f8 100644 (file)
   <flag name='fsdev.multidevs'/>
   <flag name='virtio.packed'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>4001050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700242</microcodeVersion>
index 796ed0a2bcc18a132bc5dc54a1e9de3d091cff09..a68786ddc89bcfa57e640794251b7138190549be 100644 (file)
   <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>
index 0d4d6e71d565251a068fbd426cfbae926dfaf50b..3935be48134382981f2218323fa7bcb4d4dbc502 100644 (file)
   <flag name='fsdev.multidevs'/>
   <flag name='virtio.packed'/>
   <flag name='tcg'/>
+  <flag name='pvscsi'/>
   <version>4002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>
index 618ad8ee14e52cd625e322a46de1a4005bb119ac..7649153cfdacd8d263dbdbb3e440f77e244a4368 100644 (file)
   <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>
index 0f5dce9264d1ee33c8fea3fd765b88b4f018e460..c8cc07d9547c897c41e83a2ae6f1d88bd184307a 100644 (file)
   <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>
index bc6a27e87e7338c0e62baa2d845c35cb3d8589e9..7a091d27dbff52d8c2ddece8060cb7eba4ae6212 100644 (file)
   <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>
index ed4c08e99ec19f10f8a65b07031c5f89793973b3..e28e87fd2344bf0b0675a3f8c1aadca5995ec910 100644 (file)
   <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>
index f7018daa84999818d4cf5b9a1c07c140471cb4c9..8c20b5fe5c4abf7b1743b535caf0b375a0b408a5 100644 (file)
   <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>