> +++ b/include/hw/s390x/pv.h
> @@ -0,0 +1,57 @@
> +/*
> + * Protected Virtualization header
> + *
> + * Copyright IBM Corp. 2020
> + * Author(s):
> + * Janosch Frank <fran...@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 "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);
> +#else
> +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) {}
> +#endif
Maybe /* CONFIG_KVM */ for the else and endif. Whatever you prefer.
> +
> +
> +
Nit: too many newlines.
> +#endif /* HW_S390_PV_H */
> diff --git a/include/hw/s390x/s390-virtio-ccw.h
> b/include/hw/s390x/s390-virtio-ccw.h
> index 8aa27199c9123bab..cd1dccc6e3ba8645 100644
Nothing jumped at me :)
Reviewed-by: David Hildenbrand <da...@redhat.com>
--
Thanks,
David / dhildenb
