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

[Cornelia Huck]

On Mon, 6 Apr 2020 11:27:13 +0200
Christian Borntraeger <address@hidden> wrote:

> On 06.04.20 11:04, Cornelia Huck wrote:
> > On Mon,  6 Apr 2020 03:59:31 -0400
> > Christian Borntraeger <address@hidden> 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.
> >>
> >> 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 | 10 ----------
> >>  include/hw/s390x/pv.h      |  3 +++
> >>  4 files changed, 15 insertions(+), 10 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"  
> > 
> > Hm, what is now requiring including this? (No objection, but I don't
> > see it.)  
> 
> ipl.h has
> 
> static inline bool ipl_valid_pv_header(IplParameterBlock *iplb)
> {
> [..]
>         if (!address_space_access_valid(&address_space_memory,
> 
> and if included alone this fails to build without the include. 
> 

Ah, makes sense.

> 
> >   
> >>  #include "hw/qdev-core.h"
> >>  
> >>  struct IPLBlockPVComp {  
> >