Skip to contentSkip to conversation

Reduce duplication in default configs

PATCH In review Paul Brook 3 participants 10 messages Nov 27, 2010 Kbuild

lore
Share & tools
lore

Paul Brook

author
#0 lore raw

cover Reduce duplication in default configs

As mentioned elsewhere recently, there are a lot of devices that are common to all targets. In particular all PCI devices [should] work on all PCI capable machies. Currently each target default config has to be updated separately, which becomes unmaintainable as as we get finer grained control over which devices are built.

Following patch series allows a default config to include other files, and uses this to consistently enable all PCI devices on all targets.

I have also made VirtIO devices optional.

Paul Brook (3):
Include directives in default configs
PCI config include
VirtIO config option

 Makefile                               |   11 ++++++-----
 Makefile.objs                          |   31 ++++++++++++++++++++-----------
 Makefile.target                        |    8 ++++----
 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/s390x-softmmu.mak      |    1 +
 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 +---
 make_device_config.sh                  |   27 +++++++++++++++++++++++++++
 22 files changed, 74 insertions(+), 51 deletions(-)
 create mode 100644 make_device_config.sh
Signature · 1 line
1.7.2.3
author
#1 lore raw

PATCH 1/3 Include directives in default configs

Allow default configs to be split into several files.

---
 Makefile              |   11 ++++++-----
 Makefile.objs         |    3 ++-
 make_device_config.sh |   27 +++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 make_device_config.sh
Makefile +6 -5
index 3389775..d3bc0f2 100644
@@ -39,18 +39,19 @@ endif
 
 SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory)
 SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))
+SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %/config-devices.mak.d, $(TARGET_DIRS))
 
 config-all-devices.mak: $(SUBDIR_DEVICES_MAK)
 	$(call quiet-command,cat $(SUBDIR_DEVICES_MAK) | grep =y | sort -u > $@,"  GEN   $@")
 
+-include $(SUBDIR_DEVICES_MAK_DEP)
+
 %/config-devices.mak: default-configs/%.mak
-	$(call quiet-command,cat $< > [email protected], "  GEN   $@")
+	$(call quiet-command,$(SHELL) $(SRC_PATH)/make_device_config.sh $@ $<, "  GEN   $@")
 	@if test -f $@; then \
 	  if cmp -s [email protected] $@; then \
-	    if ! cmp -s $@ [email protected]; then \
-	      mv [email protected] $@; \
-	      cp -p $@ [email protected]; \
-	    fi; \
+	    mv [email protected] $@; \
+	    cp -p $@ [email protected]; \
 	  else \
 	    if test -f [email protected]; then \
 	      echo "WARNING: $@ (user modified) out of date.";\
Makefile.objs +2 -1
index 23b17ce..4f4aba3 100644
@@ -160,7 +160,8 @@ user-obj-y += cutils.o cache-utils.o
 hw-obj-y =
 hw-obj-y += vl.o loader.o
 hw-obj-y += virtio.o virtio-console.o
-hw-obj-y += fw_cfg.o pci.o pci_host.o pcie_host.o pci_bridge.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
 hw-obj-y += watchdog.o
 hw-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o
make_device_config.sh new file +27 -0
new file mode 100644
index 0000000..59f267b
@@ -0,0 +1,27 @@
+#! /bin/sh
+# Construct a target device config file from a default, pulling in any
+# files from include directives.
+
+dest=$1.tmp
+dep=$1.d
+src=$2
+src_dir=`dirname $src`
+all_includes=
+
+process_includes () {
+  cat $1 | grep '^include' | \
+  while read include file ; do
+    all_includes="$all_includes $src_dir/$file"
+    process_includes $src_dir/$file
+  done
+}
+
+f=$src
+while [ -n "$f" ] ; do
+  f=`awk '/^include / {print "'$src_dir'/" $2}' $f`
+  all_includes="$all_includes $f"
+done
+process_includes $src > $dest
+
+cat $src $all_includes | grep -v '^include' > $dest
+echo "$1: $all_includes" > $dep
Signature · 1 line
1.7.2.3
author
#2 lore raw

PATCH 2/3 PCI config include

In reply to Paul Brook

Split PCI config options into a separate file

---
 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(-)
Makefile.objs +11 -9
index 4f4aba3..9e85b04 100644
@@ -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
Makefile.target +2 -2
index 2800f47..853045a 100644
@@ -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
default-configs/arm-softmmu.mak +1 -2
index e7a4e84..ac48dc1 100644
@@ -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
default-configs/cris-softmmu.mak +1 -1
index e0d2cab..5f1fd1e 100644
@@ -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
default-configs/i386-softmmu.mak +1 -3
index ed00471..ce905d2 100644
@@ -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
default-configs/m68k-softmmu.mak +1 -1
index 69ca3ed..3e2ec37 100644
@@ -1,5 +1,5 @@
 # Default configuration for m68k-softmmu
 
+include pci.mak
 CONFIG_GDBSTUB_XML=y
 CONFIG_PTIMER=y
-CONFIG_VIRTIO_PCI=y
default-configs/microblaze-softmmu.mak +0 -1
index 6c4f4f2..4399b8b 100644
@@ -1,5 +1,4 @@
 # Default configuration for microblaze-softmmu
 
 CONFIG_PTIMER=y
-CONFIG_VIRTIO_PCI=y
 CONFIG_PFLASH_CFI01=y
default-configs/mips-softmmu.mak +1 -2
index 3d0af83..565e611 100644
@@ -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
default-configs/mips64-softmmu.mak +1 -2
index 0030de4..03bd8eb 100644
@@ -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
default-configs/mips64el-softmmu.mak +1 -2
index fa2a3ff..4661617 100644
@@ -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
default-configs/mipsel-softmmu.mak +1 -2
index 238b73a..92fc473 100644
@@ -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
default-configs/ppc-softmmu.mak +1 -2
index 940f4bf..f1cb99e 100644
@@ -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
default-configs/ppc64-softmmu.mak +1 -2
index e1bc6b8..83cbe97 100644
@@ -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
default-configs/ppcemb-softmmu.mak +1 -2
index 8f1cc09..2b52d4a 100644
@@ -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
default-configs/sh4-softmmu.mak +1 -2
index 866ed7d..87247a4 100644
@@ -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
default-configs/sh4eb-softmmu.mak +1 -2
index e3e08b7..5b8a16e 100644
@@ -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
default-configs/sparc-softmmu.mak +1 -1
index becf880..7c788b8 100644
@@ -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
default-configs/sparc64-softmmu.mak +1 -1
index 1cc3f13..ecc3122 100644
@@ -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
default-configs/x86_64-softmmu.mak +1 -3
index 5183203..7f22599 100644
@@ -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
Signature · 1 line
1.7.2.3
#3 lore raw

Re: [Qemu-devel] [PATCH 2/3] PCI config include

Quoted 372 lines · Paul Brook

Split PCI config options into a separate file

---
 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(-)
Makefile.objs +0 -0
index 4f4aba3..9e85b04 100644
@@ -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

Makefile.objs +5 -2
-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

Makefile.objs +0 -0
@@ -207,15 +210,14 @@ hw-obj-$(CONFIG_PPCE500_PCI) += ppce500_pci.o

 hw-obj-$(CONFIG_PIIX4) += piix4.o

 # PCI watchdog devices

Makefile.objs +2 -3
-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

Makefile.objs +3 -3
-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

Makefile.objs +0 -0
@@ -232,7 +234,7 @@ hw-obj-$(CONFIG_IDE_MACIO) += ide/macio.o

 hw-obj-$(CONFIG_IDE_VIA) += ide/via.o

 # SCSI layer

Makefile.objs +1 -1
-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

Makefile.target +0 -0
index 2800f47..853045a 100644
@@ -210,8 +210,8 @@ obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o

 obj-$(CONFIG_USB_OHCI) += usb-ohci.o

 # PCI network cards

Makefile.target +2 -2
-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

default-configs/arm-softmmu.mak +1 -0
index e7a4e84..ac48dc1 100644
@@ -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

default-configs/arm-softmmu.mak +0 -0
@@ -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

default-configs/cris-softmmu.mak +1 -0
index e0d2cab..5f1fd1e 100644
@@ -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

default-configs/i386-softmmu.mak +1 -1
index ed00471..ce905d2 100644
@@ -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

default-configs/i386-softmmu.mak +0 -0
@@ -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

default-configs/i386-softmmu.mak +0 -0
@@ -22,4 +21,3 @@ CONFIG_IDE_PIIX=y

 CONFIG_NE2000_ISA=y
 CONFIG_PIIX_PCI=y
 CONFIG_SOUND=y

default-configs/i386-softmmu.mak +0 -1
-CONFIG_VIRTIO_PCI=y
default-configs/m68k-softmmu.mak +1 -0
index 69ca3ed..3e2ec37 100644
@@ -1,5 +1,5 @@
  # Default configuration for m68k-softmmu
 
+include pci.mak

 CONFIG_GDBSTUB_XML=y
 CONFIG_PTIMER=y

default-configs/m68k-softmmu.mak +0 -1
-CONFIG_VIRTIO_PCI=y
default-configs/microblaze-softmmu.mak +0 -0
index 6c4f4f2..4399b8b 100644
@@ -1,5 +1,4 @@
  # Default configuration for microblaze-softmmu
 

 CONFIG_PTIMER=y
-CONFIG_VIRTIO_PCI=y
 CONFIG_PFLASH_CFI01=y

default-configs/mips-softmmu.mak +1 -0
index 3d0af83..565e611 100644
@@ -1,5 +1,6 @@
  # Default configuration for mips-softmmu
 
+include pci.mak

 CONFIG_ISA_MMIO=y
 CONFIG_ESP=y
 CONFIG_VGA_PCI=y

default-configs/mips-softmmu.mak +0 -0
@@ -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

default-configs/mips-softmmu.mak +0 -0
@@ -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

default-configs/mips64-softmmu.mak +1 -0
index 0030de4..03bd8eb 100644
@@ -1,5 +1,6 @@
  # Default configuration for mips64-softmmu
 
+include pci.mak

 CONFIG_ISA_MMIO=y
 CONFIG_ESP=y
 CONFIG_VGA_PCI=y

default-configs/mips64-softmmu.mak +0 -0
@@ -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

default-configs/mips64-softmmu.mak +0 -0
@@ -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

default-configs/mips64el-softmmu.mak +1 -0
index fa2a3ff..4661617 100644
@@ -1,5 +1,6 @@
  # Default configuration for mips64el-softmmu
 
+include pci.mak

 CONFIG_ISA_MMIO=y
 CONFIG_ESP=y
 CONFIG_VGA_PCI=y

default-configs/mips64el-softmmu.mak +0 -0
@@ -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

default-configs/mips64el-softmmu.mak +0 -0
@@ -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

default-configs/mipsel-softmmu.mak +1 -0
index 238b73a..92fc473 100644
@@ -1,5 +1,6 @@
  # Default configuration for mipsel-softmmu
 
+include pci.mak

 CONFIG_ISA_MMIO=y
 CONFIG_ESP=y
 CONFIG_VGA_PCI=y

default-configs/mipsel-softmmu.mak +0 -0
@@ -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

default-configs/mipsel-softmmu.mak +0 -0
@@ -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

default-configs/ppc-softmmu.mak +1 -0
index 940f4bf..f1cb99e 100644
@@ -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

default-configs/ppc-softmmu.mak +0 -0
@@ -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

default-configs/ppc64-softmmu.mak +1 -0
index e1bc6b8..83cbe97 100644
@@ -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

default-configs/ppc64-softmmu.mak +0 -0
@@ -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

default-configs/ppcemb-softmmu.mak +1 -0
index 8f1cc09..2b52d4a 100644
@@ -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

default-configs/ppcemb-softmmu.mak +0 -0
@@ -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

default-configs/sh4-softmmu.mak +1 -1
index 866ed7d..87247a4 100644
@@ -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

default-configs/sh4eb-softmmu.mak +1 -1
index e3e08b7..5b8a16e 100644
@@ -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

default-configs/sparc-softmmu.mak +0 -0
index becf880..7c788b8 100644

default-configs/sparc-softmmu.mak line 3

Quoted 3 lines
default-configs/sparc-softmmu.mak +1 -0
@@ -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.

author
#4 lore raw

Re: [Qemu-devel] [PATCH 2/3] PCI config include

Quoted 10 lines

default-configs/sparc-softmmu.mak line 3

Quoted 8 lines
(quoted diff) +0 -0

b/default-configs/sparc-softmmu.mak index becf880..7c788b8 100644

default-configs/sparc-softmmu.mak +1 -0
@@ -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

author
#5 lore raw

Re: [Qemu-devel] [PATCH 2/3] PCI config include

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
(quoted diff) +0 -0

b/default-configs/sparc-softmmu.mak index becf880..7c788b8 100644

default-configs/sparc-softmmu.mak +0 -0
@@ -1,10 +1,10 @@
 
 # Default configuration for sparc-softmmu
 
Quoted 7 lines
Quoted 4 lines

default-configs/sparc-softmmu.mak line 4

Quoted 1 line
default-configs/sparc-softmmu.mak +1 -0
+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.

... and for good reason. The lance code relies on the (nominally PCI) pcnet emulation :-( Fixed as below.

Subject: [PATCH] Split out common pcnet code

The core pcnet emulation code is used by both the PCI "pcnet" device and the SPARC "lance" device. Split the common code frm the PCI code so that that can be configures independantly.

---
 Makefile.objs                     |    3 +-
 default-configs/pci.mak           |    1 +
 default-configs/sparc-softmmu.mak |    1 +
 hw/pcnet.c                        |  311 +------------------------------------
 hw/pcnet.h                        |    3 +
 5 files changed, 11 insertions(+), 308 deletions(-)
Makefile.objs +2 -1
index 72c6c7f..13ba26f 100644
@@ -222,7 +222,8 @@ hw-obj-$(CONFIG_PCI) += pcie.o pcie_port.o
 # PCI network cards
 hw-obj-$(CONFIG_NE2000_PCI) += ne2000.o
 hw-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o
-hw-obj-$(CONFIG_PCNET_PCI) += pcnet.o
+hw-obj-$(CONFIG_PCNET_PCI) += pcnet-pci.o
+hw-obj-$(CONFIG_PCNET_COMMON) += pcnet.o
 
 hw-obj-$(CONFIG_SMC91C111) += smc91c111.o
 hw-obj-$(CONFIG_LAN9118) += lan9118.o
default-configs/pci.mak +1 -0
index 0ddfb37..c74a99f 100644
@@ -6,6 +6,7 @@ CONFIG_USB_OHCI=y
 CONFIG_NE2000_PCI=y
 CONFIG_EEPRO100_PCI=y
 CONFIG_PCNET_PCI=y
+CONFIG_PCNET_COMMON=y
 CONFIG_LSI_SCSI_PCI=y
 CONFIG_RTL8139_PCI=y
 CONFIG_E1000_PCI=y
default-configs/sparc-softmmu.mak +1 -0
index 436d2a6..b0310c5 100644
@@ -7,3 +7,4 @@ CONFIG_M48T59=y
 CONFIG_PTIMER=y
 CONFIG_FDC=y
 CONFIG_EMPTY_SLOT=y
+CONFIG_PCNET_COMMON=y
hw/pcnet.c +4 -307

369 lines not on this page · raw message

hw/pcnet.h +3 -0
index efacc9f..534bdf9 100644
@@ -32,6 +32,9 @@ struct PCNetState_st {
 void pcnet_h_reset(void *opaque);
 void pcnet_ioport_writew(void *opaque, uint32_t addr, uint32_t val);
 uint32_t pcnet_ioport_readw(void *opaque, uint32_t addr);
+void pcnet_ioport_writel(void *opaque, uint32_t addr, uint32_t val);
+uint32_t pcnet_ioport_readl(void *opaque, uint32_t addr);
+uint32_t pcnet_bcr_readw(PCNetState *s, uint32_t rap);
 int pcnet_can_receive(VLANClientState *nc);
 ssize_t pcnet_receive(VLANClientState *nc, const uint8_t *buf, size_t size_);
 void pcnet_common_cleanup(PCNetState *d);
Signature · 1 line
1.7.2.3
#6 lore raw

Re: [Qemu-devel] [PATCH 2/3] PCI config include

Quoted 13 lines · Paul Brook
---
 Makefile.objs                     |    3 +-
 default-configs/pci.mak           |    1 +
 default-configs/sparc-softmmu.mak |    1 +
 hw/pcnet.c                        |  311 +------------------------------------
 hw/pcnet.h                        |    3 +
 5 files changed, 11 insertions(+), 308 deletions(-)
Makefile.objs +0 -0
index 72c6c7f..13ba26f 100644

Makefile.objs hw-obj-$(CONFIG_PCI) += pcie.o pcie_port.o · line 225

Quoted 5 lines
Makefile.objs +1 -1
@@ -222,7 +222,8 @@ hw-obj-$(CONFIG_PCI) += pcie.o pcie_port.o
 # PCI network cards
 hw-obj-$(CONFIG_NE2000_PCI) += ne2000.o
 hw-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o
-hw-obj-$(CONFIG_PCNET_PCI) += pcnet.o
+hw-obj-$(CONFIG_PCNET_PCI) += pcnet-pci.o

pcnet-pci.c is missing. git add?

Signature · 1 line
yamahata
author
#7 lore raw

Re: [Qemu-devel] [PATCH 2/3] PCI config include

Quoted 17 lines · Paul Brook
Quoted 16 lines

---

 Makefile.objs                     |    3 +-
 default-configs/pci.mak           |    1 +
 default-configs/sparc-softmmu.mak |    1 +
 hw/pcnet.c                        |  311
 +------------------------------------ hw/pcnet.h                       
 |    3 +
 5 files changed, 11 insertions(+), 308 deletions(-)
Makefile.objs +0 -0
index 72c6c7f..13ba26f 100644
@@ -222,7 +222,8 @@ hw-obj-$(CONFIG_PCI) += pcie.o pcie_port.o
 
Quoted 8 lines

Makefile.objs hw-obj-$(CONFIG_PCI) += pcie.o pcie_port.o · line 225

Quoted 6 lines
Makefile.objs +1 -1
 # PCI network cards
 hw-obj-$(CONFIG_NE2000_PCI) += ne2000.o
 hw-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o
 
-hw-obj-$(CONFIG_PCNET_PCI) += pcnet.o
+hw-obj-$(CONFIG_PCNET_PCI) += pcnet-pci.o

pcnet-pci.c is missing. git add?

Bah. Three broken commits in as many tries. Clearly I'm not concentrating today.

Paul

author
#8 lore raw

PATCH 3/3 VirtIO config option

In reply to Paul Brook

Make virtio devices optional. Selecting individual devices is not useful as the host bindings are all in one file.

---
 Makefile.objs                     |   10 ++++++++--
 Makefile.target                   |    4 ++--
 default-configs/s390x-softmmu.mak |    1 +
 3 files changed, 11 insertions(+), 4 deletions(-)
Makefile.objs +8 -2
index 9e85b04..72c6c7f 100644
@@ -42,6 +42,11 @@ net-nested-$(CONFIG_SLIRP) += slirp.o
 net-nested-$(CONFIG_VDE) += vde.o
 net-obj-y += $(addprefix net/, $(net-nested-y))
 
+ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS),yy)
+# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.
+# only pull in the actual virtio-9p device if we also enabled virtio.
+CONFIG_REALLY_VIRTFS=y
+endif
 fsdev-nested-$(CONFIG_VIRTFS) = qemu-fsdev.o
 fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y))
 
@@ -159,7 +164,7 @@ user-obj-y += cutils.o cache-utils.o
 
 hw-obj-y =
 hw-obj-y += vl.o loader.o
-hw-obj-y += virtio.o virtio-console.o
+hw-obj-$(CONFIG_VIRTIO) += virtio.o virtio-console.o
 hw-obj-y += fw_cfg.o
 # FIXME: Core PCI code and its direct dependencies are required by the
 # QMP query-pci command.
@@ -264,7 +269,8 @@ sound-obj-$(CONFIG_HDA) += intel-hda.o hda-audio.o
 adlib.o fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0
 hw-obj-$(CONFIG_SOUND) += $(sound-obj-y)
 
-hw-obj-$(CONFIG_VIRTFS) += virtio-9p-debug.o virtio-9p-local.o virtio-9p-xattr.o
+hw-obj-$(CONFIG_REALLY_VIRTFS) += virtio-9p-debug.o
+hw-obj-$(CONFIG_VIRTFS) += virtio-9p-local.o virtio-9p-xattr.o
 hw-obj-$(CONFIG_VIRTFS) += virtio-9p-xattr-user.o virtio-9p-posix-acl.o
 
 ######################################################################
Makefile.target +2 -2
index 853045a..5784844 100644
@@ -188,11 +188,11 @@ ifdef CONFIG_SOFTMMU
 obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o
 # virtio has to be here due to weird dependency between PCI and virtio-net.
 # need to fix this properly
-obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o
+obj-$(CONFIG_VIRTIO) += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o
 obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
 obj-y += vhost_net.o
 obj-$(CONFIG_VHOST_NET) += vhost.o
-obj-$(CONFIG_VIRTFS) += virtio-9p.o
+obj-$(CONFIG_REALLY_VIRTFS) += virtio-9p.o
 obj-y += rwhandler.o
 obj-$(CONFIG_KVM) += kvm.o kvm-all.o
 obj-$(CONFIG_NO_KVM) += kvm-stub.o
default-configs/s390x-softmmu.mak +1 -0
index e69de29..16d7259 100644
@@ -0,0 +1 @@
+include virtio.mak
Signature · 1 line
1.7.2.3
author
#9 lore raw
In reply to Paul Brook
Quoted 9 lines

As mentioned elsewhere recently, there are a lot of devices that are common to all targets. In particular all PCI devices [should] work on all PCI capable machies. Currently each target default config has to be updated separately, which becomes unmaintainable as as we get finer grained control over which devices are built.

Following patch series allows a default config to include other files, and uses this to consistently enable all PCI devices on all targets.

Quoted 6 lines

I have also made VirtIO devices optional.

Paul Brook (3):
Include directives in default configs
PCI config include
VirtIO config option

Which was missing a file. Appologies for the breakage.

Paul