From 0db8d909a2f3c53d12b0ae12307965f9a8193dbc Mon Sep 17 00:00:00 2001

From: Thomas Huth <thuth@redhat.com>

Date: Fri, 29 May 2020 05:54:19 -0400

Subject: [PATCH 37/42] s390x/s390-virtio-ccw: Fix build on systems without KVM

MIME-Version: 1.0

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

Content-Transfer-Encoding: 8bit

RH-Author: Thomas Huth <thuth@redhat.com>

Message-id: <20200529055420.16855-38-thuth@redhat.com>

Patchwork-id: 97047

O-Subject: [RHEL-8.3.0 qemu-kvm PATCH v2 37/38] s390x/s390-virtio-ccw: Fix build on systems without KVM

Bugzilla: 1828317

RH-Acked-by: Claudio Imbrenda <cimbrend@redhat.com>

RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

RH-Acked-by: Cornelia Huck <cohuck@redhat.com>

RH-Acked-by: David Hildenbrand <david@redhat.com>

From: Christian Borntraeger <borntraeger@de.ibm.com>

linux/kvm.h is not available on all platforms. Let us move

s390_machine_inject_pv_error into pv.c as it uses KVM structures.

Also rename the function to s390_pv_inject_reset_error.

While at it, ipl.h needs an include for "exec/address-spaces.h"

as it uses address_space_memory.

Fixes: c3347ed0d2ee ("s390x: protvirt: Support unpack facility")

Reported-by: Bruce Rogers <brogers@suse.com>

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

Message-Id: <20200406100158.5940-2-borntraeger@de.ibm.com>

Reviewed-by: David Hildenbrand <david@redhat.com>

Signed-off-by: Cornelia Huck <cohuck@redhat.com>

(cherry picked from commit fbc1384ccd48fa7c0c38f950adf7992a4fb6042e)

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 hw/s390x/ipl.h             |  1 +

 hw/s390x/pv.c              | 11 +++++++++++

 hw/s390x/s390-virtio-ccw.c | 12 +-----------

 include/hw/s390x/pv.h      |  3 +++

 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h

index 89b3044d7a..53cc9eb5ac 100644

--- a/hw/s390x/ipl.h

+++ b/hw/s390x/ipl.h

@@ -14,6 +14,7 @@

 #define HW_S390_IPL_H

 #include "cpu.h"

+#include "exec/address-spaces.h"

 #include "hw/qdev-core.h"

 struct IPLBlockPVComp {

diff --git a/hw/s390x/pv.c b/hw/s390x/pv.c

index cb0dce4a4f..f11868e865 100644

--- a/hw/s390x/pv.c

+++ b/hw/s390x/pv.c

@@ -13,8 +13,10 @@

 #include <linux/kvm.h>

+#include "cpu.h"

 #include "qemu/error-report.h"

 #include "sysemu/kvm.h"

+#include "hw/s390x/ipl.h"

 #include "hw/s390x/pv.h"

 static int __s390_pv_cmd(uint32_t cmd, const char *cmdname, void *data)

@@ -100,3 +102,12 @@ void s390_pv_unshare(void)

 {

     s390_pv_cmd_exit(KVM_PV_UNSHARE_ALL, NULL);

 }

+

+void s390_pv_inject_reset_error(CPUState *cs)

+{

+    int r1 = (cs->kvm_run->s390_sieic.ipa & 0x00f0) >> 4;

+    CPUS390XState *env = &S390_CPU(cs)->env;

+

+    /* Report that we are unable to enter protected mode */

+    env->regs[r1 + 1] = DIAG_308_RC_INVAL_FOR_PV;

+}

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c

index c08e42bda1..07773a12b2 100644

--- a/hw/s390x/s390-virtio-ccw.c

+++ b/hw/s390x/s390-virtio-ccw.c

@@ -44,7 +44,6 @@

 #include "sysemu/sysemu.h"

 #include "sysemu/balloon.h"

 #include "hw/s390x/pv.h"

-#include <linux/kvm.h>

 #include "migration/blocker.h"

 static Error *pv_mig_blocker;

@@ -391,15 +390,6 @@ out_err:

     return rc;

 }

-static void s390_machine_inject_pv_error(CPUState *cs)

-{

-    int r1 = (cs->kvm_run->s390_sieic.ipa & 0x00f0) >> 4;

-    CPUS390XState *env = &S390_CPU(cs)->env;

-

-    /* Report that we are unable to enter protected mode */

-    env->regs[r1 + 1] = DIAG_308_RC_INVAL_FOR_PV;

-}

-

 static void s390_pv_prepare_reset(S390CcwMachineState *ms)

 {

     CPUState *cs;

@@ -485,7 +475,7 @@ static void s390_machine_reset(MachineState *machine)

         run_on_cpu(cs, s390_do_cpu_reset, RUN_ON_CPU_NULL);

         if (s390_machine_protect(ms)) {

-            s390_machine_inject_pv_error(cs);

+            s390_pv_inject_reset_error(cs);

             /*

              * Continue after the diag308 so the guest knows something

              * went wrong.

diff --git a/include/hw/s390x/pv.h b/include/hw/s390x/pv.h

index c6cb360f2f..522ca6a04e 100644

--- a/include/hw/s390x/pv.h

+++ b/include/hw/s390x/pv.h

@@ -13,6 +13,7 @@

 #define HW_S390_PV_H

 #ifdef CONFIG_KVM

+#include "cpu.h"

 #include "hw/s390x/s390-virtio-ccw.h"

 static inline bool s390_is_pv(void)

@@ -41,6 +42,7 @@ int s390_pv_unpack(uint64_t addr, uint64_t size, uint64_t tweak);

 void s390_pv_perf_clear_reset(void);

 int s390_pv_verify(void);

 void s390_pv_unshare(void);

+void s390_pv_inject_reset_error(CPUState *cs);

 #else /* CONFIG_KVM */

 static inline bool s390_is_pv(void) { return false; }

 static inline int s390_pv_vm_enable(void) { return 0; }

@@ -50,6 +52,7 @@ static inline int s390_pv_unpack(uint64_t addr, uint64_t size, uint64_t tweak) {

 static inline void s390_pv_perf_clear_reset(void) {}

 static inline int s390_pv_verify(void) { return 0; }

 static inline void s390_pv_unshare(void) {}

+static inline void s390_pv_inject_reset_error(CPUState *cs) {};

 #endif /* CONFIG_KVM */

 #endif /* HW_S390_PV_H */

-- 

2.27.0