mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target-s390: Don't compile in virtio-pci

Browse Source 
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>
This commit is contained in:
Alexander Graf 2010-03-25 14:59:02 +01:00 committed by Aurelien Jarno
parent de6a1deccf
commit b305b9d7d6
18 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.objs
View File

@ -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

1
default-configs/arm-softmmu.mak
View File

@ -24,3 +24,4 @@ CONFIG_SSI_SD=y
CONFIG_LAN9118=y
CONFIG_SMC91C111=y
CONFIG_DS1338=y
CONFIG_VIRTIO_PCI=y

1
default-configs/cris-softmmu.mak
View File

@ -2,3 +2,4 @@
CONFIG_NAND=y
CONFIG_PTIMER=y
CONFIG_VIRTIO_PCI=y

1
default-configs/i386-softmmu.mak
View File

@ -16,3 +16,4 @@ CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y
CONFIG_PIIX_PCI=y
CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y

1
default-configs/m68k-softmmu.mak
View File

@ -2,3 +2,4 @@
CONFIG_GDBSTUB_XML=y
CONFIG_PTIMER=y
CONFIG_VIRTIO_PCI=y

1
default-configs/microblaze-softmmu.mak
View File

@ -1,3 +1,4 @@
# Default configuration for microblaze-softmmu
CONFIG_PTIMER=y
CONFIG_VIRTIO_PCI=y

1
default-configs/mips-softmmu.mak
View File

@ -16,3 +16,4 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y
CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y

1
default-configs/mips64-softmmu.mak
View File

@ -16,3 +16,4 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y
CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y

1
default-configs/mips64el-softmmu.mak
View File

@ -16,3 +16,4 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y
CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y

1
default-configs/mipsel-softmmu.mak
View File

@ -16,3 +16,4 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y
CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y

1
default-configs/ppc-softmmu.mak
View File

@ -15,3 +15,4 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_CMD646=y
CONFIG_NE2000_ISA=y
CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y

1
default-configs/ppc64-softmmu.mak
View File

@ -15,3 +15,4 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_CMD646=y
CONFIG_NE2000_ISA=y
CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y

1
default-configs/ppcemb-softmmu.mak
View File

@ -15,3 +15,4 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_CMD646=y
CONFIG_NE2000_ISA=y
CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y

1
default-configs/sh4-softmmu.mak
View File

@ -3,3 +3,4 @@
CONFIG_USB_OHCI=y
CONFIG_SERIAL=y
CONFIG_PTIMER=y
CONFIG_VIRTIO_PCI=y

1
default-configs/sh4eb-softmmu.mak
View File

@ -3,3 +3,4 @@
CONFIG_USB_OHCI=y
CONFIG_SERIAL=y
CONFIG_PTIMER=y
CONFIG_VIRTIO_PCI=y

1
default-configs/sparc-softmmu.mak
View File

@ -7,3 +7,4 @@ CONFIG_ESCC=y
CONFIG_M48T59=y
CONFIG_PTIMER=y
CONFIG_FDC=y
CONFIG_VIRTIO_PCI=y

1
default-configs/sparc64-softmmu.mak
View File

@ -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
default-configs/x86_64-softmmu.mak
View File

@ -16,3 +16,4 @@ CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y
CONFIG_PIIX_PCI=y
CONFIG_SOUND=y
CONFIG_VIRTIO_PCI=y