7325eaecfb
- Include upstream patches targeted for the next stable release (bug fixes only) spapr-Fix-failure-path-for-attempting-to.patch target-i386-do-not-set-unsupported-VMX-s.patch target-xtensa-fix-pasto-in-pfwait.r-opco.patch tcg-i386-Fix-INDEX_op_dup2_vec.patch tcg-mips-mips-sync-encode-error.patch vhost-user-gpu-Release-memory-returned-b.patch vpc-Don-t-round-up-already-aligned-BAT-s.patch xen-block-Fix-double-qlist-remove-and-re.patch - Fix bug causing weak encryption in PAuth for ARM (CVE-2020-10702 bsc#1168681) target-arm-Fix-PAuth-sbox-functions.patch - Fix OOB in tulip NIC emulation (CVE-2020-11102 bsc#1168713 net-tulip-check-frame-size-and-r-w-data-.patch - Note that previously included patch addresses CVE-2020-1711 and bsc#1166240 iscsi-Cap-block-count-from-GET-LBA-STATU.patch - Include performance improvement (and related?) patch aio-wait-delegate-polling-of-main-AioCon.patch async-use-explicit-memory-barriers.patch - Rework previous patch at Olaf H.'s direction hw-i386-disable-smbus-migration-for-xenf.patch - Eliminate is_opensuse usage in producing seabios version string what we are doing here is just replacing the upstream string with one indicating that the openSUSE build service built it, and so just leave it as "-rebuilt.opensuse.org" - Alter algorithm used to produce "unique" symbol for coordinating qemu with the optional modules it may load. This is a reasonable relaxation for broader compatibility configure-remove-pkgversion-from-CONFIG_.patch - Tweak supported.*.txt for latest deprecations, and other fixes - Tweak update_git.sh, config.sh - One more fix is needed for: s390x Protected Virtualization support - start and control guest in secure mode (bsc#1167075 jsc#SLE-7407) s390x-s390-virtio-ccw-Fix-build-on-syste.patch OBS-URL: https://build.opensuse.org/request/show/795118 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=542
130 lines
4.2 KiB
Diff
130 lines
4.2 KiB
Diff
From: Christian Borntraeger <borntraeger@de.ibm.com>
|
|
Date: Mon, 6 Apr 2020 06:01:58 -0400
|
|
Subject: s390x/s390-virtio-ccw: Fix build on systems without KVM
|
|
|
|
References: bsc#1167075
|
|
|
|
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: 49fc3220175e ("s390x: protvirt: Support unpack facility")
|
|
Reported-by: Bruce Rogers <brogers@suse.com>
|
|
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.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 89b3044d7a2ee54014daa8eeafc9..53cc9eb5ac4d326b2b61bf1668a8 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 8cf5cd2c9bcd48b03af1e546fb3a..2c4d5e89890b7d21abdcd718c2f2 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)
|
|
@@ -96,3 +98,12 @@ void s390_pv_unshare(void)
|
|
{
|
|
s390_pv_cmd_exit(KVM_PV_VM_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 85250bf046ed72313b03c6ff6c54..5df455e065504bc0eef0f1f084dc 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;
|
|
@@ -392,15 +391,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;
|
|
@@ -486,7 +476,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 c6cb360f2f6a0a32a37970769e1b..522ca6a04ee877940ff1de9f410b 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 */
|