Re: [Qemu-ppc] [Qemu-devel] [PATCH 00/11] macio: remove legacy macio_init() function

[David Gibson]

On Fri, Feb 23, 2018 at 02:51:48PM +0000, Mark Cave-Ayland wrote:
> On 23/02/18 12:11, address@hidden wrote:
> 
> > Hi,
> > 
> > This series failed build test on s390x host. Please find the details below.
> > 
> > Type: series
> > Message-id: address@hidden
> > Subject: [Qemu-devel] [PATCH 00/11] macio: remove legacy
> > macio_init() function

[snip]
> >    CC      ppc-linux-user/accel/stubs/whpx-stub.o
> >    CC      ppc-linux-user/accel/stubs/kvm-stub.o
> >    CC      ppc-linux-user/accel/tcg/tcg-runtime.o
> >    CC      ppc-linux-user/accel/tcg/tcg-runtime-gvec.o
> >    CC      ppc-linux-user/accel/tcg/cpu-exec.o
> >    CC      ppc-linux-user/accel/tcg/cpu-exec-common.o
> >    CC      ppc-linux-user/accel/tcg/translate-all.o
> >    CC      ppc-linux-user/accel/tcg/translator.o
> >    CC      ppc-linux-user/accel/tcg/user-exec.o
> >    CC      ppc-linux-user/accel/tcg/user-exec-stub.o
> >    CC      ppc-linux-user/linux-user/main.o
> >    CC      ppc-linux-user/linux-user/syscall.o
> >    CC      ppc-linux-user/linux-user/strace.o
> >    CC      ppc-linux-user/linux-user/mmap.o
> >    CC      ppc-linux-user/linux-user/signal.o
> >    CC      ppc-linux-user/linux-user/elfload.o
> >    CC      ppc-linux-user/linux-user/linuxload.o
> >    CC      ppc-linux-user/linux-user/uaccess.o
> >    CC      ppc-linux-user/linux-user/uname.o
> >    CCAS    ppc-linux-user/linux-user/safe-syscall.o
> >    CC      ppc-linux-user/target/ppc/cpu-models.o
> >    CC      ppc-linux-user/target/ppc/cpu.o
> >    CC      ppc-linux-user/target/ppc/translate.o
> >    CC      ppc-linux-user/target/ppc/kvm-stub.o
> >    CC      ppc-linux-user/target/ppc/dfp_helper.o
> > In file included from 
> > /var/tmp/patchew-tester-tmp-ob5ouqpf/src/include/hw/qdev.h:4:0,
> >                   from 
> > /var/tmp/patchew-tester-tmp-ob5ouqpf/src/include/hw/sysbus.h:6,
> >                   from 
> > /var/tmp/patchew-tester-tmp-ob5ouqpf/src/include/hw/ppc/openpic.h:5,
> >                   from 
> > /var/tmp/patchew-tester-tmp-ob5ouqpf/src/target/ppc/kvm-stub.c:15:
> > /var/tmp/patchew-tester-tmp-ob5ouqpf/src/include/hw/hw.h:6:2: error: #error 
> > Cannot include hw/hw.h from user emulation
> >   #error Cannot include hw/hw.h from user emulation
> >    ^~~~~
> > In file included from 
> > /var/tmp/patchew-tester-tmp-ob5ouqpf/src/target/ppc/kvm-stub.c:15:0:
> > /var/tmp/patchew-tester-tmp-ob5ouqpf/src/include/hw/ppc/openpic.h:146:18: 
> > error: field ‘mem’ has incomplete type
> >       MemoryRegion mem;
> >                    ^~~
> > /var/tmp/patchew-tester-tmp-ob5ouqpf/src/include/hw/ppc/openpic.h:163:18: 
> > error: array type has incomplete element type ‘MemoryRegion {aka struct 
> > MemoryRegion}’
> >       MemoryRegion sub_io_mem[6];
> >                    ^~~~~~~~~~
> > make[1]: *** [/var/tmp/patchew-tester-tmp-ob5ouqpf/src/rules.mak:66: 
> > target/ppc/kvm-stub.o] Error 1
> > make[1]: *** Waiting for unfinished jobs....
> > make: *** [Makefile:404: subdir-ppc64-linux-user] Error 2
> > make: *** [Makefile:404: subdir-ppc-linux-user] Error 2
> > === OUTPUT END ===
> > 
> > Test command exited with code: 2
> 
> Oh that's fun - it seems that kvm-stub.c includes hw/ppc/openpic.h in order
> to make use of kvm_openpic_connect_vcpu() which is why this is tripping up.
> 
> David, any idea what the right solution is here?

Not off the top of my head.

> I could perhaps split the
> KVM-specific parts of openpic.h into a separate hw/ppc/openpic_kvm.h file.
> Then again it feels a bit like kvm_openpic_connect_vcpu() doesn't live in
> the right place.

Both of those seem like plausible solutions.

-- 
David Gibson                    | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
                                | _way_ _around_!
http://www.ozlabs.org/~dgibson

signature.asc
Description: PGP signature