Commit b5dfdb08 authored May 22, 2018 by Paolo Bonzini

hw: make virtio devices configurable via default-configs/



This is only half of the work, because the proxy devices (virtio-*-pci,
virtio-*-ccw, etc.) are still included unconditionally.  It is still a
move in the right direction.

Based-on: <20180522194943.24871-1-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 890b126e

default-configs/arm-softmmu.mak

+1 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ CONFIG_USB=y
		CONFIG_USB_MUSB=y
		CONFIG_USB_EHCI_SYSBUS=y
		CONFIG_PLATFORM_BUS=y
		CONFIG_VIRTIO_MMIO=y

		CONFIG_ARM11MPCORE=y
		CONFIG_A9MPCORE=y

default-configs/hppa-softmmu.mak

+0 −2

Original line number	Diff line number	Diff line
		@@ -4,8 +4,6 @@ CONFIG_SERIAL=y
		CONFIG_SERIAL_ISA=y
		CONFIG_ISA_BUS=y
		CONFIG_I8259=y
		CONFIG_VIRTIO_PCI=$(CONFIG_PCI)
		CONFIG_VIRTIO=y
		CONFIG_E1000_PCI=y
		CONFIG_IDE_ISA=y
		CONFIG_IDE_CMD646=y

default-configs/pci.mak

+1 −3

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ CONFIG_PCI=y
		# For now, CONFIG_IDE_CORE requires ISA, so we enable it here
		CONFIG_ISA_BUS=y
		CONFIG_VIRTIO_PCI=y
		CONFIG_VIRTIO=y
		include virtio.mak
		CONFIG_USB_UHCI=y
		CONFIG_USB_OHCI=y
		CONFIG_USB_EHCI=y
		@@ -46,5 +46,3 @@ CONFIG_VGA=y
		CONFIG_VGA_PCI=y
		CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM)
		CONFIG_ROCKER=y
		CONFIG_VHOST_USER_SCSI=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))
		CONFIG_VHOST_USER_BLK=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))

default-configs/riscv32-softmmu.mak

+2 −2

Original line number	Diff line number	Diff line
		# Default configuration for riscv-softmmu

		CONFIG_SERIAL=y
		CONFIG_VIRTIO=y
		CONFIG_SCSI=y
		CONFIG_VIRTIO_MMIO=y
		include virtio.mak

default-configs/riscv64-softmmu.mak

+2 −2

Original line number	Diff line number	Diff line
		# Default configuration for riscv-softmmu

		CONFIG_SERIAL=y
		CONFIG_VIRTIO=y
		CONFIG_SCSI=y
		CONFIG_VIRTIO_MMIO=y
		include virtio.mak