On 2019-01-25 11:06, Paolo Bonzini wrote: > From: Yang Zhong <yang.zh...@intel.com> > > make virt code configurable and the new CONFIG_VIRT definitions > added to the default-configs/arm-softmmu.mak to replace CONFIG_ACPI > in arm board. > > Signed-off-by: Yang Zhong <yang.zh...@intel.com> > Reviewed-by: Richard Henderson <richard.hender...@linaro.org> > Reviewed-by: Thomas Huth <th...@redhat.com> > Message-Id: <20190123065618.3520-5-yang.zh...@intel.com> > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > --- > default-configs/arm-softmmu.mak | 1 + > hw/arm/Makefile.objs | 3 ++- > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak > index 107f801..68deb1c 100644 > --- a/default-configs/arm-softmmu.mak > +++ b/default-configs/arm-softmmu.mak > @@ -147,6 +147,7 @@ CONFIG_XIO3130=y > CONFIG_IOH3420=y > CONFIG_I82801B11=y > CONFIG_ACPI=y > +CONFIG_VIRT=y > CONFIG_SMBIOS=y > CONFIG_ASPEED_SOC=y > CONFIG_GPIO_KEY=y > diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs > index 50c7b4a..41dab8a 100644 > --- a/hw/arm/Makefile.objs > +++ b/hw/arm/Makefile.objs > @@ -1,4 +1,5 @@ > -obj-y += boot.o virt.o sysbus-fdt.o > +obj-y += boot.o sysbus-fdt.o > +obj-$(CONFIG_VIRT) += virt.o > obj-$(CONFIG_ACPI) += virt-acpi-build.o > obj-$(CONFIG_DIGIC) += digic_boards.o > obj-$(CONFIG_EXYNOS4) += exynos4_boards.o
<bikeshedding> Maybe we should rather name that option CONFIG_ARM_VIRT, since other targets like riscv have also a "virt" machine? </bikeshedding> Thomas
