Patchwork [2/3] PCI config include

login
register
mail settings
Submitter Paul Brook
Date Nov. 27, 2010, 12:07 a.m.
Message ID <1290816459-31009-3-git-send-email-paul@codesourcery.com>
Download mbox | patch
Permalink /patch/73253/
State New
Headers show

Comments

Paul Brook - Nov. 27, 2010, 12:07 a.m.
Split PCI config options into a separate file

Signed-off-by: Paul Brook <paul@codesourcery.com>
---
 Makefile.objs                          |   20 +++++++++++---------
 Makefile.target                        |    4 ++--
 default-configs/arm-softmmu.mak        |    3 +--
 default-configs/cris-softmmu.mak       |    2 +-
 default-configs/i386-softmmu.mak       |    4 +---
 default-configs/m68k-softmmu.mak       |    2 +-
 default-configs/microblaze-softmmu.mak |    1 -
 default-configs/mips-softmmu.mak       |    3 +--
 default-configs/mips64-softmmu.mak     |    3 +--
 default-configs/mips64el-softmmu.mak   |    3 +--
 default-configs/mipsel-softmmu.mak     |    3 +--
 default-configs/ppc-softmmu.mak        |    3 +--
 default-configs/ppc64-softmmu.mak      |    3 +--
 default-configs/ppcemb-softmmu.mak     |    3 +--
 default-configs/sh4-softmmu.mak        |    3 +--
 default-configs/sh4eb-softmmu.mak      |    3 +--
 default-configs/sparc-softmmu.mak      |    2 +-
 default-configs/sparc64-softmmu.mak    |    2 +-
 default-configs/x86_64-softmmu.mak     |    4 +---
 19 files changed, 29 insertions(+), 42 deletions(-)
Blue Swirl - Nov. 27, 2010, 10:10 a.m.
On Sat, Nov 27, 2010 at 12:07 AM, Paul Brook <paul@codesourcery.com> wrote:
> Split PCI config options into a separate file
>
> Signed-off-by: Paul Brook <paul@codesourcery.com>
> ---
>  Makefile.objs                          |   20 +++++++++++---------
>  Makefile.target                        |    4 ++--
>  default-configs/arm-softmmu.mak        |    3 +--
>  default-configs/cris-softmmu.mak       |    2 +-
>  default-configs/i386-softmmu.mak       |    4 +---
>  default-configs/m68k-softmmu.mak       |    2 +-
>  default-configs/microblaze-softmmu.mak |    1 -
>  default-configs/mips-softmmu.mak       |    3 +--
>  default-configs/mips64-softmmu.mak     |    3 +--
>  default-configs/mips64el-softmmu.mak   |    3 +--
>  default-configs/mipsel-softmmu.mak     |    3 +--
>  default-configs/ppc-softmmu.mak        |    3 +--
>  default-configs/ppc64-softmmu.mak      |    3 +--
>  default-configs/ppcemb-softmmu.mak     |    3 +--
>  default-configs/sh4-softmmu.mak        |    3 +--
>  default-configs/sh4eb-softmmu.mak      |    3 +--
>  default-configs/sparc-softmmu.mak      |    2 +-
>  default-configs/sparc64-softmmu.mak    |    2 +-
>  default-configs/x86_64-softmmu.mak     |    4 +---
>  19 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 =
>  hw-obj-y += vl.o loader.o
>  hw-obj-y += virtio.o virtio-console.o
>  hw-obj-y += fw_cfg.o
> -hw-obj-$(CONFIG_PCI) += pci.o pci_host.o pcie_host.o pci_bridge.o
> -hw-obj-y += 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 += pci.o pci_bridge.o msix.o msi.o
> +hw-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o
> +hw-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o
>  hw-obj-y += watchdog.o
>  hw-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o
>  hw-obj-$(CONFIG_ECC) += ecc.o
> @@ -207,15 +210,14 @@ hw-obj-$(CONFIG_PPCE500_PCI) += ppce500_pci.o
>  hw-obj-$(CONFIG_PIIX4) += piix4.o
>
>  # PCI watchdog devices
> -hw-obj-y += wdt_i6300esb.o
> +hw-obj-$(CONFIG_PCI) += wdt_i6300esb.o
>
> -hw-obj-y += pcie.o pcie_port.o
> -hw-obj-y += msix.o msi.o
> +hw-obj-$(CONFIG_PCI) += pcie.o pcie_port.o
>
>  # PCI network cards
> -hw-obj-y += ne2000.o
> -hw-obj-y += eepro100.o
> -hw-obj-y += pcnet.o
> +hw-obj-$(CONFIG_NE2000_PCI) += ne2000.o
> +hw-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o
> +hw-obj-$(CONFIG_PCNET_PCI) += pcnet.o
>
>  hw-obj-$(CONFIG_SMC91C111) += smc91c111.o
>  hw-obj-$(CONFIG_LAN9118) += lan9118.o
> @@ -232,7 +234,7 @@ hw-obj-$(CONFIG_IDE_MACIO) += ide/macio.o
>  hw-obj-$(CONFIG_IDE_VIA) += ide/via.o
>
>  # SCSI layer
> -hw-obj-y += lsi53c895a.o
> +hw-obj-$(CONFIG_LSI_SCSI_PCI) += lsi53c895a.o
>  hw-obj-$(CONFIG_ESP) += esp.o
>
>  hw-obj-y += 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) += xen_machine_pv.o xen_domainbuild.o
>  obj-$(CONFIG_USB_OHCI) += usb-ohci.o
>
>  # PCI network cards
> -obj-y += rtl8139.o
> -obj-y += e1000.o
> +obj-$(CONFIG_RTL8139_PCI) += rtl8139.o
> +obj-$(CONFIG_E1000_PCI) += e1000.o
>
>  # Inter-VM PCI shared memory
>  obj-$(CONFIG_KVM) += ivshmem.o
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index e7a4e84..ac48dc1 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -1,7 +1,7 @@
>  # Default configuration for arm-softmmu
>
> +include pci.mak
>  CONFIG_GDBSTUB_XML=y
> -CONFIG_USB_OHCI=y
>  CONFIG_ISA_MMIO=y
>  CONFIG_NAND=y
>  CONFIG_ECC=y
> @@ -25,6 +25,5 @@ CONFIG_SSI_SD=y
>  CONFIG_LAN9118=y
>  CONFIG_SMC91C111=y
>  CONFIG_DS1338=y
> -CONFIG_VIRTIO_PCI=y
>  CONFIG_PFLASH_CFI01=y
>  CONFIG_PFLASH_CFI02=y
> diff --git a/default-configs/cris-softmmu.mak b/default-configs/cris-softmmu.mak
> index e0d2cab..5f1fd1e 100644
> --- a/default-configs/cris-softmmu.mak
> +++ b/default-configs/cris-softmmu.mak
> @@ -1,6 +1,6 @@
>  # Default configuration for cris-softmmu
>
> +#include pci.mak
>  CONFIG_NAND=y
>  CONFIG_PTIMER=y
> -CONFIG_VIRTIO_PCI=y
>  CONFIG_PFLASH_CFI02=y
> diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
> index ed00471..ce905d2 100644
> --- a/default-configs/i386-softmmu.mak
> +++ b/default-configs/i386-softmmu.mak
> @@ -1,6 +1,6 @@
>  # Default configuration for i386-softmmu
>
> -CONFIG_USB_OHCI=y
> +include pci.mak
>  CONFIG_VGA_PCI=y
>  CONFIG_VGA_ISA=y
>  CONFIG_VMWARE_VGA=y
> @@ -9,7 +9,6 @@ CONFIG_PARALLEL=y
>  CONFIG_I8254=y
>  CONFIG_PCSPK=y
>  CONFIG_PCKBD=y
> -CONFIG_USB_UHCI=y
>  CONFIG_FDC=y
>  CONFIG_ACPI=y
>  CONFIG_APM=y
> @@ -22,4 +21,3 @@ CONFIG_IDE_PIIX=y
>  CONFIG_NE2000_ISA=y
>  CONFIG_PIIX_PCI=y
>  CONFIG_SOUND=y
> -CONFIG_VIRTIO_PCI=y
> diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak
> index 69ca3ed..3e2ec37 100644
> --- a/default-configs/m68k-softmmu.mak
> +++ b/default-configs/m68k-softmmu.mak
> @@ -1,5 +1,5 @@
>  # Default configuration for m68k-softmmu
>
> +include pci.mak
>  CONFIG_GDBSTUB_XML=y
>  CONFIG_PTIMER=y
> -CONFIG_VIRTIO_PCI=y
> diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/microblaze-softmmu.mak
> index 6c4f4f2..4399b8b 100644
> --- a/default-configs/microblaze-softmmu.mak
> +++ b/default-configs/microblaze-softmmu.mak
> @@ -1,5 +1,4 @@
>  # Default configuration for microblaze-softmmu
>
>  CONFIG_PTIMER=y
> -CONFIG_VIRTIO_PCI=y
>  CONFIG_PFLASH_CFI01=y
> diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak
> index 3d0af83..565e611 100644
> --- a/default-configs/mips-softmmu.mak
> +++ b/default-configs/mips-softmmu.mak
> @@ -1,5 +1,6 @@
>  # Default configuration for mips-softmmu
>
> +include pci.mak
>  CONFIG_ISA_MMIO=y
>  CONFIG_ESP=y
>  CONFIG_VGA_PCI=y
> @@ -11,7 +12,6 @@ CONFIG_PARALLEL=y
>  CONFIG_I8254=y
>  CONFIG_PCSPK=y
>  CONFIG_PCKBD=y
> -CONFIG_USB_UHCI=y
>  CONFIG_FDC=y
>  CONFIG_ACPI=y
>  CONFIG_APM=y
> @@ -24,7 +24,6 @@ CONFIG_IDE_ISA=y
>  CONFIG_IDE_PIIX=y
>  CONFIG_NE2000_ISA=y
>  CONFIG_SOUND=y
> -CONFIG_VIRTIO_PCI=y
>  CONFIG_RC4030=y
>  CONFIG_DP8393X=y
>  CONFIG_DS1225Y=y
> 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 @@
>  # Default configuration for mips64-softmmu
>
> +include pci.mak
>  CONFIG_ISA_MMIO=y
>  CONFIG_ESP=y
>  CONFIG_VGA_PCI=y
> @@ -11,7 +12,6 @@ CONFIG_PARALLEL=y
>  CONFIG_I8254=y
>  CONFIG_PCSPK=y
>  CONFIG_PCKBD=y
> -CONFIG_USB_UHCI=y
>  CONFIG_FDC=y
>  CONFIG_ACPI=y
>  CONFIG_APM=y
> @@ -24,7 +24,6 @@ CONFIG_IDE_ISA=y
>  CONFIG_IDE_PIIX=y
>  CONFIG_NE2000_ISA=y
>  CONFIG_SOUND=y
> -CONFIG_VIRTIO_PCI=y
>  CONFIG_RC4030=y
>  CONFIG_DP8393X=y
>  CONFIG_DS1225Y=y
> diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
> index fa2a3ff..4661617 100644
> --- a/default-configs/mips64el-softmmu.mak
> +++ b/default-configs/mips64el-softmmu.mak
> @@ -1,5 +1,6 @@
>  # Default configuration for mips64el-softmmu
>
> +include pci.mak
>  CONFIG_ISA_MMIO=y
>  CONFIG_ESP=y
>  CONFIG_VGA_PCI=y
> @@ -11,7 +12,6 @@ CONFIG_PARALLEL=y
>  CONFIG_I8254=y
>  CONFIG_PCSPK=y
>  CONFIG_PCKBD=y
> -CONFIG_USB_UHCI=y
>  CONFIG_FDC=y
>  CONFIG_ACPI=y
>  CONFIG_APM=y
> @@ -25,7 +25,6 @@ CONFIG_IDE_PIIX=y
>  CONFIG_IDE_VIA=y
>  CONFIG_NE2000_ISA=y
>  CONFIG_SOUND=y
> -CONFIG_VIRTIO_PCI=y
>  CONFIG_RC4030=y
>  CONFIG_DP8393X=y
>  CONFIG_DS1225Y=y
> 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 @@
>  # Default configuration for mipsel-softmmu
>
> +include pci.mak
>  CONFIG_ISA_MMIO=y
>  CONFIG_ESP=y
>  CONFIG_VGA_PCI=y
> @@ -11,7 +12,6 @@ CONFIG_PARALLEL=y
>  CONFIG_I8254=y
>  CONFIG_PCSPK=y
>  CONFIG_PCKBD=y
> -CONFIG_USB_UHCI=y
>  CONFIG_FDC=y
>  CONFIG_ACPI=y
>  CONFIG_APM=y
> @@ -24,7 +24,6 @@ CONFIG_IDE_ISA=y
>  CONFIG_IDE_PIIX=y
>  CONFIG_NE2000_ISA=y
>  CONFIG_SOUND=y
> -CONFIG_VIRTIO_PCI=y
>  CONFIG_RC4030=y
>  CONFIG_DP8393X=y
>  CONFIG_DS1225Y=y
> diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
> index 940f4bf..f1cb99e 100644
> --- a/default-configs/ppc-softmmu.mak
> +++ b/default-configs/ppc-softmmu.mak
> @@ -1,7 +1,7 @@
>  # Default configuration for ppc-softmmu
>
> +include pci.mak
>  CONFIG_GDBSTUB_XML=y
> -CONFIG_USB_OHCI=y
>  CONFIG_ISA_MMIO=y
>  CONFIG_ESCC=y
>  CONFIG_M48T59=y
> @@ -31,7 +31,6 @@ CONFIG_IDE_CMD646=y
>  CONFIG_IDE_MACIO=y
>  CONFIG_NE2000_ISA=y
>  CONFIG_SOUND=y
> -CONFIG_VIRTIO_PCI=y
>  CONFIG_PFLASH_CFI01=y
>  CONFIG_PFLASH_CFI02=y
>  CONFIG_PTIMER=y
> diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
> index e1bc6b8..83cbe97 100644
> --- a/default-configs/ppc64-softmmu.mak
> +++ b/default-configs/ppc64-softmmu.mak
> @@ -1,7 +1,7 @@
>  # Default configuration for ppc64-softmmu
>
> +include pci.mak
>  CONFIG_GDBSTUB_XML=y
> -CONFIG_USB_OHCI=y
>  CONFIG_ISA_MMIO=y
>  CONFIG_ESCC=y
>  CONFIG_M48T59=y
> @@ -31,7 +31,6 @@ CONFIG_IDE_CMD646=y
>  CONFIG_IDE_MACIO=y
>  CONFIG_NE2000_ISA=y
>  CONFIG_SOUND=y
> -CONFIG_VIRTIO_PCI=y
>  CONFIG_PFLASH_CFI01=y
>  CONFIG_PFLASH_CFI02=y
>  CONFIG_PTIMER=y
> 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 @@
>  # Default configuration for ppcemb-softmmu
>
> +include pci.mak
>  CONFIG_GDBSTUB_XML=y
> -CONFIG_USB_OHCI=y
>  CONFIG_ISA_MMIO=y
>  CONFIG_ESCC=y
>  CONFIG_M48T59=y
> @@ -31,7 +31,6 @@ CONFIG_IDE_CMD646=y
>  CONFIG_IDE_MACIO=y
>  CONFIG_NE2000_ISA=y
>  CONFIG_SOUND=y
> -CONFIG_VIRTIO_PCI=y
>  CONFIG_PFLASH_CFI01=y
>  CONFIG_PFLASH_CFI02=y
>  CONFIG_PTIMER=y
> diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
> index 866ed7d..87247a4 100644
> --- a/default-configs/sh4-softmmu.mak
> +++ b/default-configs/sh4-softmmu.mak
> @@ -1,9 +1,8 @@
>  # Default configuration for sh4-softmmu
>
> -CONFIG_USB_OHCI=y
> +include pci.mak
>  CONFIG_SERIAL=y
>  CONFIG_PTIMER=y
> -CONFIG_VIRTIO_PCI=y
>  CONFIG_IDE_CORE=y
>  CONFIG_PFLASH_CFI02=y
>  CONFIG_ISA_MMIO=y
> diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak
> index e3e08b7..5b8a16e 100644
> --- a/default-configs/sh4eb-softmmu.mak
> +++ b/default-configs/sh4eb-softmmu.mak
> @@ -1,9 +1,8 @@
>  # Default configuration for sh4eb-softmmu
>
> -CONFIG_USB_OHCI=y
> +include pci.mak
>  CONFIG_SERIAL=y
>  CONFIG_PTIMER=y
> -CONFIG_VIRTIO_PCI=y
>  CONFIG_IDE_CORE=y
>  CONFIG_PFLASH_CFI02=y
>  CONFIG_ISA_MMIO=y
> diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
> index becf880..7c788b8 100644
> --- a/default-configs/sparc-softmmu.mak
> +++ b/default-configs/sparc-softmmu.mak
> @@ -1,10 +1,10 @@
>  # Default configuration for sparc-softmmu
>
> +include pci.mak

None of the Sparc32 boards we emulate have PCI, so please remove the line.
Paul Brook - Nov. 27, 2010, 10:50 a.m.
> > diff --git a/default-configs/sparc-softmmu.mak
> > b/default-configs/sparc-softmmu.mak index becf880..7c788b8 100644
> > --- a/default-configs/sparc-softmmu.mak
> > +++ b/default-configs/sparc-softmmu.mak
> > @@ -1,10 +1,10 @@
> >  # Default configuration for sparc-softmmu
> > 
> > +include pci.mak
> 
> None of the Sparc32 boards we emulate have PCI, so please remove the line.

Done (129cac5).  I was erring on the side of keeping the behavior the same for 
targets where I wasn't entirely sure.

Paul

Patch

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 =
 hw-obj-y += vl.o loader.o
 hw-obj-y += virtio.o virtio-console.o
 hw-obj-y += fw_cfg.o
-hw-obj-$(CONFIG_PCI) += pci.o pci_host.o pcie_host.o pci_bridge.o
-hw-obj-y += 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 += pci.o pci_bridge.o msix.o msi.o
+hw-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o
+hw-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o
 hw-obj-y += watchdog.o
 hw-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o
 hw-obj-$(CONFIG_ECC) += ecc.o
@@ -207,15 +210,14 @@  hw-obj-$(CONFIG_PPCE500_PCI) += ppce500_pci.o
 hw-obj-$(CONFIG_PIIX4) += piix4.o
 
 # PCI watchdog devices
-hw-obj-y += wdt_i6300esb.o
+hw-obj-$(CONFIG_PCI) += wdt_i6300esb.o
 
-hw-obj-y += pcie.o pcie_port.o
-hw-obj-y += msix.o msi.o
+hw-obj-$(CONFIG_PCI) += pcie.o pcie_port.o
 
 # PCI network cards
-hw-obj-y += ne2000.o
-hw-obj-y += eepro100.o
-hw-obj-y += pcnet.o
+hw-obj-$(CONFIG_NE2000_PCI) += ne2000.o
+hw-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o
+hw-obj-$(CONFIG_PCNET_PCI) += pcnet.o
 
 hw-obj-$(CONFIG_SMC91C111) += smc91c111.o
 hw-obj-$(CONFIG_LAN9118) += lan9118.o
@@ -232,7 +234,7 @@  hw-obj-$(CONFIG_IDE_MACIO) += ide/macio.o
 hw-obj-$(CONFIG_IDE_VIA) += ide/via.o
 
 # SCSI layer
-hw-obj-y += lsi53c895a.o
+hw-obj-$(CONFIG_LSI_SCSI_PCI) += lsi53c895a.o
 hw-obj-$(CONFIG_ESP) += esp.o
 
 hw-obj-y += 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) += xen_machine_pv.o xen_domainbuild.o
 obj-$(CONFIG_USB_OHCI) += usb-ohci.o
 
 # PCI network cards
-obj-y += rtl8139.o
-obj-y += e1000.o
+obj-$(CONFIG_RTL8139_PCI) += rtl8139.o
+obj-$(CONFIG_E1000_PCI) += e1000.o
 
 # Inter-VM PCI shared memory
 obj-$(CONFIG_KVM) += ivshmem.o
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index e7a4e84..ac48dc1 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -1,7 +1,7 @@ 
 # Default configuration for arm-softmmu
 
+include pci.mak
 CONFIG_GDBSTUB_XML=y
-CONFIG_USB_OHCI=y
 CONFIG_ISA_MMIO=y
 CONFIG_NAND=y
 CONFIG_ECC=y
@@ -25,6 +25,5 @@  CONFIG_SSI_SD=y
 CONFIG_LAN9118=y
 CONFIG_SMC91C111=y
 CONFIG_DS1338=y
-CONFIG_VIRTIO_PCI=y
 CONFIG_PFLASH_CFI01=y
 CONFIG_PFLASH_CFI02=y
diff --git a/default-configs/cris-softmmu.mak b/default-configs/cris-softmmu.mak
index e0d2cab..5f1fd1e 100644
--- a/default-configs/cris-softmmu.mak
+++ b/default-configs/cris-softmmu.mak
@@ -1,6 +1,6 @@ 
 # Default configuration for cris-softmmu
 
+#include pci.mak
 CONFIG_NAND=y
 CONFIG_PTIMER=y
-CONFIG_VIRTIO_PCI=y
 CONFIG_PFLASH_CFI02=y
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index ed00471..ce905d2 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -1,6 +1,6 @@ 
 # Default configuration for i386-softmmu
 
-CONFIG_USB_OHCI=y
+include pci.mak
 CONFIG_VGA_PCI=y
 CONFIG_VGA_ISA=y
 CONFIG_VMWARE_VGA=y
@@ -9,7 +9,6 @@  CONFIG_PARALLEL=y
 CONFIG_I8254=y
 CONFIG_PCSPK=y
 CONFIG_PCKBD=y
-CONFIG_USB_UHCI=y
 CONFIG_FDC=y
 CONFIG_ACPI=y
 CONFIG_APM=y
@@ -22,4 +21,3 @@  CONFIG_IDE_PIIX=y
 CONFIG_NE2000_ISA=y
 CONFIG_PIIX_PCI=y
 CONFIG_SOUND=y
-CONFIG_VIRTIO_PCI=y
diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak
index 69ca3ed..3e2ec37 100644
--- a/default-configs/m68k-softmmu.mak
+++ b/default-configs/m68k-softmmu.mak
@@ -1,5 +1,5 @@ 
 # Default configuration for m68k-softmmu
 
+include pci.mak
 CONFIG_GDBSTUB_XML=y
 CONFIG_PTIMER=y
-CONFIG_VIRTIO_PCI=y
diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/microblaze-softmmu.mak
index 6c4f4f2..4399b8b 100644
--- a/default-configs/microblaze-softmmu.mak
+++ b/default-configs/microblaze-softmmu.mak
@@ -1,5 +1,4 @@ 
 # Default configuration for microblaze-softmmu
 
 CONFIG_PTIMER=y
-CONFIG_VIRTIO_PCI=y
 CONFIG_PFLASH_CFI01=y
diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak
index 3d0af83..565e611 100644
--- a/default-configs/mips-softmmu.mak
+++ b/default-configs/mips-softmmu.mak
@@ -1,5 +1,6 @@ 
 # Default configuration for mips-softmmu
 
+include pci.mak
 CONFIG_ISA_MMIO=y
 CONFIG_ESP=y
 CONFIG_VGA_PCI=y
@@ -11,7 +12,6 @@  CONFIG_PARALLEL=y
 CONFIG_I8254=y
 CONFIG_PCSPK=y
 CONFIG_PCKBD=y
-CONFIG_USB_UHCI=y
 CONFIG_FDC=y
 CONFIG_ACPI=y
 CONFIG_APM=y
@@ -24,7 +24,6 @@  CONFIG_IDE_ISA=y
 CONFIG_IDE_PIIX=y
 CONFIG_NE2000_ISA=y
 CONFIG_SOUND=y
-CONFIG_VIRTIO_PCI=y
 CONFIG_RC4030=y
 CONFIG_DP8393X=y
 CONFIG_DS1225Y=y
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 @@ 
 # Default configuration for mips64-softmmu
 
+include pci.mak
 CONFIG_ISA_MMIO=y
 CONFIG_ESP=y
 CONFIG_VGA_PCI=y
@@ -11,7 +12,6 @@  CONFIG_PARALLEL=y
 CONFIG_I8254=y
 CONFIG_PCSPK=y
 CONFIG_PCKBD=y
-CONFIG_USB_UHCI=y
 CONFIG_FDC=y
 CONFIG_ACPI=y
 CONFIG_APM=y
@@ -24,7 +24,6 @@  CONFIG_IDE_ISA=y
 CONFIG_IDE_PIIX=y
 CONFIG_NE2000_ISA=y
 CONFIG_SOUND=y
-CONFIG_VIRTIO_PCI=y
 CONFIG_RC4030=y
 CONFIG_DP8393X=y
 CONFIG_DS1225Y=y
diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
index fa2a3ff..4661617 100644
--- a/default-configs/mips64el-softmmu.mak
+++ b/default-configs/mips64el-softmmu.mak
@@ -1,5 +1,6 @@ 
 # Default configuration for mips64el-softmmu
 
+include pci.mak
 CONFIG_ISA_MMIO=y
 CONFIG_ESP=y
 CONFIG_VGA_PCI=y
@@ -11,7 +12,6 @@  CONFIG_PARALLEL=y
 CONFIG_I8254=y
 CONFIG_PCSPK=y
 CONFIG_PCKBD=y
-CONFIG_USB_UHCI=y
 CONFIG_FDC=y
 CONFIG_ACPI=y
 CONFIG_APM=y
@@ -25,7 +25,6 @@  CONFIG_IDE_PIIX=y
 CONFIG_IDE_VIA=y
 CONFIG_NE2000_ISA=y
 CONFIG_SOUND=y
-CONFIG_VIRTIO_PCI=y
 CONFIG_RC4030=y
 CONFIG_DP8393X=y
 CONFIG_DS1225Y=y
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 @@ 
 # Default configuration for mipsel-softmmu
 
+include pci.mak
 CONFIG_ISA_MMIO=y
 CONFIG_ESP=y
 CONFIG_VGA_PCI=y
@@ -11,7 +12,6 @@  CONFIG_PARALLEL=y
 CONFIG_I8254=y
 CONFIG_PCSPK=y
 CONFIG_PCKBD=y
-CONFIG_USB_UHCI=y
 CONFIG_FDC=y
 CONFIG_ACPI=y
 CONFIG_APM=y
@@ -24,7 +24,6 @@  CONFIG_IDE_ISA=y
 CONFIG_IDE_PIIX=y
 CONFIG_NE2000_ISA=y
 CONFIG_SOUND=y
-CONFIG_VIRTIO_PCI=y
 CONFIG_RC4030=y
 CONFIG_DP8393X=y
 CONFIG_DS1225Y=y
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 940f4bf..f1cb99e 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -1,7 +1,7 @@ 
 # Default configuration for ppc-softmmu
 
+include pci.mak
 CONFIG_GDBSTUB_XML=y
-CONFIG_USB_OHCI=y
 CONFIG_ISA_MMIO=y
 CONFIG_ESCC=y
 CONFIG_M48T59=y
@@ -31,7 +31,6 @@  CONFIG_IDE_CMD646=y
 CONFIG_IDE_MACIO=y
 CONFIG_NE2000_ISA=y
 CONFIG_SOUND=y
-CONFIG_VIRTIO_PCI=y
 CONFIG_PFLASH_CFI01=y
 CONFIG_PFLASH_CFI02=y
 CONFIG_PTIMER=y
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index e1bc6b8..83cbe97 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -1,7 +1,7 @@ 
 # Default configuration for ppc64-softmmu
 
+include pci.mak
 CONFIG_GDBSTUB_XML=y
-CONFIG_USB_OHCI=y
 CONFIG_ISA_MMIO=y
 CONFIG_ESCC=y
 CONFIG_M48T59=y
@@ -31,7 +31,6 @@  CONFIG_IDE_CMD646=y
 CONFIG_IDE_MACIO=y
 CONFIG_NE2000_ISA=y
 CONFIG_SOUND=y
-CONFIG_VIRTIO_PCI=y
 CONFIG_PFLASH_CFI01=y
 CONFIG_PFLASH_CFI02=y
 CONFIG_PTIMER=y
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 @@ 
 # Default configuration for ppcemb-softmmu
 
+include pci.mak
 CONFIG_GDBSTUB_XML=y
-CONFIG_USB_OHCI=y
 CONFIG_ISA_MMIO=y
 CONFIG_ESCC=y
 CONFIG_M48T59=y
@@ -31,7 +31,6 @@  CONFIG_IDE_CMD646=y
 CONFIG_IDE_MACIO=y
 CONFIG_NE2000_ISA=y
 CONFIG_SOUND=y
-CONFIG_VIRTIO_PCI=y
 CONFIG_PFLASH_CFI01=y
 CONFIG_PFLASH_CFI02=y
 CONFIG_PTIMER=y
diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
index 866ed7d..87247a4 100644
--- a/default-configs/sh4-softmmu.mak
+++ b/default-configs/sh4-softmmu.mak
@@ -1,9 +1,8 @@ 
 # Default configuration for sh4-softmmu
 
-CONFIG_USB_OHCI=y
+include pci.mak
 CONFIG_SERIAL=y
 CONFIG_PTIMER=y
-CONFIG_VIRTIO_PCI=y
 CONFIG_IDE_CORE=y
 CONFIG_PFLASH_CFI02=y
 CONFIG_ISA_MMIO=y
diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak
index e3e08b7..5b8a16e 100644
--- a/default-configs/sh4eb-softmmu.mak
+++ b/default-configs/sh4eb-softmmu.mak
@@ -1,9 +1,8 @@ 
 # Default configuration for sh4eb-softmmu
 
-CONFIG_USB_OHCI=y
+include pci.mak
 CONFIG_SERIAL=y
 CONFIG_PTIMER=y
-CONFIG_VIRTIO_PCI=y
 CONFIG_IDE_CORE=y
 CONFIG_PFLASH_CFI02=y
 CONFIG_ISA_MMIO=y
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
index becf880..7c788b8 100644
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -1,10 +1,10 @@ 
 # Default configuration for sparc-softmmu
 
+include pci.mak
 CONFIG_ECC=y
 CONFIG_ESP=y
 CONFIG_ESCC=y
 CONFIG_M48T59=y
 CONFIG_PTIMER=y
 CONFIG_FDC=y
-CONFIG_VIRTIO_PCI=y
 CONFIG_EMPTY_SLOT=y
diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
index 1cc3f13..ecc3122 100644
--- a/default-configs/sparc64-softmmu.mak
+++ b/default-configs/sparc64-softmmu.mak
@@ -1,5 +1,6 @@ 
 # Default configuration for sparc64-softmmu
 
+include pci.mak
 CONFIG_ISA_MMIO=y
 CONFIG_M48T59=y
 CONFIG_PTIMER=y
@@ -13,4 +14,3 @@  CONFIG_IDE_QDEV=y
 CONFIG_IDE_PCI=y
 CONFIG_IDE_ISA=y
 CONFIG_IDE_CMD646=y
-CONFIG_VIRTIO_PCI=y
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
index 5183203..7f22599 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -1,6 +1,6 @@ 
 # Default configuration for x86_64-softmmu
 
-CONFIG_USB_OHCI=y
+include pci.mak
 CONFIG_VGA_PCI=y
 CONFIG_VGA_ISA=y
 CONFIG_VMWARE_VGA=y
@@ -9,7 +9,6 @@  CONFIG_PARALLEL=y
 CONFIG_I8254=y
 CONFIG_PCSPK=y
 CONFIG_PCKBD=y
-CONFIG_USB_UHCI=y
 CONFIG_FDC=y
 CONFIG_ACPI=y
 CONFIG_APM=y
@@ -22,4 +21,3 @@  CONFIG_IDE_PIIX=y
 CONFIG_NE2000_ISA=y
 CONFIG_PIIX_PCI=y
 CONFIG_SOUND=y
-CONFIG_VIRTIO_PCI=y