|
 |
c313de |
From 3ff9abfcfa6a79c47755a6e8d9da5b1bc4bdd655 Mon Sep 17 00:00:00 2001
|
|
|
c313de |
Message-Id: <3ff9abfcfa6a79c47755a6e8d9da5b1bc4bdd655@dist-git>
|
|
|
c313de |
From: Yi Min Zhao <zyimin@linux.ibm.com>
|
|
|
c313de |
Date: Mon, 8 Apr 2019 10:57:19 +0200
|
|
|
c313de |
Subject: [PATCH] qemu: Introduce zPCI capability
|
|
|
c313de |
MIME-Version: 1.0
|
|
|
c313de |
Content-Type: text/plain; charset=UTF-8
|
|
|
c313de |
Content-Transfer-Encoding: 8bit
|
|
|
c313de |
|
|
|
c313de |
Let's introduce zPCI capability.
|
|
|
c313de |
|
|
|
c313de |
Signed-off-by: Yi Min Zhao <zyimin@linux.ibm.com>
|
|
|
c313de |
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
|
|
|
c313de |
Reviewed-by: Stefan Zimmermann <stzi@linux.ibm.com>
|
|
|
c313de |
Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
|
|
|
c313de |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
c313de |
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
c313de |
|
|
|
c313de |
(cherry-picked from commit 29ad952f7e50bbbd920cbfb009a45b55fdb2f069)
|
|
|
c313de |
|
|
|
c313de |
https://bugzilla.redhat.com/show_bug.cgi?id=1508149
|
|
|
c313de |
|
|
|
c313de |
Conflicts:
|
|
|
c313de |
|
|
|
c313de |
* src/qemu/qemu_capabilities.c
|
|
|
c313de |
src/qemu/qemu_capabilities.h
|
|
|
c313de |
+ several capabilities have not been backported
|
|
|
c313de |
|
|
|
c313de |
Removed:
|
|
|
c313de |
|
|
|
c313de |
* tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
|
|
|
c313de |
+ the file does not exist at all downstream
|
|
|
c313de |
- missing d7434ae8009f
|
|
|
c313de |
|
|
|
c313de |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
c313de |
Message-Id: <20190408085732.28684-3-abologna@redhat.com>
|
|
|
c313de |
Reviewed-by: Laine Stump <laine@redhat.com>
|
|
|
c313de |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
c313de |
---
|
|
|
c313de |
src/qemu/qemu_capabilities.c | 2 ++
|
|
|
c313de |
src/qemu/qemu_capabilities.h | 1 +
|
|
|
c313de |
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 +
|
|
|
c313de |
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 +
|
|
|
c313de |
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 +
|
|
|
c313de |
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 +
|
|
|
c313de |
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 +
|
|
|
c313de |
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 +
|
|
|
c313de |
8 files changed, 9 insertions(+)
|
|
|
c313de |
|
|
|
c313de |
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
|
|
|
c313de |
index 0d6fa02560..8ca53abf2b 100644
|
|
|
c313de |
--- a/src/qemu/qemu_capabilities.c
|
|
|
c313de |
+++ b/src/qemu/qemu_capabilities.c
|
|
|
c313de |
@@ -512,6 +512,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
|
|
|
c313de |
/* 315 */
|
|
|
c313de |
"vfio-pci.display",
|
|
|
c313de |
"vfio-ap",
|
|
|
c313de |
+ "zpci",
|
|
|
c313de |
"machine.pseries.cap-nested-hv",
|
|
|
c313de |
);
|
|
|
c313de |
|
|
|
c313de |
@@ -1153,6 +1154,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
|
|
|
c313de |
{ "mch", QEMU_CAPS_DEVICE_MCH },
|
|
|
c313de |
{ "sev-guest", QEMU_CAPS_SEV_GUEST },
|
|
|
c313de |
{ "vfio-ap", QEMU_CAPS_DEVICE_VFIO_AP },
|
|
|
c313de |
+ { "zpci", QEMU_CAPS_DEVICE_ZPCI },
|
|
|
c313de |
};
|
|
|
c313de |
|
|
|
c313de |
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = {
|
|
|
c313de |
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
|
|
|
c313de |
index 9550df2cd5..bea4767f3c 100644
|
|
|
c313de |
--- a/src/qemu/qemu_capabilities.h
|
|
|
c313de |
+++ b/src/qemu/qemu_capabilities.h
|
|
|
c313de |
@@ -492,6 +492,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
|
|
|
c313de |
/* 315 */
|
|
|
c313de |
QEMU_CAPS_VFIO_PCI_DISPLAY, /* -device vfio-pci.display */
|
|
|
c313de |
QEMU_CAPS_DEVICE_VFIO_AP, /* -device vfio-ap */
|
|
|
c313de |
+ QEMU_CAPS_DEVICE_ZPCI, /* -device zpci */
|
|
|
c313de |
QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV, /* -machine pseries.cap-nested-hv */
|
|
|
c313de |
|
|
|
c313de |
QEMU_CAPS_LAST /* this must always be the last item */
|
|
|
c313de |
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
|
|
|
c313de |
index 7347f5683f..b46efe880d 100644
|
|
|
c313de |
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
|
|
|
c313de |
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
|
|
|
c313de |
@@ -120,6 +120,7 @@
|
|
|
c313de |
<flag name='blockdev-del'/>
|
|
|
c313de |
<flag name='vhost-vsock'/>
|
|
|
c313de |
<flag name='egl-headless'/>
|
|
|
c313de |
+ <flag name='zpci'/>
|
|
|
c313de |
<version>2010000</version>
|
|
|
c313de |
<kvmVersion>0</kvmVersion>
|
|
|
c313de |
<microcodeVersion>307899</microcodeVersion>
|
|
|
c313de |
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
|
|
|
c313de |
index b359f9a049..3ac1fc941c 100644
|
|
|
c313de |
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
|
|
|
c313de |
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
|
|
|
c313de |
@@ -127,6 +127,7 @@
|
|
|
c313de |
<flag name='vhost-vsock'/>
|
|
|
c313de |
<flag name='tpm-emulator'/>
|
|
|
c313de |
<flag name='egl-headless'/>
|
|
|
c313de |
+ <flag name='zpci'/>
|
|
|
c313de |
<version>2011000</version>
|
|
|
c313de |
<kvmVersion>0</kvmVersion>
|
|
|
c313de |
<microcodeVersion>346751</microcodeVersion>
|
|
|
c313de |
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
|
|
|
c313de |
index 7121da27a0..184f115fe4 100644
|
|
|
c313de |
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
|
|
|
c313de |
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
|
|
|
c313de |
@@ -135,6 +135,7 @@
|
|
|
c313de |
<flag name='tpm-emulator'/>
|
|
|
c313de |
<flag name='egl-headless'/>
|
|
|
c313de |
<flag name='vfio-pci.display'/>
|
|
|
c313de |
+ <flag name='zpci'/>
|
|
|
c313de |
<version>2012000</version>
|
|
|
c313de |
<kvmVersion>0</kvmVersion>
|
|
|
c313de |
<microcodeVersion>375999</microcodeVersion>
|
|
|
c313de |
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
|
|
|
c313de |
index 9ed25178f8..b04a9fbfd5 100644
|
|
|
c313de |
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
|
|
|
c313de |
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
|
|
|
c313de |
@@ -107,6 +107,7 @@
|
|
|
c313de |
<flag name='nbd-tls'/>
|
|
|
c313de |
<flag name='virtual-css-bridge'/>
|
|
|
c313de |
<flag name='sdl-gl'/>
|
|
|
c313de |
+ <flag name='zpci'/>
|
|
|
c313de |
<version>2007000</version>
|
|
|
c313de |
<kvmVersion>0</kvmVersion>
|
|
|
c313de |
<microcodeVersion>220792</microcodeVersion>
|
|
|
c313de |
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
|
|
|
c313de |
index 646239ff25..b2b267be8d 100644
|
|
|
c313de |
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
|
|
|
c313de |
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
|
|
|
c313de |
@@ -110,6 +110,7 @@
|
|
|
c313de |
<flag name='virtual-css-bridge'/>
|
|
|
c313de |
<flag name='sdl-gl'/>
|
|
|
c313de |
<flag name='vhost-vsock'/>
|
|
|
c313de |
+ <flag name='zpci'/>
|
|
|
c313de |
<version>2007093</version>
|
|
|
c313de |
<kvmVersion>0</kvmVersion>
|
|
|
c313de |
<microcodeVersion>246206</microcodeVersion>
|
|
|
c313de |
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
|
|
|
c313de |
index 09d68e1f18..f908ab88f3 100644
|
|
|
c313de |
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
|
|
|
c313de |
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
|
|
|
c313de |
@@ -114,6 +114,7 @@
|
|
|
c313de |
<flag name='sdl-gl'/>
|
|
|
c313de |
<flag name='blockdev-del'/>
|
|
|
c313de |
<flag name='vhost-vsock'/>
|
|
|
c313de |
+ <flag name='zpci'/>
|
|
|
c313de |
<version>2009000</version>
|
|
|
c313de |
<kvmVersion>0</kvmVersion>
|
|
|
c313de |
<microcodeVersion>269625</microcodeVersion>
|
|
|
c313de |
--
|
|
|
c313de |
2.22.0
|
|
|
c313de |
|