From 3ff9abfcfa6a79c47755a6e8d9da5b1bc4bdd655 Mon Sep 17 00:00:00 2001

Message-Id: <3ff9abfcfa6a79c47755a6e8d9da5b1bc4bdd655@dist-git>

From: Yi Min Zhao <zyimin@linux.ibm.com>

Date: Mon, 8 Apr 2019 10:57:19 +0200

Subject: [PATCH] qemu: Introduce zPCI capability

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Let's introduce zPCI capability.

Signed-off-by: Yi Min Zhao <zyimin@linux.ibm.com>

Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>

Reviewed-by: Stefan Zimmermann <stzi@linux.ibm.com>

Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Reviewed-by: Andrea Bolognani <abologna@redhat.com>

(cherry-picked from commit 29ad952f7e50bbbd920cbfb009a45b55fdb2f069)

https://bugzilla.redhat.com/show_bug.cgi?id=1508149

Conflicts:

  * src/qemu/qemu_capabilities.c

    src/qemu/qemu_capabilities.h

    + several capabilities have not been backported

Removed:

  * tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml

    + the file does not exist at all downstream

      - missing d7434ae8009f

Signed-off-by: Andrea Bolognani <abologna@redhat.com>

Message-Id: <20190408085732.28684-3-abologna@redhat.com>

Reviewed-by: Laine Stump <laine@redhat.com>

Reviewed-by: Ján Tomko <jtomko@redhat.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 0d6fa02560..8ca53abf2b 100644

--- a/src/qemu/qemu_capabilities.c

+++ b/src/qemu/qemu_capabilities.c

@@ -512,6 +512,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,

               /* 315 */

               "vfio-pci.display",

               "vfio-ap",

+              "zpci",

               "machine.pseries.cap-nested-hv",

     );

@@ -1153,6 +1154,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {

     { "mch", QEMU_CAPS_DEVICE_MCH },

     { "sev-guest", QEMU_CAPS_SEV_GUEST },

     { "vfio-ap", QEMU_CAPS_DEVICE_VFIO_AP },

+    { "zpci", QEMU_CAPS_DEVICE_ZPCI },

 };

 static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = {

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h

index 9550df2cd5..bea4767f3c 100644

--- a/src/qemu/qemu_capabilities.h

+++ b/src/qemu/qemu_capabilities.h

@@ -492,6 +492,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */

     /* 315 */

     QEMU_CAPS_VFIO_PCI_DISPLAY, /* -device vfio-pci.display */

     QEMU_CAPS_DEVICE_VFIO_AP, /* -device vfio-ap */

+    QEMU_CAPS_DEVICE_ZPCI, /* -device zpci */

     QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV, /* -machine pseries.cap-nested-hv */

     QEMU_CAPS_LAST /* this must always be the last item */

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml

index 7347f5683f..b46efe880d 100644

--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml

+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml

@@ -120,6 +120,7 @@

   <flag name='blockdev-del'/>

   <flag name='vhost-vsock'/>

   <flag name='egl-headless'/>

+  <flag name='zpci'/>

   <version>2010000</version>

   <kvmVersion>0</kvmVersion>

   <microcodeVersion>307899</microcodeVersion>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml

index b359f9a049..3ac1fc941c 100644

--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml

+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml

@@ -127,6 +127,7 @@

   <flag name='vhost-vsock'/>

   <flag name='tpm-emulator'/>

   <flag name='egl-headless'/>

+  <flag name='zpci'/>

   <version>2011000</version>

   <kvmVersion>0</kvmVersion>

   <microcodeVersion>346751</microcodeVersion>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml

index 7121da27a0..184f115fe4 100644

--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml

+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml

@@ -135,6 +135,7 @@

   <flag name='tpm-emulator'/>

   <flag name='egl-headless'/>

   <flag name='vfio-pci.display'/>

+  <flag name='zpci'/>

   <version>2012000</version>

   <kvmVersion>0</kvmVersion>

   <microcodeVersion>375999</microcodeVersion>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml

index 9ed25178f8..b04a9fbfd5 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>220792</microcodeVersion>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml

index 646239ff25..b2b267be8d 100644

--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml

+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml

@@ -110,6 +110,7 @@

   <flag name='virtual-css-bridge'/>

   <flag name='sdl-gl'/>

   <flag name='vhost-vsock'/>

+  <flag name='zpci'/>

   <version>2007093</version>

   <kvmVersion>0</kvmVersion>

   <microcodeVersion>246206</microcodeVersion>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml

index 09d68e1f18..f908ab88f3 100644

--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml

+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml

@@ -114,6 +114,7 @@

   <flag name='sdl-gl'/>

   <flag name='blockdev-del'/>

   <flag name='vhost-vsock'/>

+  <flag name='zpci'/>

   <version>2009000</version>

   <kvmVersion>0</kvmVersion>

   <microcodeVersion>269625</microcodeVersion>

-- 

2.22.0