From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48742) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHeDB-0000Fp-6S for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:51:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UHeD9-0008Rn-UN for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:51:05 -0400 Received: from mail-bk0-x22b.google.com ([2a00:1450:4008:c01::22b]:37933) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHdyT-0001u0-Jo for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:35:54 -0400 Received: by mail-bk0-f43.google.com with SMTP id jm19so2619123bkc.16 for ; Mon, 18 Mar 2013 10:35:52 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 18 Mar 2013 18:35:00 +0100 Message-Id: <1363628125-5310-11-git-send-email-pbonzini@redhat.com> In-Reply-To: <1363628125-5310-1-git-send-email-pbonzini@redhat.com> References: <1363628125-5310-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 10/35] hw: make all of hw/pci/ configurable via default-configs/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- default-configs/i386-softmmu.mak | 1 + default-configs/ppc64-softmmu.mak | 2 ++ default-configs/x86_64-softmmu.mak | 1 + hw/i386/Makefile.objs | 2 +- hw/pci/Makefile.objs | 1 + hw/ppc/Makefile.objs | 2 +- 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 03e4a04..55ba175 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -27,3 +27,4 @@ CONFIG_APPLESMC=y CONFIG_I8259=y CONFIG_PFLASH_CFI01=y CONFIG_TPM_TIS=y +CONFIG_PCI_HOTPLUG=y diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index ee895e9..26f74b0 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -42,3 +42,5 @@ CONFIG_I8259=y CONFIG_XILINX=y CONFIG_PSERIES=$(CONFIG_FDT) CONFIG_E500=$(CONFIG_FDT) +# For pSeries +CONFIG_PCI_HOTPLUG=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index d4bc265..b5c9d46 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -27,3 +27,4 @@ CONFIG_APPLESMC=y CONFIG_I8259=y CONFIG_PFLASH_CFI01=y CONFIG_TPM_TIS=y +CONFIG_PCI_HOTPLUG=y diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index a78c0b2..c813b1e 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -2,7 +2,7 @@ obj-y += mc146818rtc.o obj-y += apic_common.o apic.o obj-y += sga.o ioapic_common.o ioapic.o piix_pci.o obj-y += vmport.o -obj-y += pci/pci-hotplug.o wdt_ib700.o +obj-y += wdt_ib700.o obj-y += debugcon.o debugexit.o obj-y += pc_sysfw.o obj-y += lpc_ich9.o q35.o diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs index 44b2185..f319cc9 100644 --- a/hw/pci/Makefile.objs +++ b/hw/pci/Makefile.objs @@ -26,3 +26,4 @@ common-obj-$(CONFIG_PPCE500_PCI) += host-ppce500.o # ARM devices common-obj-$(CONFIG_VERSATILE_PCI) += host-versatile.o +obj-$(CONFIG_PCI_HOTPLUG) += pci-hotplug.o diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 4de0209..ef1d9ed 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -2,7 +2,7 @@ obj-y += mc146818rtc.o # IBM pSeries (sPAPR) obj-$(CONFIG_PSERIES) += spapr_vty.o spapr_llan.o spapr_vscsi.o -obj-$(CONFIG_PSERIES) += spapr_pci.o pci/pci-hotplug.o +obj-$(CONFIG_PSERIES) += spapr_pci.o obj-$(CONFIG_PSERIES) += spapr_nvram.o # PowerPC 4xx boards obj-y += ppc4xx_pci.o -- 1.8.1.4