On 25/04/2019 17.53, Philippe Mathieu-Daudé wrote: > Hi Thomas, > > On 4/18/19 8:00 PM, Thomas Huth wrote: >> Dependencies have been determined by looking at hw/arm/virt.c >> >> Signed-off-by: Thomas Huth <th...@redhat.com> >> --- >> default-configs/arm-softmmu.mak | 11 +---------- >> hw/arm/Kconfig | 19 +++++++++++++++++++ >> hw/arm/Makefile.objs | 3 ++- >> 3 files changed, 22 insertions(+), 11 deletions(-) >> >> diff --git a/default-configs/arm-softmmu.mak >> b/default-configs/arm-softmmu.mak >> index 2580584281..f440a2b1cd 100644 >> --- a/default-configs/arm-softmmu.mak >> +++ b/default-configs/arm-softmmu.mak >> @@ -6,6 +6,7 @@ CONFIG_ARM_V7M=y >> # CONFIG_PCI_DEVICES=n >> # CONFIG_TEST_DEVICES=n >> >> +CONFIG_ARM_VIRT=y >> CONFIG_EXYNOS4=y >> CONFIG_HIGHBANK=y >> CONFIG_INTEGRATOR=y >> @@ -32,8 +33,6 @@ CONFIG_VGA=y >> CONFIG_SSI_M25P80=y >> CONFIG_ALLWINNER_EMAC=y >> CONFIG_IMX_FEC=y >> -CONFIG_PLATFORM_BUS=y >> -CONFIG_VIRTIO_MMIO=y >> >> CONFIG_NETDUINO2=y >> >> @@ -68,9 +67,6 @@ CONFIG_IOTKIT_SYSINFO=y >> CONFIG_ARMSSE_CPUID=y >> CONFIG_ARMSSE_MHU=y >> >> -CONFIG_PCI_EXPRESS=y >> -CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y >> - >> CONFIG_ALLWINNER_A10_PIT=y >> CONFIG_ALLWINNER_A10_PIC=y >> CONFIG_ALLWINNER_A10=y >> @@ -86,10 +82,5 @@ CONFIG_PCIE_PORT=y >> CONFIG_XIO3130=y >> CONFIG_IOH3420=y >> CONFIG_I82801B11=y >> -CONFIG_ACPI=y >> -CONFIG_ARM_VIRT=y >> -CONFIG_SMBIOS=y >> -CONFIG_GPIO_KEY=y >> CONFIG_MSF2=y >> -CONFIG_FW_CFG_DMA=y >> CONFIG_PCI_EXPRESS_DESIGNWARE=y >> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig >> index abeaa54d88..4d0febf644 100644 >> --- a/hw/arm/Kconfig >> +++ b/hw/arm/Kconfig >> @@ -1,6 +1,24 @@ >> config ARM_VIRT >> bool >> + imply PCI_DEVICES > > Without -nodefaults I get: > qemu-system-aarch64: Unsupported NIC model: virtio-net-pci > This is expected.
Yes, it should still work with "-nic none" or "-nodefaults". >> + imply TEST_DEVICES >> + imply VFIO_AMD_XGBE >> imply VFIO_PLATFORM >> + imply VFIO_XGMAC >> + select A15MPCORE >> + select ACPI >> + select ARM_SMMUV3 > > You forgot to remove ARM_SMMUV3 from default-configs/aarch64-softmmu.mak. Good catch! Will fix it in v6. > With it removed: > Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> Thanks! Thomas
