7:24 a.m.
From: Yi Min Zhao <zyimin(a)linux.ibm.com>
Let's introduce zPCI capability.
Signed-off-by: Yi Min Zhao <zyimin(a)linux.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com>
Reviewed-by: Stefan Zimmermann <stzi(a)linux.ibm.com>
Reviewed-by: Bjoern Walk <bwalk(a)linux.vnet.ibm.com>
---
src/qemu/qemu_capabilities.c | 2 ++
src/qemu/qemu_capabilities.h | 1 +
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 +
8 files changed, 9 insertions(+)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 8a63db5f4f..e6fd7ee468 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -489,6 +489,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"screendump_device",
"hda-output",
"blockdev-del",
+ "zpci",
);
@@ -1121,6 +1122,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
{ "virtual-css-bridge", QEMU_CAPS_CCW },
{ "vfio-ccw", QEMU_CAPS_DEVICE_VFIO_CCW },
{ "hda-output", QEMU_CAPS_HDA_OUTPUT },
+ { "zpci", QEMU_CAPS_DEVICE_ZPCI },
};
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 3e120e64c0..2610597929 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -473,6 +473,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
QEMU_CAPS_SCREENDUMP_DEVICE, /* screendump command accepts device & head */
QEMU_CAPS_HDA_OUTPUT, /* -device hda-output */
QEMU_CAPS_BLOCKDEV_DEL, /* blockdev-del is supported */
+ QEMU_CAPS_DEVICE_ZPCI, /* -device zpci */
QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags;
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index 68006c6fa0..89674f2625 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -118,6 +118,7 @@
<flag name='virtual-css-bridge'/>
<flag name='sdl-gl'/>
<flag name='blockdev-del'/>
+ <flag name='zpci'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>303434</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index cb11562e39..a1c5aae165 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -124,6 +124,7 @@
<flag name='virtual-css-bridge'/>
<flag name='sdl-gl'/>
<flag name='blockdev-del'/>
+ <flag name='zpci'/>
<version>2011000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>342166</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index df0f6e4eba..48df8d9e11 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -130,6 +130,7 @@
<flag name='sdl-gl'/>
<flag name='screendump_device'/>
<flag name='blockdev-del'/>
+ <flag name='zpci'/>
<version>2012000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>371055</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index 49b3cb2dfa..e8b3b034aa 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -107,6 +107,7 @@
<flag name='nbd-tls'/>
<flag name='virtual-css-bridge'/>
<flag name='sdl-gl'/>
+ <flag name='zpci'/>
<version>2007000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>216840</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index 985a4114c5..01cc0472f0 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -109,6 +109,7 @@
<flag name='nbd-tls'/>
<flag name='virtual-css-bridge'/>
<flag name='sdl-gl'/>
+ <flag name='zpci'/>
<version>2007093</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>241741</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index b216c69906..cd72530a6c 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -113,6 +113,7 @@
<flag name='virtual-css-bridge'/>
<flag name='sdl-gl'/>
<flag name='blockdev-del'/>
+ <flag name='zpci'/>
<version>2009000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>265159</microcodeVersion>
--
2.16.3