fbc1384ccd
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: c3347ed0d2 ("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>
59 lines
1.7 KiB
C
59 lines
1.7 KiB
C
/*
|
|
* Protected Virtualization header
|
|
*
|
|
* Copyright IBM Corp. 2020
|
|
* Author(s):
|
|
* Janosch Frank <frankja@linux.ibm.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or (at
|
|
* your option) any later version. See the COPYING file in the top-level
|
|
* directory.
|
|
*/
|
|
#ifndef HW_S390_PV_H
|
|
#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)
|
|
{
|
|
static S390CcwMachineState *ccw;
|
|
Object *obj;
|
|
|
|
if (ccw) {
|
|
return ccw->pv;
|
|
}
|
|
|
|
/* we have to bail out for the "none" machine */
|
|
obj = object_dynamic_cast(qdev_get_machine(),
|
|
TYPE_S390_CCW_MACHINE);
|
|
if (!obj) {
|
|
return false;
|
|
}
|
|
ccw = S390_CCW_MACHINE(obj);
|
|
return ccw->pv;
|
|
}
|
|
|
|
int s390_pv_vm_enable(void);
|
|
void s390_pv_vm_disable(void);
|
|
int s390_pv_set_sec_parms(uint64_t origin, uint64_t length);
|
|
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; }
|
|
static inline void s390_pv_vm_disable(void) {}
|
|
static inline int s390_pv_set_sec_parms(uint64_t origin, uint64_t length) { return 0; }
|
|
static inline int s390_pv_unpack(uint64_t addr, uint64_t size, uint64_t tweak) { return 0; }
|
|
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 */
|