Re: [PATCH v2 1/1] s390x/s390-virtio-ccw: Fix build on systems without KVM

[David Hildenbrand]

On 06.04.20 12:01, Christian Borntraeger wrote:
> 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 <address@hidden>
> Signed-off-by: Christian Borntraeger <address@hidden>
> ---
>  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 89b3044d7a..53cc9eb5ac 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 d3333d6e13..68dbc022d0 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_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 b268907395..45292fb5a8 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -45,7 +45,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;
> @@ -390,15 +389,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;
> @@ -484,7 +474,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 c6cb360f2f..522ca6a04e 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 */
> 

Reviewed-by: David Hildenbrand <address@hidden>

-- 
Thanks,

David / dhildenb