diff options
| author | Yang Zhong <yang.zhong@intel.com> | 2019-01-23 14:56:15 +0800 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-03-07 21:45:53 +0100 |
| commit | b42075bb77672616127c9452c0f836e757e9ce1a (patch) | |
| tree | 97ce4d2682af74305ea3858f56793317022389c8 /hw | |
| parent | 2ac041c2c3d89691cda1657981c41fe4bc20244b (diff) | |
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>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/9pfs/Kconfig | 2 | ||||
| -rw-r--r-- | hw/block/Kconfig | 7 | ||||
| -rw-r--r-- | hw/char/Kconfig | 2 | ||||
| -rw-r--r-- | hw/display/Kconfig | 2 | ||||
| -rw-r--r-- | hw/input/Kconfig | 4 | ||||
| -rw-r--r-- | hw/net/Kconfig | 2 | ||||
| -rw-r--r-- | hw/scsi/Kconfig | 4 | ||||
| -rw-r--r-- | hw/virtio/Kconfig | 7 | ||||
| -rw-r--r-- | hw/virtio/Makefile.objs | 2 |
9 files changed, 27 insertions, 5 deletions
diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig index c9e244fdff..8c5032c575 100644 --- a/hw/9pfs/Kconfig +++ b/hw/9pfs/Kconfig @@ -1,4 +1,4 @@ config VIRTIO_9P bool default y - depends on VIRTFS + depends on VIRTFS && VIRTIO diff --git a/hw/block/Kconfig b/hw/block/Kconfig index 6a23659a6f..00f9dad372 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -28,8 +28,11 @@ config NVME_PCI config VIRTIO_BLK bool + default y + depends on VIRTIO config VHOST_USER_BLK bool - default y - depends on VHOST_USER && LINUX + # Only PCI devices are provided for now + default y if VIRTIO_PCI + depends on VIRTIO && VHOST_USER && LINUX diff --git a/hw/char/Kconfig b/hw/char/Kconfig index fc184819f4..6360c9fffa 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -26,6 +26,8 @@ config SERIAL_PCI config VIRTIO_SERIAL bool + default y + depends on VIRTIO config STM32F2XX_USART bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 999bc7e9a8..e126cbb188 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -95,6 +95,8 @@ config QXL config VIRTIO_GPU bool + default y + depends on VIRTIO select EDID config VIRTIO_VGA diff --git a/hw/input/Kconfig b/hw/input/Kconfig index e05b7bee24..e2e66f0858 100644 --- a/hw/input/Kconfig +++ b/hw/input/Kconfig @@ -21,11 +21,13 @@ config TSC2005 config VIRTIO_INPUT bool + default y + depends on VIRTIO config VIRTIO_INPUT_HOST bool default y - depends on LINUX + depends on VIRTIO && LINUX config TSC210X bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index 86b880ba33..c562b69019 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -95,6 +95,8 @@ config XILINX_ETHLITE config VIRTIO_NET bool + default y + depends on VIRTIO config ETSEC bool diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig index b9cf269764..b3ba540c17 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -43,10 +43,12 @@ config SPAPR_VSCSI config VIRTIO_SCSI bool + default y + depends on VIRTIO select SCSI config VHOST_USER_SCSI bool # Only PCI devices are provided for now default y if VIRTIO_PCI - depends on VHOST_USER && LINUX + depends on VIRTIO && VHOST_USER && LINUX diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig index 5dafbe35e1..74f4573e18 100644 --- a/hw/virtio/Kconfig +++ b/hw/virtio/Kconfig @@ -3,6 +3,8 @@ config VIRTIO config VIRTIO_RNG bool + default y + depends on VIRTIO config VIRTIO_PCI bool @@ -12,9 +14,14 @@ config VIRTIO_PCI config VIRTIO_MMIO bool + select VIRTIO config VIRTIO_BALLOON bool + default y + depends on VIRTIO config VIRTIO_CRYPTO bool + default y + depends on VIRTIO diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs index a3eb8ed866..f2ab667a21 100644 --- a/hw/virtio/Makefile.objs +++ b/hw/virtio/Makefile.objs @@ -29,6 +29,8 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio-blk-pci.o obj-$(CONFIG_VIRTIO_NET) += virtio-net-pci.o obj-$(CONFIG_VIRTIO_SERIAL) += virtio-serial-pci.o endif +else +common-obj-y += vhost-stub.o endif common-obj-$(CONFIG_ALL) += vhost-stub.o |