From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=60660 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PMHkK-0002eD-CB for qemu-devel@nongnu.org; Sat, 27 Nov 2010 05:11:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PMHkI-0005HZ-Jx for qemu-devel@nongnu.org; Sat, 27 Nov 2010 05:11:08 -0500 Received: from mail-pw0-f45.google.com ([209.85.160.45]:64787) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PMHkI-0005D8-B5 for qemu-devel@nongnu.org; Sat, 27 Nov 2010 05:11:06 -0500 Received: by pwj6 with SMTP id 6so596669pwj.4 for ; Sat, 27 Nov 2010 02:11:05 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <1290816459-31009-3-git-send-email-paul@codesourcery.com> References: <1290816459-31009-1-git-send-email-paul@codesourcery.com> <1290816459-31009-3-git-send-email-paul@codesourcery.com> From: Blue Swirl Date: Sat, 27 Nov 2010 10:10:45 +0000 Message-ID: Subject: Re: [Qemu-devel] [PATCH 2/3] PCI config include Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paul Brook Cc: qemu-devel@nongnu.org On Sat, Nov 27, 2010 at 12:07 AM, Paul Brook wrote: > Split PCI config options into a separate file > > Signed-off-by: Paul Brook > --- > =C2=A0Makefile.objs =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| =C2=A0 20 +++++++++++--------- > =C2=A0Makefile.target =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| =C2=A0 =C2=A04 ++-- > =C2=A0default-configs/arm-softmmu.mak =C2=A0 =C2=A0 =C2=A0 =C2=A0| =C2=A0= =C2=A03 +-- > =C2=A0default-configs/cris-softmmu.mak =C2=A0 =C2=A0 =C2=A0 | =C2=A0 =C2= =A02 +- > =C2=A0default-configs/i386-softmmu.mak =C2=A0 =C2=A0 =C2=A0 | =C2=A0 =C2= =A04 +--- > =C2=A0default-configs/m68k-softmmu.mak =C2=A0 =C2=A0 =C2=A0 | =C2=A0 =C2= =A02 +- > =C2=A0default-configs/microblaze-softmmu.mak | =C2=A0 =C2=A01 - > =C2=A0default-configs/mips-softmmu.mak =C2=A0 =C2=A0 =C2=A0 | =C2=A0 =C2= =A03 +-- > =C2=A0default-configs/mips64-softmmu.mak =C2=A0 =C2=A0 | =C2=A0 =C2=A03 += -- > =C2=A0default-configs/mips64el-softmmu.mak =C2=A0 | =C2=A0 =C2=A03 +-- > =C2=A0default-configs/mipsel-softmmu.mak =C2=A0 =C2=A0 | =C2=A0 =C2=A03 += -- > =C2=A0default-configs/ppc-softmmu.mak =C2=A0 =C2=A0 =C2=A0 =C2=A0| =C2=A0= =C2=A03 +-- > =C2=A0default-configs/ppc64-softmmu.mak =C2=A0 =C2=A0 =C2=A0| =C2=A0 =C2= =A03 +-- > =C2=A0default-configs/ppcemb-softmmu.mak =C2=A0 =C2=A0 | =C2=A0 =C2=A03 += -- > =C2=A0default-configs/sh4-softmmu.mak =C2=A0 =C2=A0 =C2=A0 =C2=A0| =C2=A0= =C2=A03 +-- > =C2=A0default-configs/sh4eb-softmmu.mak =C2=A0 =C2=A0 =C2=A0| =C2=A0 =C2= =A03 +-- > =C2=A0default-configs/sparc-softmmu.mak =C2=A0 =C2=A0 =C2=A0| =C2=A0 =C2= =A02 +- > =C2=A0default-configs/sparc64-softmmu.mak =C2=A0 =C2=A0| =C2=A0 =C2=A02 += - > =C2=A0default-configs/x86_64-softmmu.mak =C2=A0 =C2=A0 | =C2=A0 =C2=A04 += --- > =C2=A019 files changed, 29 insertions(+), 42 deletions(-) > > diff --git a/Makefile.objs b/Makefile.objs > index 4f4aba3..9e85b04 100644 > --- a/Makefile.objs > +++ b/Makefile.objs > @@ -161,8 +161,11 @@ hw-obj-y =3D > =C2=A0hw-obj-y +=3D vl.o loader.o > =C2=A0hw-obj-y +=3D virtio.o virtio-console.o > =C2=A0hw-obj-y +=3D fw_cfg.o > -hw-obj-$(CONFIG_PCI) +=3D pci.o pci_host.o pcie_host.o pci_bridge.o > -hw-obj-y +=3D ioh3420.o xio3130_upstream.o xio3130_downstream.o > +# FIXME: Core PCI code and its direct dependencies are required by the > +# QMP query-pci command. > +hw-obj-y +=3D pci.o pci_bridge.o msix.o msi.o > +hw-obj-$(CONFIG_PCI) +=3D pci_host.o pcie_host.o > +hw-obj-$(CONFIG_PCI) +=3D ioh3420.o xio3130_upstream.o xio3130_downstrea= m.o > =C2=A0hw-obj-y +=3D watchdog.o > =C2=A0hw-obj-$(CONFIG_ISA_MMIO) +=3D isa_mmio.o > =C2=A0hw-obj-$(CONFIG_ECC) +=3D ecc.o > @@ -207,15 +210,14 @@ hw-obj-$(CONFIG_PPCE500_PCI) +=3D ppce500_pci.o > =C2=A0hw-obj-$(CONFIG_PIIX4) +=3D piix4.o > > =C2=A0# PCI watchdog devices > -hw-obj-y +=3D wdt_i6300esb.o > +hw-obj-$(CONFIG_PCI) +=3D wdt_i6300esb.o > > -hw-obj-y +=3D pcie.o pcie_port.o > -hw-obj-y +=3D msix.o msi.o > +hw-obj-$(CONFIG_PCI) +=3D pcie.o pcie_port.o > > =C2=A0# PCI network cards > -hw-obj-y +=3D ne2000.o > -hw-obj-y +=3D eepro100.o > -hw-obj-y +=3D pcnet.o > +hw-obj-$(CONFIG_NE2000_PCI) +=3D ne2000.o > +hw-obj-$(CONFIG_EEPRO100_PCI) +=3D eepro100.o > +hw-obj-$(CONFIG_PCNET_PCI) +=3D pcnet.o > > =C2=A0hw-obj-$(CONFIG_SMC91C111) +=3D smc91c111.o > =C2=A0hw-obj-$(CONFIG_LAN9118) +=3D lan9118.o > @@ -232,7 +234,7 @@ hw-obj-$(CONFIG_IDE_MACIO) +=3D ide/macio.o > =C2=A0hw-obj-$(CONFIG_IDE_VIA) +=3D ide/via.o > > =C2=A0# SCSI layer > -hw-obj-y +=3D lsi53c895a.o > +hw-obj-$(CONFIG_LSI_SCSI_PCI) +=3D lsi53c895a.o > =C2=A0hw-obj-$(CONFIG_ESP) +=3D esp.o > > =C2=A0hw-obj-y +=3D dma-helpers.o sysbus.o isa-bus.o > diff --git a/Makefile.target b/Makefile.target > index 2800f47..853045a 100644 > --- a/Makefile.target > +++ b/Makefile.target > @@ -210,8 +210,8 @@ obj-$(CONFIG_XEN) +=3D xen_machine_pv.o xen_domainbui= ld.o > =C2=A0obj-$(CONFIG_USB_OHCI) +=3D usb-ohci.o > > =C2=A0# PCI network cards > -obj-y +=3D rtl8139.o > -obj-y +=3D e1000.o > +obj-$(CONFIG_RTL8139_PCI) +=3D rtl8139.o > +obj-$(CONFIG_E1000_PCI) +=3D e1000.o > > =C2=A0# Inter-VM PCI shared memory > =C2=A0obj-$(CONFIG_KVM) +=3D ivshmem.o > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmm= u.mak > index e7a4e84..ac48dc1 100644 > --- a/default-configs/arm-softmmu.mak > +++ b/default-configs/arm-softmmu.mak > @@ -1,7 +1,7 @@ > =C2=A0# Default configuration for arm-softmmu > > +include pci.mak > =C2=A0CONFIG_GDBSTUB_XML=3Dy > -CONFIG_USB_OHCI=3Dy > =C2=A0CONFIG_ISA_MMIO=3Dy > =C2=A0CONFIG_NAND=3Dy > =C2=A0CONFIG_ECC=3Dy > @@ -25,6 +25,5 @@ CONFIG_SSI_SD=3Dy > =C2=A0CONFIG_LAN9118=3Dy > =C2=A0CONFIG_SMC91C111=3Dy > =C2=A0CONFIG_DS1338=3Dy > -CONFIG_VIRTIO_PCI=3Dy > =C2=A0CONFIG_PFLASH_CFI01=3Dy > =C2=A0CONFIG_PFLASH_CFI02=3Dy > diff --git a/default-configs/cris-softmmu.mak b/default-configs/cris-soft= mmu.mak > index e0d2cab..5f1fd1e 100644 > --- a/default-configs/cris-softmmu.mak > +++ b/default-configs/cris-softmmu.mak > @@ -1,6 +1,6 @@ > =C2=A0# Default configuration for cris-softmmu > > +#include pci.mak > =C2=A0CONFIG_NAND=3Dy > =C2=A0CONFIG_PTIMER=3Dy > -CONFIG_VIRTIO_PCI=3Dy > =C2=A0CONFIG_PFLASH_CFI02=3Dy > diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-soft= mmu.mak > index ed00471..ce905d2 100644 > --- a/default-configs/i386-softmmu.mak > +++ b/default-configs/i386-softmmu.mak > @@ -1,6 +1,6 @@ > =C2=A0# Default configuration for i386-softmmu > > -CONFIG_USB_OHCI=3Dy > +include pci.mak > =C2=A0CONFIG_VGA_PCI=3Dy > =C2=A0CONFIG_VGA_ISA=3Dy > =C2=A0CONFIG_VMWARE_VGA=3Dy > @@ -9,7 +9,6 @@ CONFIG_PARALLEL=3Dy > =C2=A0CONFIG_I8254=3Dy > =C2=A0CONFIG_PCSPK=3Dy > =C2=A0CONFIG_PCKBD=3Dy > -CONFIG_USB_UHCI=3Dy > =C2=A0CONFIG_FDC=3Dy > =C2=A0CONFIG_ACPI=3Dy > =C2=A0CONFIG_APM=3Dy > @@ -22,4 +21,3 @@ CONFIG_IDE_PIIX=3Dy > =C2=A0CONFIG_NE2000_ISA=3Dy > =C2=A0CONFIG_PIIX_PCI=3Dy > =C2=A0CONFIG_SOUND=3Dy > -CONFIG_VIRTIO_PCI=3Dy > diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-soft= mmu.mak > index 69ca3ed..3e2ec37 100644 > --- a/default-configs/m68k-softmmu.mak > +++ b/default-configs/m68k-softmmu.mak > @@ -1,5 +1,5 @@ > =C2=A0# Default configuration for m68k-softmmu > > +include pci.mak > =C2=A0CONFIG_GDBSTUB_XML=3Dy > =C2=A0CONFIG_PTIMER=3Dy > -CONFIG_VIRTIO_PCI=3Dy > diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/mic= roblaze-softmmu.mak > index 6c4f4f2..4399b8b 100644 > --- a/default-configs/microblaze-softmmu.mak > +++ b/default-configs/microblaze-softmmu.mak > @@ -1,5 +1,4 @@ > =C2=A0# Default configuration for microblaze-softmmu > > =C2=A0CONFIG_PTIMER=3Dy > -CONFIG_VIRTIO_PCI=3Dy > =C2=A0CONFIG_PFLASH_CFI01=3Dy > diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-soft= mmu.mak > index 3d0af83..565e611 100644 > --- a/default-configs/mips-softmmu.mak > +++ b/default-configs/mips-softmmu.mak > @@ -1,5 +1,6 @@ > =C2=A0# Default configuration for mips-softmmu > > +include pci.mak > =C2=A0CONFIG_ISA_MMIO=3Dy > =C2=A0CONFIG_ESP=3Dy > =C2=A0CONFIG_VGA_PCI=3Dy > @@ -11,7 +12,6 @@ CONFIG_PARALLEL=3Dy > =C2=A0CONFIG_I8254=3Dy > =C2=A0CONFIG_PCSPK=3Dy > =C2=A0CONFIG_PCKBD=3Dy > -CONFIG_USB_UHCI=3Dy > =C2=A0CONFIG_FDC=3Dy > =C2=A0CONFIG_ACPI=3Dy > =C2=A0CONFIG_APM=3Dy > @@ -24,7 +24,6 @@ CONFIG_IDE_ISA=3Dy > =C2=A0CONFIG_IDE_PIIX=3Dy > =C2=A0CONFIG_NE2000_ISA=3Dy > =C2=A0CONFIG_SOUND=3Dy > -CONFIG_VIRTIO_PCI=3Dy > =C2=A0CONFIG_RC4030=3Dy > =C2=A0CONFIG_DP8393X=3Dy > =C2=A0CONFIG_DS1225Y=3Dy > diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-= softmmu.mak > index 0030de4..03bd8eb 100644 > --- a/default-configs/mips64-softmmu.mak > +++ b/default-configs/mips64-softmmu.mak > @@ -1,5 +1,6 @@ > =C2=A0# Default configuration for mips64-softmmu > > +include pci.mak > =C2=A0CONFIG_ISA_MMIO=3Dy > =C2=A0CONFIG_ESP=3Dy > =C2=A0CONFIG_VGA_PCI=3Dy > @@ -11,7 +12,6 @@ CONFIG_PARALLEL=3Dy > =C2=A0CONFIG_I8254=3Dy > =C2=A0CONFIG_PCSPK=3Dy > =C2=A0CONFIG_PCKBD=3Dy > -CONFIG_USB_UHCI=3Dy > =C2=A0CONFIG_FDC=3Dy > =C2=A0CONFIG_ACPI=3Dy > =C2=A0CONFIG_APM=3Dy > @@ -24,7 +24,6 @@ CONFIG_IDE_ISA=3Dy > =C2=A0CONFIG_IDE_PIIX=3Dy > =C2=A0CONFIG_NE2000_ISA=3Dy > =C2=A0CONFIG_SOUND=3Dy > -CONFIG_VIRTIO_PCI=3Dy > =C2=A0CONFIG_RC4030=3Dy > =C2=A0CONFIG_DP8393X=3Dy > =C2=A0CONFIG_DS1225Y=3Dy > diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips6= 4el-softmmu.mak > index fa2a3ff..4661617 100644 > --- a/default-configs/mips64el-softmmu.mak > +++ b/default-configs/mips64el-softmmu.mak > @@ -1,5 +1,6 @@ > =C2=A0# Default configuration for mips64el-softmmu > > +include pci.mak > =C2=A0CONFIG_ISA_MMIO=3Dy > =C2=A0CONFIG_ESP=3Dy > =C2=A0CONFIG_VGA_PCI=3Dy > @@ -11,7 +12,6 @@ CONFIG_PARALLEL=3Dy > =C2=A0CONFIG_I8254=3Dy > =C2=A0CONFIG_PCSPK=3Dy > =C2=A0CONFIG_PCKBD=3Dy > -CONFIG_USB_UHCI=3Dy > =C2=A0CONFIG_FDC=3Dy > =C2=A0CONFIG_ACPI=3Dy > =C2=A0CONFIG_APM=3Dy > @@ -25,7 +25,6 @@ CONFIG_IDE_PIIX=3Dy > =C2=A0CONFIG_IDE_VIA=3Dy > =C2=A0CONFIG_NE2000_ISA=3Dy > =C2=A0CONFIG_SOUND=3Dy > -CONFIG_VIRTIO_PCI=3Dy > =C2=A0CONFIG_RC4030=3Dy > =C2=A0CONFIG_DP8393X=3Dy > =C2=A0CONFIG_DS1225Y=3Dy > diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-= softmmu.mak > index 238b73a..92fc473 100644 > --- a/default-configs/mipsel-softmmu.mak > +++ b/default-configs/mipsel-softmmu.mak > @@ -1,5 +1,6 @@ > =C2=A0# Default configuration for mipsel-softmmu > > +include pci.mak > =C2=A0CONFIG_ISA_MMIO=3Dy > =C2=A0CONFIG_ESP=3Dy > =C2=A0CONFIG_VGA_PCI=3Dy > @@ -11,7 +12,6 @@ CONFIG_PARALLEL=3Dy > =C2=A0CONFIG_I8254=3Dy > =C2=A0CONFIG_PCSPK=3Dy > =C2=A0CONFIG_PCKBD=3Dy > -CONFIG_USB_UHCI=3Dy > =C2=A0CONFIG_FDC=3Dy > =C2=A0CONFIG_ACPI=3Dy > =C2=A0CONFIG_APM=3Dy > @@ -24,7 +24,6 @@ CONFIG_IDE_ISA=3Dy > =C2=A0CONFIG_IDE_PIIX=3Dy > =C2=A0CONFIG_NE2000_ISA=3Dy > =C2=A0CONFIG_SOUND=3Dy > -CONFIG_VIRTIO_PCI=3Dy > =C2=A0CONFIG_RC4030=3Dy > =C2=A0CONFIG_DP8393X=3Dy > =C2=A0CONFIG_DS1225Y=3Dy > diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmm= u.mak > index 940f4bf..f1cb99e 100644 > --- a/default-configs/ppc-softmmu.mak > +++ b/default-configs/ppc-softmmu.mak > @@ -1,7 +1,7 @@ > =C2=A0# Default configuration for ppc-softmmu > > +include pci.mak > =C2=A0CONFIG_GDBSTUB_XML=3Dy > -CONFIG_USB_OHCI=3Dy > =C2=A0CONFIG_ISA_MMIO=3Dy > =C2=A0CONFIG_ESCC=3Dy > =C2=A0CONFIG_M48T59=3Dy > @@ -31,7 +31,6 @@ CONFIG_IDE_CMD646=3Dy > =C2=A0CONFIG_IDE_MACIO=3Dy > =C2=A0CONFIG_NE2000_ISA=3Dy > =C2=A0CONFIG_SOUND=3Dy > -CONFIG_VIRTIO_PCI=3Dy > =C2=A0CONFIG_PFLASH_CFI01=3Dy > =C2=A0CONFIG_PFLASH_CFI02=3Dy > =C2=A0CONFIG_PTIMER=3Dy > diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-so= ftmmu.mak > index e1bc6b8..83cbe97 100644 > --- a/default-configs/ppc64-softmmu.mak > +++ b/default-configs/ppc64-softmmu.mak > @@ -1,7 +1,7 @@ > =C2=A0# Default configuration for ppc64-softmmu > > +include pci.mak > =C2=A0CONFIG_GDBSTUB_XML=3Dy > -CONFIG_USB_OHCI=3Dy > =C2=A0CONFIG_ISA_MMIO=3Dy > =C2=A0CONFIG_ESCC=3Dy > =C2=A0CONFIG_M48T59=3Dy > @@ -31,7 +31,6 @@ CONFIG_IDE_CMD646=3Dy > =C2=A0CONFIG_IDE_MACIO=3Dy > =C2=A0CONFIG_NE2000_ISA=3Dy > =C2=A0CONFIG_SOUND=3Dy > -CONFIG_VIRTIO_PCI=3Dy > =C2=A0CONFIG_PFLASH_CFI01=3Dy > =C2=A0CONFIG_PFLASH_CFI02=3Dy > =C2=A0CONFIG_PTIMER=3Dy > diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-= softmmu.mak > index 8f1cc09..2b52d4a 100644 > --- a/default-configs/ppcemb-softmmu.mak > +++ b/default-configs/ppcemb-softmmu.mak > @@ -1,7 +1,7 @@ > =C2=A0# Default configuration for ppcemb-softmmu > > +include pci.mak > =C2=A0CONFIG_GDBSTUB_XML=3Dy > -CONFIG_USB_OHCI=3Dy > =C2=A0CONFIG_ISA_MMIO=3Dy > =C2=A0CONFIG_ESCC=3Dy > =C2=A0CONFIG_M48T59=3Dy > @@ -31,7 +31,6 @@ CONFIG_IDE_CMD646=3Dy > =C2=A0CONFIG_IDE_MACIO=3Dy > =C2=A0CONFIG_NE2000_ISA=3Dy > =C2=A0CONFIG_SOUND=3Dy > -CONFIG_VIRTIO_PCI=3Dy > =C2=A0CONFIG_PFLASH_CFI01=3Dy > =C2=A0CONFIG_PFLASH_CFI02=3Dy > =C2=A0CONFIG_PTIMER=3Dy > diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmm= u.mak > index 866ed7d..87247a4 100644 > --- a/default-configs/sh4-softmmu.mak > +++ b/default-configs/sh4-softmmu.mak > @@ -1,9 +1,8 @@ > =C2=A0# Default configuration for sh4-softmmu > > -CONFIG_USB_OHCI=3Dy > +include pci.mak > =C2=A0CONFIG_SERIAL=3Dy > =C2=A0CONFIG_PTIMER=3Dy > -CONFIG_VIRTIO_PCI=3Dy > =C2=A0CONFIG_IDE_CORE=3Dy > =C2=A0CONFIG_PFLASH_CFI02=3Dy > =C2=A0CONFIG_ISA_MMIO=3Dy > diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-so= ftmmu.mak > index e3e08b7..5b8a16e 100644 > --- a/default-configs/sh4eb-softmmu.mak > +++ b/default-configs/sh4eb-softmmu.mak > @@ -1,9 +1,8 @@ > =C2=A0# Default configuration for sh4eb-softmmu > > -CONFIG_USB_OHCI=3Dy > +include pci.mak > =C2=A0CONFIG_SERIAL=3Dy > =C2=A0CONFIG_PTIMER=3Dy > -CONFIG_VIRTIO_PCI=3Dy > =C2=A0CONFIG_IDE_CORE=3Dy > =C2=A0CONFIG_PFLASH_CFI02=3Dy > =C2=A0CONFIG_ISA_MMIO=3Dy > diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-so= ftmmu.mak > index becf880..7c788b8 100644 > --- a/default-configs/sparc-softmmu.mak > +++ b/default-configs/sparc-softmmu.mak > @@ -1,10 +1,10 @@ > =C2=A0# Default configuration for sparc-softmmu > > +include pci.mak None of the Sparc32 boards we emulate have PCI, so please remove the line.