From nobody Mon Feb 9 17:59:12 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548413637798873.2890048007833; Fri, 25 Jan 2019 02:53:57 -0800 (PST) Received: from localhost ([127.0.0.1]:41992 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmz7C-0002Z2-NT for importer@patchew.org; Fri, 25 Jan 2019 05:53:38 -0500 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) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.08.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:08:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=gqE25SheIbG6Dva3ncPmM+nl+vPJ2HoFzZg1RBJclNU=; b=AZVeEIwo8MJjskhK6ExipCLlbZdtb/hxqBZkrDGnOwG6rdkL3Z2Sa0wrV1gt+NOGAM ydbfE1iSYQeH9h1T7eeNxEvV78vSZXYH6zeoltLerNc3/YqSKJPTmBICxI9stZwcXuza Kw9UJDbmrltOC+kY+e0f0svO7XaDJS5kPldZ1WnRIdokwkV6iV/uNViCj1pHBpiiaEG1 MBXcKLi0qcPQ7E0Iazj7RIXzFPxs6YUB8CzUs4bV2w6yT4sCG+u7o3i4ld4U73Gj/b16 MMsZdTdzYvkcpUsK9bGJrC1DfFXQeN3asMxCMvpqyPWwi3tNZJbWOA2wLhKbmEGkBm91 x+/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=gqE25SheIbG6Dva3ncPmM+nl+vPJ2HoFzZg1RBJclNU=; b=GhOkJb/yeiLUk6n2xwlYkVL7SWf+R2aev0CStkzVZy6vQWWBygD51mfihAKdE1tuW7 BFFKpAJVCDKBEq6IIQoUPKGecvH8ZhMz1JrmEjPOToO2EOURi23lm884y7ibHMphPA5M iHh240PHHfbuXnYXY3VsEJCvIbZTuGmpnGFWJ3Kqk/KBoGsVyQXzmi8BnniOhv1r3pO8 Hg2/aitSSfSVJw8RK2Ax0NFjannyxwesTu607mrjw/hpGDU1XB8iHDrBJKO0qqCrleHb RSl3etQajYPeYHdlqoURh+mZ2nVb7XR/Ksz8RC8gvVnHvpq6IfGNgONP47JabSeeHoX/ Q5mg== X-Gm-Message-State: AJcUukc7SnSEuM0dtz1ZAtbmalvAz+Yx4uRoec+1vVKQtWLvl0pXOnmT mwNNUSlyXErZir0zVMJHfvNi4eLi X-Google-Smtp-Source: ALg8bN4PPbXiRP/bmcio4WcP+1sNVMzfU1//z6lE3DIcIhvHWrSD6i3ViMyDJL9Zw3VLtN9jgNqZ7Q== X-Received: by 2002:a1c:c10f:: with SMTP id r15mr6158297wmf.27.1548410881389; Fri, 25 Jan 2019 02:08:01 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:07:07 +0100 Message-Id: <1548410831-19553-49-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH 48/52] virtio: express virtio dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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-softmm= u.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 =20 CONFIG_VMXNET3_PCI=3Dy -CONFIG_VIRTIO_VGA=3Dy CONFIG_IPMI=3Dy CONFIG_IPMI_LOCAL=3Dy CONFIG_IPMI_EXTERN=3Dy diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-soft= mmu.mak index 2794ffb..2be5059 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -1,6 +1,5 @@ CONFIG_PCI=3Dy CONFIG_VIRTIO_PCI=3Dy -include virtio.mak CONFIG_SCLPCONSOLE=3Dy CONFIG_TERMINAL3270=3Dy CONFIG_S390_FLIC=3Dy 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=3Dy -CONFIG_VIRTIO_9P=3D$(CONFIG_VIRTFS) -CONFIG_VIRTIO_BALLOON=3Dy -CONFIG_VIRTIO_BLK=3Dy -CONFIG_VIRTIO_CRYPTO=3Dy -CONFIG_VIRTIO_GPU=3Dy -CONFIG_VIRTIO_INPUT=3Dy -CONFIG_VIRTIO_NET=3Dy -CONFIG_VIRTIO_RNG=3Dy -CONFIG_SCSI=3Dy -CONFIG_VIRTIO_SCSI=3Dy -CONFIG_VIRTIO_SERIAL=3Dy 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 =20 config VIRTIO_BLK bool + default y + depends on VIRTIO =20 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 =20 config VIRTIO_SERIAL bool + default y + depends on VIRTIO =20 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 =20 config VIRTIO_GPU bool + default y + depends on VIRTIO =20 config VIRTIO_VGA bool - default y if PCI_DEVICES && VIRTIO - depends on PCI + default y if PCI_DEVICES + depends on VIRTIO && PCI select VGA =20 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 =20 config VIRTIO_INPUT bool + default y + depends on VIRTIO =20 config VIRTIO_INPUT_HOST bool default y if LINUX - depends on LINUX + depends on VIRTIO && LINUX =20 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 =20 config VIRTIO_NET bool + default y + depends on VIRTIO =20 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 =20 config VIRTIO_SCSI bool + default y + depends on VIRTIO select SCSI =20 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 =20 config VIRTIO_RNG bool + default y + depends on VIRTIO =20 config VIRTIO_PCI bool @@ -12,9 +14,14 @@ config VIRTIO_PCI =20 config VIRTIO_MMIO bool + select VIRTIO =20 config VIRTIO_BALLOON bool + default y + depends on VIRTIO =20 config VIRTIO_CRYPTO bool + default y + depends on VIRTIO --=20 1.8.3.1