| Message ID | 160883056791.253005.14924294027763955653.stgit@bahia.lan (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3,1/3] ppc: Fix build with --without-default-devices | expand |
On Thu, Dec 24, 2020 at 06:22:47PM +0100, Greg Kurz wrote: > Linking of the qemu-system-ppc64 fails on a POWER9 host when > --without-default-devices is passed to configure: > > $ ./configure --without-default-devices \ > --target-list=ppc64-softmmu && make > > ... > > libqemu-ppc64-softmmu.fa.p/hw_ppc_e500.c.o: In function `ppce500_init_mpic_kvm': > /home/greg/Work/qemu/qemu-ppc/build/../hw/ppc/e500.c:777: undefined reference to `kvm_openpic_connect_vcpu' > libqemu-ppc64-softmmu.fa.p/hw_ppc_spapr_irq.c.o: In function `spapr_irq_check': > /home/greg/Work/qemu/qemu-ppc/build/../hw/ppc/spapr_irq.c:189: undefined reference to `xics_kvm_has_broken_disconnect' > libqemu-ppc64-softmmu.fa.p/hw_intc_spapr_xive.c.o: In function `spapr_xive_post_load': > /home/greg/Work/qemu/qemu-ppc/build/../hw/intc/spapr_xive.c:530: undefined reference to `kvmppc_xive_post_load' > > ... and tons of other symbols belonging to the KVM backend of the > openpic, XICS and XIVE interrupt controllers. > > It turns out that OPENPIC_KVM, XICS_KVM and XIVE_KVM are marked > to depend on KVM but this has no effect when minikconf runs in > allnoconfig mode. Such reverse dependencies should rather be > handled with a 'select' statement, eg. > > config OPENPIC > select OPENPIC_KVM if KVM > > or even better by getting rid of the intermediate _KVM config > and directly checking CONFIG_KVM in the meson.build file: > > specific_ss.add(when: ['CONFIG_KVM', 'CONFIG_OPENPIC'], > if_true: files('openpic_kvm.c')) > > Go for the latter with OPENPIC, XICS and XIVE. > > This went unnoticed so far because CI doesn't test the build with > --without-default-devices and KVM enabled on a POWER host. > > Signed-off-by: Greg Kurz <groug@kaod.org> Applied, thanks. > --- > > The various comments motivated me enough for another round, > which is basically to split the cleanup out to a separate > patch and use CONFIG_PSERIES in hw/intc/meson.build as > suggested by Cedric. > > v3: - move cleanup to a separate patch > > v2: - check CONFIG_KVM in the meson.build as suggested by Paolo > --- > hw/intc/Kconfig | 10 ---------- > hw/intc/meson.build | 9 ++++++--- > hw/ppc/Kconfig | 5 ----- > 3 files changed, 6 insertions(+), 18 deletions(-) > > diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig > index 468d548ca771..fa2695e58d56 100644 > --- a/hw/intc/Kconfig > +++ b/hw/intc/Kconfig > @@ -30,11 +30,6 @@ config ARM_GIC_KVM > default y > depends on ARM_GIC && KVM > > -config OPENPIC_KVM > - bool > - default y > - depends on OPENPIC && KVM > - > config XICS > bool > depends on POWERNV || PSERIES > @@ -43,11 +38,6 @@ config XICS_SPAPR > bool > select XICS > > -config XICS_KVM > - bool > - default y > - depends on XICS && KVM > - > config ALLWINNER_A10_PIC > bool > > diff --git a/hw/intc/meson.build b/hw/intc/meson.build > index 68da782ad2c5..b6c9218908e3 100644 > --- a/hw/intc/meson.build > +++ b/hw/intc/meson.build > @@ -39,7 +39,8 @@ specific_ss.add(when: 'CONFIG_LOONGSON_LIOINTC', if_true: files('loongson_lioint > specific_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_gic.c')) > specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_intc.c')) > specific_ss.add(when: 'CONFIG_OMPIC', if_true: files('ompic.c')) > -specific_ss.add(when: 'CONFIG_OPENPIC_KVM', if_true: files('openpic_kvm.c')) > +specific_ss.add(when: ['CONFIG_KVM', 'CONFIG_OPENPIC'], > + if_true: files('openpic_kvm.c')) > specific_ss.add(when: 'CONFIG_POWERNV', if_true: files('xics_pnv.c', 'pnv_xive.c')) > specific_ss.add(when: 'CONFIG_PPC_UIC', if_true: files('ppc-uic.c')) > specific_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_ic.c', 'bcm2836_control.c')) > @@ -50,8 +51,10 @@ specific_ss.add(when: 'CONFIG_SH4', if_true: files('sh_intc.c')) > specific_ss.add(when: 'CONFIG_SIFIVE_CLINT', if_true: files('sifive_clint.c')) > specific_ss.add(when: 'CONFIG_SIFIVE_PLIC', if_true: files('sifive_plic.c')) > specific_ss.add(when: 'CONFIG_XICS', if_true: files('xics.c')) > -specific_ss.add(when: 'CONFIG_XICS_KVM', if_true: files('xics_kvm.c')) > +specific_ss.add(when: ['CONFIG_KVM', 'CONFIG_XICS'], > + if_true: files('xics_kvm.c')) > specific_ss.add(when: 'CONFIG_XICS_SPAPR', if_true: files('xics_spapr.c')) > specific_ss.add(when: 'CONFIG_XIVE', if_true: files('xive.c')) > -specific_ss.add(when: 'CONFIG_XIVE_KVM', if_true: files('spapr_xive_kvm.c')) > +specific_ss.add(when: ['CONFIG_KVM', 'CONFIG_XIVE'], > + if_true: files('spapr_xive_kvm.c')) > specific_ss.add(when: 'CONFIG_XIVE_SPAPR', if_true: files('spapr_xive.c')) > diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig > index 982d55f5875c..e35710c7c368 100644 > --- a/hw/ppc/Kconfig > +++ b/hw/ppc/Kconfig > @@ -139,11 +139,6 @@ config XIVE_SPAPR > depends on PSERIES > select XIVE > > -config XIVE_KVM > - bool > - default y > - depends on XIVE_SPAPR && KVM > - > # Only used by 64-bit targets > config FW_CFG_PPC > bool > >
diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index 468d548ca771..fa2695e58d56 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -30,11 +30,6 @@ config ARM_GIC_KVM default y depends on ARM_GIC && KVM -config OPENPIC_KVM - bool - default y - depends on OPENPIC && KVM - config XICS bool depends on POWERNV || PSERIES @@ -43,11 +38,6 @@ config XICS_SPAPR bool select XICS -config XICS_KVM - bool - default y - depends on XICS && KVM - config ALLWINNER_A10_PIC bool diff --git a/hw/intc/meson.build b/hw/intc/meson.build index 68da782ad2c5..b6c9218908e3 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -39,7 +39,8 @@ specific_ss.add(when: 'CONFIG_LOONGSON_LIOINTC', if_true: files('loongson_lioint specific_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_gic.c')) specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_intc.c')) specific_ss.add(when: 'CONFIG_OMPIC', if_true: files('ompic.c')) -specific_ss.add(when: 'CONFIG_OPENPIC_KVM', if_true: files('openpic_kvm.c')) +specific_ss.add(when: ['CONFIG_KVM', 'CONFIG_OPENPIC'], + if_true: files('openpic_kvm.c')) specific_ss.add(when: 'CONFIG_POWERNV', if_true: files('xics_pnv.c', 'pnv_xive.c')) specific_ss.add(when: 'CONFIG_PPC_UIC', if_true: files('ppc-uic.c')) specific_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_ic.c', 'bcm2836_control.c')) @@ -50,8 +51,10 @@ specific_ss.add(when: 'CONFIG_SH4', if_true: files('sh_intc.c')) specific_ss.add(when: 'CONFIG_SIFIVE_CLINT', if_true: files('sifive_clint.c')) specific_ss.add(when: 'CONFIG_SIFIVE_PLIC', if_true: files('sifive_plic.c')) specific_ss.add(when: 'CONFIG_XICS', if_true: files('xics.c')) -specific_ss.add(when: 'CONFIG_XICS_KVM', if_true: files('xics_kvm.c')) +specific_ss.add(when: ['CONFIG_KVM', 'CONFIG_XICS'], + if_true: files('xics_kvm.c')) specific_ss.add(when: 'CONFIG_XICS_SPAPR', if_true: files('xics_spapr.c')) specific_ss.add(when: 'CONFIG_XIVE', if_true: files('xive.c')) -specific_ss.add(when: 'CONFIG_XIVE_KVM', if_true: files('spapr_xive_kvm.c')) +specific_ss.add(when: ['CONFIG_KVM', 'CONFIG_XIVE'], + if_true: files('spapr_xive_kvm.c')) specific_ss.add(when: 'CONFIG_XIVE_SPAPR', if_true: files('spapr_xive.c')) diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 982d55f5875c..e35710c7c368 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -139,11 +139,6 @@ config XIVE_SPAPR depends on PSERIES select XIVE -config XIVE_KVM - bool - default y - depends on XIVE_SPAPR && KVM - # Only used by 64-bit targets config FW_CFG_PPC bool
Linking of the qemu-system-ppc64 fails on a POWER9 host when --without-default-devices is passed to configure: $ ./configure --without-default-devices \ --target-list=ppc64-softmmu && make ... libqemu-ppc64-softmmu.fa.p/hw_ppc_e500.c.o: In function `ppce500_init_mpic_kvm': /home/greg/Work/qemu/qemu-ppc/build/../hw/ppc/e500.c:777: undefined reference to `kvm_openpic_connect_vcpu' libqemu-ppc64-softmmu.fa.p/hw_ppc_spapr_irq.c.o: In function `spapr_irq_check': /home/greg/Work/qemu/qemu-ppc/build/../hw/ppc/spapr_irq.c:189: undefined reference to `xics_kvm_has_broken_disconnect' libqemu-ppc64-softmmu.fa.p/hw_intc_spapr_xive.c.o: In function `spapr_xive_post_load': /home/greg/Work/qemu/qemu-ppc/build/../hw/intc/spapr_xive.c:530: undefined reference to `kvmppc_xive_post_load' ... and tons of other symbols belonging to the KVM backend of the openpic, XICS and XIVE interrupt controllers. It turns out that OPENPIC_KVM, XICS_KVM and XIVE_KVM are marked to depend on KVM but this has no effect when minikconf runs in allnoconfig mode. Such reverse dependencies should rather be handled with a 'select' statement, eg. config OPENPIC select OPENPIC_KVM if KVM or even better by getting rid of the intermediate _KVM config and directly checking CONFIG_KVM in the meson.build file: specific_ss.add(when: ['CONFIG_KVM', 'CONFIG_OPENPIC'], if_true: files('openpic_kvm.c')) Go for the latter with OPENPIC, XICS and XIVE. This went unnoticed so far because CI doesn't test the build with --without-default-devices and KVM enabled on a POWER host. Signed-off-by: Greg Kurz <groug@kaod.org> --- The various comments motivated me enough for another round, which is basically to split the cleanup out to a separate patch and use CONFIG_PSERIES in hw/intc/meson.build as suggested by Cedric. v3: - move cleanup to a separate patch v2: - check CONFIG_KVM in the meson.build as suggested by Paolo --- hw/intc/Kconfig | 10 ---------- hw/intc/meson.build | 9 ++++++--- hw/ppc/Kconfig | 5 ----- 3 files changed, 6 insertions(+), 18 deletions(-)