From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:58587) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyP7-0007z2-4f for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyP4-0002FY-VT for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:04 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:34472) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyP4-0002Ex-Mt for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:02 -0500 Received: by mail-wm1-x342.google.com with SMTP id y185so4410505wmd.1 for ; Fri, 25 Jan 2019 02:08:02 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 25 Jan 2019 11:07:07 +0100 Message-Id: <1548410831-19553-49-git-send-email-pbonzini@redhat.com> In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 48/52] virtio: express virtio dependencies with Kconfig List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: yang.zhong@intel.com, thuth@redhat.com From: Yang Zhong Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-42-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/i386-softmmu.mak | 1 - default-configs/s390x-softmmu.mak | 1 - default-configs/virtio.mak | 12 ------------ hw/9pfs/Kconfig | 1 + hw/block/Kconfig | 6 +++++- hw/char/Kconfig | 2 ++ hw/display/Kconfig | 6 ++++-- hw/input/Kconfig | 4 +++- hw/net/Kconfig | 2 ++ hw/scsi/Kconfig | 4 +++- hw/virtio/Kconfig | 7 +++++++ 11 files changed, 27 insertions(+), 19 deletions(-) delete mode 100644 default-configs/virtio.mak diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 42435d7..f29f83e 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,7 +1,6 @@ # Default configuration for i386-softmmu CONFIG_VMXNET3_PCI=y -CONFIG_VIRTIO_VGA=y CONFIG_IPMI=y CONFIG_IPMI_LOCAL=y CONFIG_IPMI_EXTERN=y diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak index 2794ffb..2be5059 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -1,6 +1,5 @@ CONFIG_PCI=y CONFIG_VIRTIO_PCI=y -include virtio.mak CONFIG_SCLPCONSOLE=y CONFIG_TERMINAL3270=y CONFIG_S390_FLIC=y diff --git a/default-configs/virtio.mak b/default-configs/virtio.mak deleted file mode 100644 index 51599ed..0000000 --- a/default-configs/virtio.mak +++ /dev/null @@ -1,12 +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_SCSI=y -CONFIG_VIRTIO_SCSI=y -CONFIG_VIRTIO_SERIAL=y diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig index 84d2366..0a4296d 100644 --- a/hw/9pfs/Kconfig +++ b/hw/9pfs/Kconfig @@ -3,3 +3,4 @@ config VIRTFS config VIRTIO_9P bool default y if VIRTFS + depends on VIRTIO diff --git a/hw/block/Kconfig b/hw/block/Kconfig index dc91e67..00f9dad 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -28,7 +28,11 @@ config NVME_PCI config VIRTIO_BLK bool + default y + depends on VIRTIO config VHOST_USER_BLK bool - default y if 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 fc18481..6360c9f 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 bbd772b..c784fe8 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -94,11 +94,13 @@ config QXL config VIRTIO_GPU bool + default y + depends on VIRTIO config VIRTIO_VGA bool - default y if PCI_DEVICES && VIRTIO - depends on PCI + default y if PCI_DEVICES + depends on VIRTIO && PCI select VGA config DPCD diff --git a/hw/input/Kconfig b/hw/input/Kconfig index ec014a9..41eb1db 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 if LINUX - depends on LINUX + depends on VIRTIO && LINUX config TSC210X bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index e575bf5..47368d7 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -94,6 +94,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 b9cf269..b3ba540 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 5dafbe3..74f4573 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 -- 1.8.3.1