On 05/07/2018 10:41 AM, Boris Fiuczynski wrote:
From: Shalini Chellathurai Saroja <shalini(a)linux.vnet.ibm.com>
Let us introduce the capability vfio-ccw for supporting the basic
channel I/O passthrough, which have been introduced in QEMU 2.10. The
current focus is to support dasd-eckd (cu_type/dev_type = 0x3990/0x3390)
as the target device.
Let us also introduce the capability QEMU_CAPS_CCW_CSSID_UNRESTRICTED
for virtual-css-bridge. This capability is based on the
cssid-unrestricted property which exists if QEMU no longer enforces
cssid restrictions based on ccw device types.
Vfio-ccw capability is dependent on the hidden virtual-css-bridge, so
that we are able to probe for the cssid-unrestriced property to make
sure the devices are visible to non-mcss-e enabled guests.
Signed-off-by: Shalini Chellathurai Saroja <shalini(a)linux.vnet.ibm.com>
Reviewed-by: Bjoern Walk <bwalk(a)linux.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com>
---
src/qemu/qemu_capabilities.c | 14 ++++++++++
src/qemu/qemu_capabilities.h | 4 +++
.../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 28 ++++++++++++-------
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 +-
.../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 28 ++++++++++++-------
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 +-
.../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 31 ++++++++++++++++------
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 3 +++
.../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 24 ++++++++++++-----
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +-
.../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 28 ++++++++++++-------
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +-
.../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 28 ++++++++++++-------
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +-
14 files changed, 142 insertions(+), 56 deletions(-)
Adding vfio-ccw to patch 1 causes a merge conflict here, easily resolved...
diff --git a/src/qemu/qemu_capabilities.c
b/src/qemu/qemu_capabilities.c
index ae3d2a6..b2e1fab 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -476,6 +476,10 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"nbd-tls",
"tpm-crb",
"virtual-css-bridge",
+
+ /* 295 */
+ "virtual-css-bridge.cssid-unrestricted",
+ "vfio-ccw",
);
Please don't switch the order... At least it'd be within the same
release, but order is important.
The qemu_capabilities.h has the same issue and you'll need to regenerate
the caps output file.
With those,
Reviewed-by: John Ferlan <jferlan(a)redhat.com>
John
[...]