diff options
| author | Christian Borntraeger | 2020-04-06 12:01:58 +0200 |
|---|---|---|
| committer | Cornelia Huck | 2020-04-29 14:36:19 +0200 |
| commit | fbc1384ccd48fa7c0c38f950adf7992a4fb6042e (patch) | |
| tree | 5a40f5741eb002b0c218b661b0d57b60448c252d /hw/s390x/pv.c | |
| parent | s390x/pv: Retry ioctls on -EINTR (diff) | |
| download | qemu-fbc1384ccd48fa7c0c38f950adf7992a4fb6042e.tar.gz qemu-fbc1384ccd48fa7c0c38f950adf7992a4fb6042e.tar.xz qemu-fbc1384ccd48fa7c0c38f950adf7992a4fb6042e.zip | |
s390x/s390-virtio-ccw: Fix build on systems without KVM
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>
Diffstat (limited to 'hw/s390x/pv.c')
| -rw-r--r-- | hw/s390x/pv.c | 11 |
1 files changed, 11 insertions, 0 deletions
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; +} |