By removing the target-specific 'CONFIG_KVM' definition this header can be used by files in meson common_ss[].
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- target/s390x/kvm/pv.h | 27 ------------ target/s390x/kvm/stubs.c | 94 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 27 deletions(-) diff --git a/target/s390x/kvm/pv.h b/target/s390x/kvm/pv.h index e266fc3d545..ea4b4ec3403 100644 --- a/target/s390x/kvm/pv.h +++ b/target/s390x/kvm/pv.h @@ -20,7 +20,6 @@ struct S390PVResponse { uint16_t rc; }; -#ifdef CONFIG_KVM bool s390_is_pv(void); int s390_pv_query_info(void); int s390_pv_vm_enable(void); @@ -43,31 +42,5 @@ int kvm_s390_dump_init(void); int kvm_s390_dump_cpu(S390CPU *cpu, void *buff); int kvm_s390_dump_mem_state(uint64_t addr, size_t len, void *dest); int kvm_s390_dump_completion_data(void *buff); -#else /* CONFIG_KVM */ -static inline bool s390_is_pv(void) { return false; } -static inline int s390_pv_query_info(void) { return 0; } -static inline int s390_pv_vm_enable(void) { return 0; } -static inline void s390_pv_vm_disable(void) {} -static inline bool s390_pv_vm_try_disable_async(S390CcwMachineState *ms) { return false; } -static inline int s390_pv_set_sec_parms(uint64_t origin, uint64_t length, - struct S390PVResponse *pv_resp, - Error **errp) { return 0; } -static inline int s390_pv_unpack(uint64_t addr, uint64_t size, uint64_t tweak, - struct S390PVResponse *pv_resp) { return 0; } -static inline void s390_pv_prep_reset(void) {} -static inline int s390_pv_verify(struct S390PVResponse *pv_resp) { return 0; } -static inline void s390_pv_unshare(void) {} -static inline void s390_pv_inject_reset_error(CPUState *cs, - struct S390PVResponse pv_resp) {}; -static inline uint64_t kvm_s390_pv_dmp_get_size_cpu(void) { return 0; } -static inline uint64_t kvm_s390_pv_dmp_get_size_mem_state(void) { return 0; } -static inline uint64_t kvm_s390_pv_dmp_get_size_completion_data(void) { return 0; } -static inline bool kvm_s390_pv_info_basic_valid(void) { return false; } -static inline int kvm_s390_dump_init(void) { return 0; } -static inline int kvm_s390_dump_cpu(S390CPU *cpu, void *buff) { return 0; } -static inline int kvm_s390_dump_mem_state(uint64_t addr, size_t len, - void *dest) { return 0; } -static inline int kvm_s390_dump_completion_data(void *buff) { return 0; } -#endif /* CONFIG_KVM */ #endif /* HW_S390_PV_H */ diff --git a/target/s390x/kvm/stubs.c b/target/s390x/kvm/stubs.c index 5fd63b9a7e3..046e1f922b7 100644 --- a/target/s390x/kvm/stubs.c +++ b/target/s390x/kvm/stubs.c @@ -5,8 +5,102 @@ #include "qemu/osdep.h" #include "kvm_s390x.h" +#include "target/s390x/kvm/pv.h" int kvm_s390_get_protected_dump(void) { return false; } + +bool s390_is_pv(void) +{ + return false; +} + +int s390_pv_query_info(void) +{ + return 0; +} + +int s390_pv_vm_enable(void) +{ + return 0; +} + +void s390_pv_vm_disable(void) +{ +} + +bool s390_pv_vm_try_disable_async(S390CcwMachineState *ms) +{ + return false; +} + +int s390_pv_set_sec_parms(uint64_t origin, uint64_t length, + struct S390PVResponse *pv_resp, Error **errp) +{ + return 0; +} + +int s390_pv_unpack(uint64_t addr, uint64_t size, uint64_t tweak, + struct S390PVResponse *pv_resp) +{ + return 0; +} + +void s390_pv_prep_reset(void) +{ +} + +int s390_pv_verify(struct S390PVResponse *pv_resp) +{ + return 0; +} + +void s390_pv_unshare(void) +{ +} + +void s390_pv_inject_reset_error(CPUState *cs, struct S390PVResponse pv_resp) +{ +} + +uint64_t kvm_s390_pv_dmp_get_size_cpu(void) +{ + return 0; +} + +uint64_t kvm_s390_pv_dmp_get_size_mem_state(void) +{ + return 0; +} + +uint64_t kvm_s390_pv_dmp_get_size_completion_data(void) +{ + return 0; +} + +bool kvm_s390_pv_info_basic_valid(void) +{ + return false; +} + +int kvm_s390_dump_init(void) +{ + return 0; +} + +int kvm_s390_dump_cpu(S390CPU *cpu, void *buff) +{ + return 0; +} + +int kvm_s390_dump_mem_state(uint64_t addr, size_t len, void *dest) +{ + return 0; +} + +int kvm_s390_dump_completion_data(void *buff) +{ + return 0; +} -- 2.52.0
