mirror of
https://github.com/xemu-project/xemu.git
synced 2024-12-01 07:21:09 +00:00
79ca616f29
pci-hotplug.c and the CONFIG_PCI_HOTPLUG variable which controls its
compilation are misnamed. They're not about PCI hotplug in general, but
rather about the pci_add/pci_del interface which are now deprecated in
favour of the more general device_add/device_del interface. This patch
therefore renames them to pci-hotplug-old.c and CONFIG_PCI_HOTPLUG_OLD.
CONFIG_PCI_HOTPLUG=y was listed twice in {i386,x86_64}-softmmu.make for no
particular reason, so we clean that up too. In addition it was included in
ppc64-softmmu.mak for which the old hotplug interface was never used and is
unsuitable, so we remove that too.
Most of pci-hotplug.c was additionaly protected by #ifdef TARGET_I386. The
small piece which wasn't is only called from the pci_add and pci_del hooks
in hmp-commands.hx, which themselves were protected by #ifdef TARGET_I386.
This patch therefore also removes the #ifdef from pci-hotplug-old.c,
and changes the ifdefs in hmp-commands.hx to use CONFIG_PCI_HOTPLUG_OLD.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
48 lines
840 B
Makefile
48 lines
840 B
Makefile
# Default configuration for i386-softmmu
|
|
|
|
include pci.mak
|
|
include sound.mak
|
|
include usb.mak
|
|
CONFIG_VGA=y
|
|
CONFIG_QXL=$(CONFIG_SPICE)
|
|
CONFIG_VGA_PCI=y
|
|
CONFIG_VGA_ISA=y
|
|
CONFIG_VGA_CIRRUS=y
|
|
CONFIG_VMWARE_VGA=y
|
|
CONFIG_VMMOUSE=y
|
|
CONFIG_SERIAL=y
|
|
CONFIG_PARALLEL=y
|
|
CONFIG_I8254=y
|
|
CONFIG_PCSPK=y
|
|
CONFIG_PCKBD=y
|
|
CONFIG_FDC=y
|
|
CONFIG_ACPI=y
|
|
CONFIG_APM=y
|
|
CONFIG_I8257=y
|
|
CONFIG_IDE_ISA=y
|
|
CONFIG_IDE_PIIX=y
|
|
CONFIG_NE2000_ISA=y
|
|
CONFIG_PIIX_PCI=y
|
|
CONFIG_HPET=y
|
|
CONFIG_APPLESMC=y
|
|
CONFIG_I8259=y
|
|
CONFIG_PFLASH_CFI01=y
|
|
CONFIG_TPM_TIS=$(CONFIG_TPM)
|
|
CONFIG_PCI_HOTPLUG_OLD=y
|
|
CONFIG_MC146818RTC=y
|
|
CONFIG_PAM=y
|
|
CONFIG_PCI_PIIX=y
|
|
CONFIG_WDT_IB700=y
|
|
CONFIG_PC_SYSFW=y
|
|
CONFIG_XEN_I386=$(CONFIG_XEN)
|
|
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_ICC_BUS=y
|
|
CONFIG_PVPANIC=y
|