* [Qemu-devel] [PATCH 0/3] Reduce duplication in default configs
@ 2010-11-27 0:07 Paul Brook
2010-11-27 0:07 ` [Qemu-devel] [PATCH 1/3] Include directives " Paul Brook
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Paul Brook @ 2010-11-27 0:07 UTC (permalink / raw)
To: qemu-devel; +Cc: Paul Brook
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
--
1.7.2.3
^ permalink raw reply [flat|nested] 10+ messages in thread* [Qemu-devel] [PATCH 1/3] Include directives in default configs 2010-11-27 0:07 [Qemu-devel] [PATCH 0/3] Reduce duplication in default configs Paul Brook @ 2010-11-27 0:07 ` Paul Brook 2010-11-27 0:07 ` [Qemu-devel] [PATCH 2/3] PCI config include Paul Brook ` (2 subsequent siblings) 3 siblings, 0 replies; 10+ messages in thread From: Paul Brook @ 2010-11-27 0:07 UTC (permalink / raw) To: qemu-devel; +Cc: Paul Brook Allow default configs to be split into several files. Signed-off-by: Paul Brook <paul@codesourcery.com> --- Makefile | 11 ++++++----- Makefile.objs | 3 ++- make_device_config.sh | 27 +++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 make_device_config.sh diff --git a/Makefile b/Makefile index 3389775..d3bc0f2 100644 --- a/Makefile +++ b/Makefile @@ -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 $< > $@.tmp, " GEN $@") + $(call quiet-command,$(SHELL) $(SRC_PATH)/make_device_config.sh $@ $<, " GEN $@") @if test -f $@; then \ if cmp -s $@.old $@; then \ - if ! cmp -s $@ $@.tmp; then \ - mv $@.tmp $@; \ - cp -p $@ $@.old; \ - fi; \ + mv $@.tmp $@; \ + cp -p $@ $@.old; \ else \ if test -f $@.old; then \ echo "WARNING: $@ (user modified) out of date.";\ diff --git a/Makefile.objs b/Makefile.objs index 23b17ce..4f4aba3 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -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 diff --git a/make_device_config.sh b/make_device_config.sh new file mode 100644 index 0000000..59f267b --- /dev/null +++ b/make_device_config.sh @@ -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 -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Qemu-devel] [PATCH 2/3] PCI config include 2010-11-27 0:07 [Qemu-devel] [PATCH 0/3] Reduce duplication in default configs Paul Brook 2010-11-27 0:07 ` [Qemu-devel] [PATCH 1/3] Include directives " Paul Brook @ 2010-11-27 0:07 ` Paul Brook 2010-11-27 10:10 ` Blue Swirl 2010-11-27 0:07 ` [Qemu-devel] [PATCH 3/3] VirtIO config option Paul Brook 2010-11-27 0:37 ` [Qemu-devel] [PATCH 0/3] Reduce duplication in default configs Paul Brook 3 siblings, 1 reply; 10+ messages in thread From: Paul Brook @ 2010-11-27 0:07 UTC (permalink / raw) To: qemu-devel; +Cc: Paul Brook 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 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 -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH 2/3] PCI config include 2010-11-27 0:07 ` [Qemu-devel] [PATCH 2/3] PCI config include Paul Brook @ 2010-11-27 10:10 ` Blue Swirl 2010-11-27 10:50 ` Paul Brook 0 siblings, 1 reply; 10+ messages in thread From: Blue Swirl @ 2010-11-27 10:10 UTC (permalink / raw) To: Paul Brook; +Cc: qemu-devel 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. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH 2/3] PCI config include 2010-11-27 10:10 ` Blue Swirl @ 2010-11-27 10:50 ` Paul Brook 2010-11-27 11:30 ` Paul Brook 0 siblings, 1 reply; 10+ messages in thread From: Paul Brook @ 2010-11-27 10:50 UTC (permalink / raw) To: qemu-devel; +Cc: Blue Swirl > > 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 ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH 2/3] PCI config include 2010-11-27 10:50 ` Paul Brook @ 2010-11-27 11:30 ` Paul Brook 2010-11-27 11:51 ` Isaku Yamahata 0 siblings, 1 reply; 10+ messages in thread From: Paul Brook @ 2010-11-27 11:30 UTC (permalink / raw) To: qemu-devel; +Cc: Blue Swirl > > > 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. ... 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. Signed-off-by: Paul Brook <paul@codesourcery.com> --- 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(-) diff --git a/Makefile.objs b/Makefile.objs index 72c6c7f..13ba26f 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -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 diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 0ddfb37..c74a99f 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -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 diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak index 436d2a6..b0310c5 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -7,3 +7,4 @@ CONFIG_M48T59=y CONFIG_PTIMER=y CONFIG_FDC=y CONFIG_EMPTY_SLOT=y +CONFIG_PCNET_COMMON=y diff --git a/hw/pcnet.c b/hw/pcnet.c index f970bda..37010b8 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -35,9 +35,8 @@ * http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR92C990.txt */ -#include "pci.h" +#include "qdev.h" #include "net.h" -#include "loader.h" #include "qemu-timer.h" #include "qemu_socket.h" @@ -52,11 +51,6 @@ //#define PCNET_DEBUG_MATCH -typedef struct { - PCIDevice pci_dev; - PCNetState state; -} PCIPCNetState; - struct qemu_ether_header { uint8_t ether_dhost[6]; uint8_t ether_shost[6]; @@ -704,7 +698,6 @@ static void pcnet_poll_timer(void *opaque); static uint32_t pcnet_csr_readw(PCNetState *s, uint32_t rap); static void pcnet_csr_writew(PCNetState *s, uint32_t rap, uint32_t new_value); static void pcnet_bcr_writew(PCNetState *s, uint32_t rap, uint32_t val); -static uint32_t pcnet_bcr_readw(PCNetState *s, uint32_t rap); static void pcnet_s_reset(PCNetState *s) { @@ -1538,7 +1531,7 @@ static void pcnet_bcr_writew(PCNetState *s, uint32_t rap, uint32_t val) } } -static uint32_t pcnet_bcr_readw(PCNetState *s, uint32_t rap) +uint32_t pcnet_bcr_readw(PCNetState *s, uint32_t rap) { uint32_t val; rap &= 127; @@ -1595,27 +1588,6 @@ void pcnet_h_reset(void *opaque) pcnet_poll_timer(s); } -static void pcnet_aprom_writeb(void *opaque, uint32_t addr, uint32_t val) -{ - PCNetState *s = opaque; -#ifdef PCNET_DEBUG - printf("pcnet_aprom_writeb addr=0x%08x val=0x%02x\n", addr, val); -#endif - /* Check APROMWE bit to enable write access */ - if (pcnet_bcr_readw(s,2) & 0x100) - s->prom[addr & 15] = val; -} - -static uint32_t pcnet_aprom_readb(void *opaque, uint32_t addr) -{ - PCNetState *s = opaque; - uint32_t val = s->prom[addr & 15]; -#ifdef PCNET_DEBUG - printf("pcnet_aprom_readb addr=0x%08x val=0x%02x\n", addr, val); -#endif - return val; -} - void pcnet_ioport_writew(void *opaque, uint32_t addr, uint32_t val) { PCNetState *s = opaque; @@ -1668,7 +1640,7 @@ uint32_t pcnet_ioport_readw(void *opaque, uint32_t addr) return val; } -static void pcnet_ioport_writel(void *opaque, uint32_t addr, uint32_t val) +void pcnet_ioport_writel(void *opaque, uint32_t addr, uint32_t val) { PCNetState *s = opaque; pcnet_poll_timer(s); @@ -1698,7 +1670,7 @@ static void pcnet_ioport_writel(void *opaque, uint32_t addr, uint32_t val) pcnet_update_irq(s); } -static uint32_t pcnet_ioport_readl(void *opaque, uint32_t addr) +uint32_t pcnet_ioport_readl(void *opaque, uint32_t addr) { PCNetState *s = opaque; uint32_t val = -1; @@ -1727,125 +1699,6 @@ static uint32_t pcnet_ioport_readl(void *opaque, uint32_t addr) return val; } -static void pcnet_ioport_map(PCIDevice *pci_dev, int region_num, - pcibus_t addr, pcibus_t size, int type) -{ - PCNetState *d = &DO_UPCAST(PCIPCNetState, pci_dev, pci_dev)->state; - -#ifdef PCNET_DEBUG_IO - printf("pcnet_ioport_map addr=0x%04"FMT_PCIBUS" size=0x%04"FMT_PCIBUS"\n", - addr, size); -#endif - - register_ioport_write(addr, 16, 1, pcnet_aprom_writeb, d); - register_ioport_read(addr, 16, 1, pcnet_aprom_readb, d); - - register_ioport_write(addr + 0x10, 0x10, 2, pcnet_ioport_writew, d); - register_ioport_read(addr + 0x10, 0x10, 2, pcnet_ioport_readw, d); - register_ioport_write(addr + 0x10, 0x10, 4, pcnet_ioport_writel, d); - register_ioport_read(addr + 0x10, 0x10, 4, pcnet_ioport_readl, d); -} - -static void pcnet_mmio_writeb(void *opaque, target_phys_addr_t addr, uint32_t val) -{ - PCNetState *d = opaque; -#ifdef PCNET_DEBUG_IO - printf("pcnet_mmio_writeb addr=0x" TARGET_FMT_plx" val=0x%02x\n", addr, - val); -#endif - if (!(addr & 0x10)) - pcnet_aprom_writeb(d, addr & 0x0f, val); -} - -static uint32_t pcnet_mmio_readb(void *opaque, target_phys_addr_t addr) -{ - PCNetState *d = opaque; - uint32_t val = -1; - if (!(addr & 0x10)) - val = pcnet_aprom_readb(d, addr & 0x0f); -#ifdef PCNET_DEBUG_IO - printf("pcnet_mmio_readb addr=0x" TARGET_FMT_plx " val=0x%02x\n", addr, - val & 0xff); -#endif - return val; -} - -static void pcnet_mmio_writew(void *opaque, target_phys_addr_t addr, uint32_t val) -{ - PCNetState *d = opaque; -#ifdef PCNET_DEBUG_IO - printf("pcnet_mmio_writew addr=0x" TARGET_FMT_plx " val=0x%04x\n", addr, - val); -#endif - if (addr & 0x10) - pcnet_ioport_writew(d, addr & 0x0f, val); - else { - addr &= 0x0f; - pcnet_aprom_writeb(d, addr, val & 0xff); - pcnet_aprom_writeb(d, addr+1, (val & 0xff00) >> 8); - } -} - -static uint32_t pcnet_mmio_readw(void *opaque, target_phys_addr_t addr) -{ - PCNetState *d = opaque; - uint32_t val = -1; - if (addr & 0x10) - val = pcnet_ioport_readw(d, addr & 0x0f); - else { - addr &= 0x0f; - val = pcnet_aprom_readb(d, addr+1); - val <<= 8; - val |= pcnet_aprom_readb(d, addr); - } -#ifdef PCNET_DEBUG_IO - printf("pcnet_mmio_readw addr=0x" TARGET_FMT_plx" val = 0x%04x\n", addr, - val & 0xffff); -#endif - return val; -} - -static void pcnet_mmio_writel(void *opaque, target_phys_addr_t addr, uint32_t val) -{ - PCNetState *d = opaque; -#ifdef PCNET_DEBUG_IO - printf("pcnet_mmio_writel addr=0x" TARGET_FMT_plx" val=0x%08x\n", addr, - val); -#endif - if (addr & 0x10) - pcnet_ioport_writel(d, addr & 0x0f, val); - else { - addr &= 0x0f; - pcnet_aprom_writeb(d, addr, val & 0xff); - pcnet_aprom_writeb(d, addr+1, (val & 0xff00) >> 8); - pcnet_aprom_writeb(d, addr+2, (val & 0xff0000) >> 16); - pcnet_aprom_writeb(d, addr+3, (val & 0xff000000) >> 24); - } -} - -static uint32_t pcnet_mmio_readl(void *opaque, target_phys_addr_t addr) -{ - PCNetState *d = opaque; - uint32_t val; - if (addr & 0x10) - val = pcnet_ioport_readl(d, addr & 0x0f); - else { - addr &= 0x0f; - val = pcnet_aprom_readb(d, addr+3); - val <<= 8; - val |= pcnet_aprom_readb(d, addr+2); - val <<= 8; - val |= pcnet_aprom_readb(d, addr+1); - val <<= 8; - val |= pcnet_aprom_readb(d, addr); - } -#ifdef PCNET_DEBUG_IO - printf("pcnet_mmio_readl addr=0x" TARGET_FMT_plx " val=0x%08x\n", addr, - val); -#endif - return val; -} - static bool is_version_2(void *opaque, int version_id) { return version_id == 2; @@ -1875,18 +1728,6 @@ const VMStateDescription vmstate_pcnet = { } }; -static const VMStateDescription vmstate_pci_pcnet = { - .name = "pcnet", - .version_id = 3, - .minimum_version_id = 2, - .minimum_version_id_old = 2, - .fields = (VMStateField []) { - VMSTATE_PCI_DEVICE(pci_dev, PCIPCNetState), - VMSTATE_STRUCT(state, PCIPCNetState, 0, vmstate_pcnet, PCNetState), - VMSTATE_END_OF_LIST() - } -}; - void pcnet_common_cleanup(PCNetState *d) { d->nic = NULL; @@ -1901,147 +1742,3 @@ int pcnet_common_init(DeviceState *dev, PCNetState *s, NetClientInfo *info) qemu_format_nic_info_str(&s->nic->nc, s->conf.macaddr.a); return 0; } - -/* PCI interface */ - -static CPUWriteMemoryFunc * const pcnet_mmio_write[] = { - &pcnet_mmio_writeb, - &pcnet_mmio_writew, - &pcnet_mmio_writel -}; - -static CPUReadMemoryFunc * const pcnet_mmio_read[] = { - &pcnet_mmio_readb, - &pcnet_mmio_readw, - &pcnet_mmio_readl -}; - -static void pcnet_mmio_map(PCIDevice *pci_dev, int region_num, - pcibus_t addr, pcibus_t size, int type) -{ - PCIPCNetState *d = DO_UPCAST(PCIPCNetState, pci_dev, pci_dev); - -#ifdef PCNET_DEBUG_IO - printf("pcnet_mmio_map addr=0x%08"FMT_PCIBUS" 0x%08"FMT_PCIBUS"\n", - addr, size); -#endif - - cpu_register_physical_memory(addr, PCNET_PNPMMIO_SIZE, d->state.mmio_index); -} - -static void pci_physical_memory_write(void *dma_opaque, target_phys_addr_t addr, - uint8_t *buf, int len, int do_bswap) -{ - cpu_physical_memory_write(addr, buf, len); -} - -static void pci_physical_memory_read(void *dma_opaque, target_phys_addr_t addr, - uint8_t *buf, int len, int do_bswap) -{ - cpu_physical_memory_read(addr, buf, len); -} - -static void pci_pcnet_cleanup(VLANClientState *nc) -{ - PCNetState *d = DO_UPCAST(NICState, nc, nc)->opaque; - - pcnet_common_cleanup(d); -} - -static int pci_pcnet_uninit(PCIDevice *dev) -{ - PCIPCNetState *d = DO_UPCAST(PCIPCNetState, pci_dev, dev); - - cpu_unregister_io_memory(d->state.mmio_index); - qemu_del_timer(d->state.poll_timer); - qemu_free_timer(d->state.poll_timer); - qemu_del_vlan_client(&d->state.nic->nc); - return 0; -} - -static NetClientInfo net_pci_pcnet_info = { - .type = NET_CLIENT_TYPE_NIC, - .size = sizeof(NICState), - .can_receive = pcnet_can_receive, - .receive = pcnet_receive, - .cleanup = pci_pcnet_cleanup, -}; - -static int pci_pcnet_init(PCIDevice *pci_dev) -{ - PCIPCNetState *d = DO_UPCAST(PCIPCNetState, pci_dev, pci_dev); - PCNetState *s = &d->state; - uint8_t *pci_conf; - -#if 0 - printf("sizeof(RMD)=%d, sizeof(TMD)=%d\n", - sizeof(struct pcnet_RMD), sizeof(struct pcnet_TMD)); -#endif - - pci_conf = pci_dev->config; - - pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_AMD); - pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_AMD_LANCE); - pci_set_word(pci_conf + PCI_STATUS, - PCI_STATUS_FAST_BACK | PCI_STATUS_DEVSEL_MEDIUM); - pci_conf[PCI_REVISION_ID] = 0x10; - pci_config_set_class(pci_conf, PCI_CLASS_NETWORK_ETHERNET); - - pci_set_word(pci_conf + PCI_SUBSYSTEM_VENDOR_ID, 0x0); - pci_set_word(pci_conf + PCI_SUBSYSTEM_ID, 0x0); - - pci_conf[PCI_INTERRUPT_PIN] = 1; // interrupt pin 0 - pci_conf[PCI_MIN_GNT] = 0x06; - pci_conf[PCI_MAX_LAT] = 0xff; - - /* Handler for memory-mapped I/O */ - s->mmio_index = - cpu_register_io_memory(pcnet_mmio_read, pcnet_mmio_write, &d->state); - - pci_register_bar(pci_dev, 0, PCNET_IOPORT_SIZE, - PCI_BASE_ADDRESS_SPACE_IO, pcnet_ioport_map); - - pci_register_bar(pci_dev, 1, PCNET_PNPMMIO_SIZE, - PCI_BASE_ADDRESS_SPACE_MEMORY, pcnet_mmio_map); - - s->irq = pci_dev->irq[0]; - s->phys_mem_read = pci_physical_memory_read; - s->phys_mem_write = pci_physical_memory_write; - - if (!pci_dev->qdev.hotplugged) { - static int loaded = 0; - if (!loaded) { - rom_add_option("pxe-pcnet.bin"); - loaded = 1; - } - } - - return pcnet_common_init(&pci_dev->qdev, s, &net_pci_pcnet_info); -} - -static void pci_reset(DeviceState *dev) -{ - PCIPCNetState *d = DO_UPCAST(PCIPCNetState, pci_dev.qdev, dev); - - pcnet_h_reset(&d->state); -} - -static PCIDeviceInfo pcnet_info = { - .qdev.name = "pcnet", - .qdev.size = sizeof(PCIPCNetState), - .qdev.reset = pci_reset, - .qdev.vmsd = &vmstate_pci_pcnet, - .init = pci_pcnet_init, - .exit = pci_pcnet_uninit, - .qdev.props = (Property[]) { - DEFINE_NIC_PROPERTIES(PCIPCNetState, state.conf), - DEFINE_PROP_END_OF_LIST(), - } -}; - -static void pcnet_register_devices(void) -{ - pci_qdev_register(&pcnet_info); -} - -device_init(pcnet_register_devices) diff --git a/hw/pcnet.h b/hw/pcnet.h index efacc9f..534bdf9 100644 --- a/hw/pcnet.h +++ b/hw/pcnet.h @@ -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); -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH 2/3] PCI config include 2010-11-27 11:30 ` Paul Brook @ 2010-11-27 11:51 ` Isaku Yamahata 2010-11-27 11:58 ` Paul Brook 0 siblings, 1 reply; 10+ messages in thread From: Isaku Yamahata @ 2010-11-27 11:51 UTC (permalink / raw) To: Paul Brook; +Cc: Blue Swirl, qemu-devel On Sat, Nov 27, 2010 at 11:30:52AM +0000, Paul Brook wrote: > --- > 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(-) > > diff --git a/Makefile.objs b/Makefile.objs > index 72c6c7f..13ba26f 100644 > --- a/Makefile.objs > +++ b/Makefile.objs > @@ -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? -- yamahata ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH 2/3] PCI config include 2010-11-27 11:51 ` Isaku Yamahata @ 2010-11-27 11:58 ` Paul Brook 0 siblings, 0 replies; 10+ messages in thread From: Paul Brook @ 2010-11-27 11:58 UTC (permalink / raw) To: Isaku Yamahata; +Cc: Blue Swirl, qemu-devel > On Sat, Nov 27, 2010 at 11:30:52AM +0000, Paul Brook wrote: > > --- > > > > 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(-) > > > > diff --git a/Makefile.objs b/Makefile.objs > > index 72c6c7f..13ba26f 100644 > > --- a/Makefile.objs > > +++ b/Makefile.objs > > @@ -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? Bah. Three broken commits in as many tries. Clearly I'm not concentrating today. Paul ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Qemu-devel] [PATCH 3/3] VirtIO config option 2010-11-27 0:07 [Qemu-devel] [PATCH 0/3] Reduce duplication in default configs Paul Brook 2010-11-27 0:07 ` [Qemu-devel] [PATCH 1/3] Include directives " Paul Brook 2010-11-27 0:07 ` [Qemu-devel] [PATCH 2/3] PCI config include Paul Brook @ 2010-11-27 0:07 ` Paul Brook 2010-11-27 0:37 ` [Qemu-devel] [PATCH 0/3] Reduce duplication in default configs Paul Brook 3 siblings, 0 replies; 10+ messages in thread From: Paul Brook @ 2010-11-27 0:07 UTC (permalink / raw) To: qemu-devel; +Cc: Paul Brook Make virtio devices optional. Selecting individual devices is not useful as the host bindings are all in one file. Signed-off-by: Paul Brook <paul@codesourcery.com> --- Makefile.objs | 10 ++++++++-- Makefile.target | 4 ++-- default-configs/s390x-softmmu.mak | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 9e85b04..72c6c7f 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -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 ###################################################################### diff --git a/Makefile.target b/Makefile.target index 853045a..5784844 100644 --- a/Makefile.target +++ b/Makefile.target @@ -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 diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak index e69de29..16d7259 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -0,0 +1 @@ +include virtio.mak -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH 0/3] Reduce duplication in default configs 2010-11-27 0:07 [Qemu-devel] [PATCH 0/3] Reduce duplication in default configs Paul Brook ` (2 preceding siblings ...) 2010-11-27 0:07 ` [Qemu-devel] [PATCH 3/3] VirtIO config option Paul Brook @ 2010-11-27 0:37 ` Paul Brook 3 siblings, 0 replies; 10+ messages in thread From: Paul Brook @ 2010-11-27 0:37 UTC (permalink / raw) To: qemu-devel > 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 Which was missing a file. Appologies for the breakage. Paul ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2010-11-27 11:58 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-11-27 0:07 [Qemu-devel] [PATCH 0/3] Reduce duplication in default configs Paul Brook 2010-11-27 0:07 ` [Qemu-devel] [PATCH 1/3] Include directives " Paul Brook 2010-11-27 0:07 ` [Qemu-devel] [PATCH 2/3] PCI config include Paul Brook 2010-11-27 10:10 ` Blue Swirl 2010-11-27 10:50 ` Paul Brook 2010-11-27 11:30 ` Paul Brook 2010-11-27 11:51 ` Isaku Yamahata 2010-11-27 11:58 ` Paul Brook 2010-11-27 0:07 ` [Qemu-devel] [PATCH 3/3] VirtIO config option Paul Brook 2010-11-27 0:37 ` [Qemu-devel] [PATCH 0/3] Reduce duplication in default configs Paul Brook
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).