ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio: express virtio dependencies with Kconfig 

Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20190123065618.3520-42-yang.zhong@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Yang Zhong 2019-01-23 14:56:15 +08:00 committed by Paolo Bonzini
parent 2ac041c2c3
commit b42075bb77
12 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,6 @@
# Default configuration for i386-softmmu # Default configuration for i386-softmmu
CONFIG_VMXNET3_PCI=y CONFIG_VMXNET3_PCI=y
CONFIG_VIRTIO_VGA=y
CONFIG_IPMI=y CONFIG_IPMI=y
CONFIG_IPMI_LOCAL=y CONFIG_IPMI_LOCAL=y
CONFIG_IPMI_EXTERN=y CONFIG_IPMI_EXTERN=y

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

@ -1,6 +1,5 @@
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_PCI=y
include virtio.mak
CONFIG_SCLPCONSOLE=y CONFIG_SCLPCONSOLE=y
CONFIG_TERMINAL3270=y CONFIG_TERMINAL3270=y
CONFIG_S390_FLIC=y CONFIG_S390_FLIC=y

11
default-configs/virtio.mak
View File

@ -1,11 +0,0 @@
CONFIG_VIRTIO=y
CONFIG_VIRTIO_9P=$(CONFIG_VIRTFS)
CONFIG_VIRTIO_BALLOON=y
CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_CRYPTO=y
CONFIG_VIRTIO_GPU=y
CONFIG_VIRTIO_INPUT=y
CONFIG_VIRTIO_NET=y
CONFIG_VIRTIO_RNG=y
CONFIG_VIRTIO_SCSI=y
CONFIG_VIRTIO_SERIAL=y

2
hw/9pfs/Kconfig
View File

@ -1,4 +1,4 @@
config VIRTIO_9P config VIRTIO_9P
bool bool
default y default y
depends on VIRTFS depends on VIRTFS && VIRTIO

7
hw/block/Kconfig
View File

@ -28,8 +28,11 @@ config NVME_PCI
config VIRTIO_BLK config VIRTIO_BLK
bool bool
default y
depends on VIRTIO
config VHOST_USER_BLK config VHOST_USER_BLK
bool bool
default y # Only PCI devices are provided for now
depends on VHOST_USER && LINUX default y if VIRTIO_PCI
depends on VIRTIO && VHOST_USER && LINUX

2
hw/char/Kconfig
View File

@ -26,6 +26,8 @@ config SERIAL_PCI
config VIRTIO_SERIAL config VIRTIO_SERIAL
bool bool
default y
depends on VIRTIO
config STM32F2XX_USART config STM32F2XX_USART
bool bool

2
hw/display/Kconfig
View File

@ -95,6 +95,8 @@ config QXL
config VIRTIO_GPU config VIRTIO_GPU
bool bool
default y
depends on VIRTIO
select EDID select EDID
config VIRTIO_VGA config VIRTIO_VGA

4
hw/input/Kconfig
View File

@ -21,11 +21,13 @@ config TSC2005
config VIRTIO_INPUT config VIRTIO_INPUT
bool bool
default y
depends on VIRTIO
config VIRTIO_INPUT_HOST config VIRTIO_INPUT_HOST
bool bool
default y default y
depends on LINUX depends on VIRTIO && LINUX
config TSC210X config TSC210X
bool bool

2
hw/net/Kconfig
View File

@ -95,6 +95,8 @@ config XILINX_ETHLITE
config VIRTIO_NET config VIRTIO_NET
bool bool
default y
depends on VIRTIO
config ETSEC config ETSEC
bool bool

4
hw/scsi/Kconfig
View File

@ -43,10 +43,12 @@ config SPAPR_VSCSI
config VIRTIO_SCSI config VIRTIO_SCSI
bool bool
default y
depends on VIRTIO
select SCSI select SCSI
config VHOST_USER_SCSI config VHOST_USER_SCSI
bool bool
# Only PCI devices are provided for now # Only PCI devices are provided for now
default y if VIRTIO_PCI default y if VIRTIO_PCI
depends on VHOST_USER && LINUX depends on VIRTIO && VHOST_USER && LINUX

7
hw/virtio/Kconfig
View File

@ -3,6 +3,8 @@ config VIRTIO
config VIRTIO_RNG config VIRTIO_RNG
bool bool
default y
depends on VIRTIO
config VIRTIO_PCI config VIRTIO_PCI
bool bool
@ -12,9 +14,14 @@ config VIRTIO_PCI
config VIRTIO_MMIO config VIRTIO_MMIO
bool bool
select VIRTIO
config VIRTIO_BALLOON config VIRTIO_BALLOON
bool bool
default y
depends on VIRTIO
config VIRTIO_CRYPTO config VIRTIO_CRYPTO
bool bool
default y
depends on VIRTIO

2
hw/virtio/Makefile.objs
View File

@ -29,6 +29,8 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio-blk-pci.o
obj-$(CONFIG_VIRTIO_NET) += virtio-net-pci.o obj-$(CONFIG_VIRTIO_NET) += virtio-net-pci.o
obj-$(CONFIG_VIRTIO_SERIAL) += virtio-serial-pci.o obj-$(CONFIG_VIRTIO_SERIAL) += virtio-serial-pci.o
endif endif
else
common-obj-y += vhost-stub.o
endif endif
common-obj-$(CONFIG_ALL) += vhost-stub.o common-obj-$(CONFIG_ALL) += vhost-stub.o