[PATCH 27/33] qemu: introduce QEMU_CAPS_DEVICE_PNV_PHB4_ROOT_PORT

Daniel Henrique Barboza danielhb413 at gmail.com
Thu Jan 20 13:52:30 UTC 2022


The pnv-phb4-root-port device is the pcie-root-port for PowerNV9
domains.

Aside from being usable only by the 'powernv9' machine to connect into
the soon to be added 'pnv-phb4' host bridges, its usage and semantics are
similar to what was introduced with the pnv-phb3-root-port support.

Signed-off-by: Daniel Henrique Barboza <danielhb413 at gmail.com>
---
 src/qemu/qemu_capabilities.c                    | 2 ++
 src/qemu/qemu_capabilities.h                    | 1 +
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 +
 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 +
 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 +
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 +
 6 files changed, 7 insertions(+)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index a1012d4795..c049dda627 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -659,6 +659,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "device.json+hotplug", /* QEMU_CAPS_DEVICE_JSON */
               "pnv-phb3-root-port", /* QEMU_CAPS_DEVICE_PNV_PHB3_ROOT_PORT */
               "pnv-phb3", /* QEMU_CAPS_DEVICE_PNV_PHB3 */
+              "pnv-phb4-root-port", /* QEMU_CAPS_DEVICE_PNV_PHB4_ROOT_PORT */
     );
 
 
@@ -1360,6 +1361,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
     { "virtio-mem-pci", QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI },
     { "pnv-phb3-root-port", QEMU_CAPS_DEVICE_PNV_PHB3_ROOT_PORT },
     { "pnv-phb3", QEMU_CAPS_DEVICE_PNV_PHB3 },
+    { "pnv-phb4-root-port", QEMU_CAPS_DEVICE_PNV_PHB4_ROOT_PORT },
 };
 
 
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 0d76db484b..d7bf211723 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -638,6 +638,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_DEVICE_JSON, /* -device accepts JSON (and works with hot-unplug) */
     QEMU_CAPS_DEVICE_PNV_PHB3_ROOT_PORT, /* -device pnv-phb3-root-port */
     QEMU_CAPS_DEVICE_PNV_PHB3, /* -device pnv-phb3 */
+    QEMU_CAPS_DEVICE_PNV_PHB4_ROOT_PORT, /* -device pnv-phb3-root-port */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 809999734e..047ed74bed 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -188,6 +188,7 @@
   <flag name='virtio-blk.queue-size'/>
   <flag name='pnv-phb3-root-port'/>
   <flag name='pnv-phb3'/>
+  <flag name='pnv-phb4-root-port'/>
   <version>5000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900241</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index dc055245ff..22725f1eea 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -191,6 +191,7 @@
   <flag name='query-dirty-rate'/>
   <flag name='pnv-phb3-root-port'/>
   <flag name='pnv-phb3'/>
+  <flag name='pnv-phb4-root-port'/>
   <version>5002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index dc9fce3a49..c4ab974141 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -200,6 +200,7 @@
   <flag name='rbd-encryption'/>
   <flag name='pnv-phb3-root-port'/>
   <flag name='pnv-phb3'/>
+  <flag name='pnv-phb4-root-port'/>
   <version>6001050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900244</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 1f622d1372..2be5786f4e 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -202,6 +202,7 @@
   <flag name='device.json+hotplug'/>
   <flag name='pnv-phb3-root-port'/>
   <flag name='pnv-phb3'/>
+  <flag name='pnv-phb4-root-port'/>
   <version>6002050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900243</microcodeVersion>
-- 
2.34.1




More information about the libvir-list mailing list