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>
50 lines
888 B
Makefile
50 lines
888 B
Makefile
# Default configuration for ppc64-softmmu
|
|
|
|
include pci.mak
|
|
include sound.mak
|
|
include usb.mak
|
|
CONFIG_GDBSTUB_XML=y
|
|
CONFIG_ISA_MMIO=y
|
|
CONFIG_ESCC=y
|
|
CONFIG_M48T59=y
|
|
CONFIG_VGA=y
|
|
CONFIG_VGA_PCI=y
|
|
CONFIG_SERIAL=y
|
|
CONFIG_PARALLEL=y
|
|
CONFIG_I8254=y
|
|
CONFIG_PCKBD=y
|
|
CONFIG_FDC=y
|
|
CONFIG_I8257=y
|
|
CONFIG_I82374=y
|
|
CONFIG_OPENPIC=y
|
|
CONFIG_PREP_PCI=y
|
|
CONFIG_I82378=y
|
|
CONFIG_PC87312=y
|
|
CONFIG_MACIO=y
|
|
CONFIG_PCSPK=y
|
|
CONFIG_CUDA=y
|
|
CONFIG_ADB=y
|
|
CONFIG_MAC_NVRAM=y
|
|
CONFIG_MAC_DBDMA=y
|
|
CONFIG_HEATHROW_PIC=y
|
|
CONFIG_GRACKLE_PCI=y
|
|
CONFIG_UNIN_PCI=y
|
|
CONFIG_DEC_PCI=y
|
|
CONFIG_PPCE500_PCI=y
|
|
CONFIG_IDE_ISA=y
|
|
CONFIG_IDE_CMD646=y
|
|
CONFIG_IDE_MACIO=y
|
|
CONFIG_NE2000_ISA=y
|
|
CONFIG_PFLASH_CFI01=y
|
|
CONFIG_PFLASH_CFI02=y
|
|
CONFIG_PTIMER=y
|
|
CONFIG_I8259=y
|
|
CONFIG_XILINX=y
|
|
CONFIG_XILINX_ETHLITE=y
|
|
CONFIG_OPENPIC=y
|
|
CONFIG_PSERIES=y
|
|
CONFIG_E500=y
|
|
CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
|
|
# For PReP
|
|
CONFIG_MC146818RTC=y
|