On 08/08/2018 01:48 PM, Juan Quintela wrote: > If we ever changed that, just make the things that are different > explicit. > > Signed-off-by: Juan Quintela <quint...@redhat.com> > --- > default-configs/i386-softmmu.mak | 65 +------------------------------- > 1 file changed, 1 insertion(+), 64 deletions(-) > > diff --git a/default-configs/i386-softmmu.mak > b/default-configs/i386-softmmu.mak > index 8827166ba1..6ec7a3b0ae 100644 > --- a/default-configs/i386-softmmu.mak > +++ b/default-configs/i386-softmmu.mak > @@ -1,66 +1,3 @@ > # Default configuration for i386-softmmu > > -include pci.mak > -include sound.mak > -include usb.mak > -CONFIG_QXL=$(CONFIG_SPICE) > -CONFIG_VGA_ISA=y > -CONFIG_VGA_CIRRUS=y > -CONFIG_VMWARE_VGA=y > -CONFIG_VMXNET3_PCI=y > -CONFIG_VIRTIO_VGA=y > -CONFIG_VMMOUSE=y > -CONFIG_IPMI=y > -CONFIG_IPMI_LOCAL=y > -CONFIG_IPMI_EXTERN=y > -CONFIG_ISA_IPMI_KCS=y > -CONFIG_ISA_IPMI_BT=y > -CONFIG_PARALLEL=y > -CONFIG_I8254=y > -CONFIG_PCSPK=y > -CONFIG_PCKBD=y > -CONFIG_FDC=y > -CONFIG_ACPI=y > -CONFIG_ACPI_X86=y > -CONFIG_ACPI_X86_ICH=y > -CONFIG_ACPI_MEMORY_HOTPLUG=y > -CONFIG_ACPI_CPU_HOTPLUG=y > -CONFIG_APM=y > -CONFIG_I8257=y > -CONFIG_IDE_ISA=y > -CONFIG_IDE_PIIX=y > -CONFIG_NE2000_ISA=y > -CONFIG_HPET=y > -CONFIG_APPLESMC=y > -CONFIG_I8259=y > -CONFIG_PFLASH_CFI01=y > -CONFIG_TPM_TIS=$(CONFIG_TPM) > -CONFIG_TPM_CRB=$(CONFIG_TPM) > -CONFIG_MC146818RTC=y > -CONFIG_PCI_PIIX=y > -CONFIG_WDT_IB700=y > -CONFIG_ISA_DEBUG=y > -CONFIG_ISA_TESTDEV=y > -CONFIG_VMPORT=y > -CONFIG_SGA=y > -CONFIG_LPC_ICH9=y > -CONFIG_PCI_Q35=y > -CONFIG_APIC=y > -CONFIG_IOAPIC=y > -CONFIG_PVPANIC=y > -CONFIG_MEM_HOTPLUG=y > -CONFIG_NVDIMM=y > -CONFIG_ACPI_NVDIMM=y > -CONFIG_PCIE_PORT=y > -CONFIG_XIO3130=y > -CONFIG_IOH3420=y > -CONFIG_I82801B11=y > -CONFIG_SMBIOS=y > -CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM) > -CONFIG_PXB=y > -CONFIG_ACPI_VMGENID=y > -CONFIG_FW_CFG_DMA=y > -CONFIG_I2C=y > -CONFIG_SEV=$(CONFIG_KVM) > -CONFIG_VTD=y > -CONFIG_AMD_IOMMU=y > +include x86_64-softmmu.mak
That's theoretically a good idea, but I think I'd rather do it the other way round: include i386-softmmu.mak in the x86_64 config file. Rationale: x86_64 is supposed to be a superset of i386, not the other way round, so when we will ever get a CONFIG_SWITCH_FOR_X86_64_ONLY, it's easier to handle if the includes are done the other way round. And that's also how we do it in aarch64-softmmu.mak an ppc64-softmmu.mak. Thomas
