Skip to content

Commit

Permalink
target-s390: Don't compile in virtio-pci
Browse files Browse the repository at this point in the history 
As soon as virtio-pci.c gets compiled and used on S390 the internal qdev magic
gets confused and tries to give us PCI devices instead of S390 virtio devices.

Since we don't have PCI on S390, we can safely not compile virtio-pci at all.

In order to do this I added a new config option "CONFIG_VIRTIO_PCI" that I
enabled for every platform except S390. Thanks to this the change should be a
complete nop for every other platform.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
  • Loading branch information
@agraf @aurel32
agraf authored and aurel32 committed Mar 26, 2010
1 parent de6a1de commit b305b9d
Show file tree
Hide file tree
Showing 18 changed files with 19 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Makefile.objs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@ user-obj-y += cutils.o cache-utils.o

hw-obj-y =
hw-obj-y += loader.o
hw-obj-y += virtio.o virtio-console.o virtio-pci.o
hw-obj-y += virtio.o virtio-console.o
hw-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
hw-obj-y += fw_cfg.o pci.o pci_host.o pcie_host.o
hw-obj-y += watchdog.o
hw-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o
Expand Down
1 change: 1 addition & 0 deletions default-configs/arm-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ CONFIG_SSI_SD=y
CONFIG_LAN9118=y
CONFIG_SMC91C111=y
CONFIG_DS1338=y
CONFIG_VIRTIO_PCI=y
1 change: 1 addition & 0 deletions default-configs/cris-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@

CONFIG_NAND=y
CONFIG_PTIMER=y
CONFIG_VIRTIO_PCI=y
1 change: 1 addition & 0 deletions default-configs/i386-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y
CONFIG_PIIX_PCI=y
CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y
1 change: 1 addition & 0 deletions default-configs/m68k-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@

CONFIG_GDBSTUB_XML=y
CONFIG_PTIMER=y
CONFIG_VIRTIO_PCI=y
1 change: 1 addition & 0 deletions default-configs/microblaze-softmmu.mak
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Default configuration for microblaze-softmmu

CONFIG_PTIMER=y
CONFIG_VIRTIO_PCI=y
1 change: 1 addition & 0 deletions default-configs/mips-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y
CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y
1 change: 1 addition & 0 deletions default-configs/mips64-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y
CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y
1 change: 1 addition & 0 deletions default-configs/mips64el-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y
CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y
1 change: 1 addition & 0 deletions default-configs/mipsel-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y
CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y
1 change: 1 addition & 0 deletions default-configs/ppc-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_CMD646=y
CONFIG_NE2000_ISA=y
CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y
1 change: 1 addition & 0 deletions default-configs/ppc64-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_CMD646=y
CONFIG_NE2000_ISA=y
CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y
1 change: 1 addition & 0 deletions default-configs/ppcemb-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_CMD646=y
CONFIG_NE2000_ISA=y
CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y
1 change: 1 addition & 0 deletions default-configs/sh4-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
CONFIG_USB_OHCI=y
CONFIG_SERIAL=y
CONFIG_PTIMER=y
CONFIG_VIRTIO_PCI=y
1 change: 1 addition & 0 deletions default-configs/sh4eb-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
CONFIG_USB_OHCI=y
CONFIG_SERIAL=y
CONFIG_PTIMER=y
CONFIG_VIRTIO_PCI=y
1 change: 1 addition & 0 deletions default-configs/sparc-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ CONFIG_ESCC=y
CONFIG_M48T59=y
CONFIG_PTIMER=y
CONFIG_FDC=y
CONFIG_VIRTIO_PCI=y
1 change: 1 addition & 0 deletions default-configs/sparc64-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ CONFIG_IDE_QDEV=y
CONFIG_IDE_PCI=y
CONFIG_IDE_ISA=y
CONFIG_IDE_CMD646=y
CONFIG_VIRTIO_PCI=y
1 change: 1 addition & 0 deletions default-configs/x86_64-softmmu.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y
CONFIG_PIIX_PCI=y
CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y

0 comments on commit b305b9d

Please sign in to comment.