From nobody Fri Dec 19 07:47:14 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) 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=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) 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 1549564243984454.9233840767099; Thu, 7 Feb 2019 10:30:43 -0800 (PST) Received: from localhost ([127.0.0.1]:44900 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groRc-0002iz-HH for importer@patchew.org; Thu, 07 Feb 2019 13:30:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnw3-000261-W2 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnw2-0002N0-NP for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:03 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:40395) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnw2-0002MS-Gl for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:02 -0500 Received: by mail-wr1-x443.google.com with SMTP id q1so810782wrp.7 for ; Thu, 07 Feb 2019 09:58:02 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58: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=Vd3KTs3zfUbsLp3AY/GgOxrywylBBmYCO0jqCU9xzGM=; b=IrOtBBLNIsNbs+jSV4Vzw7fMGcu00vcGfuAeUsyXF49D9OiFJHqNm0je/XGobjHu/G btAhRSAYu5EQupKdtKTQdDqCklMi+yM6dQQdc/SboHjsgMYvTBCBsoIZtzlNveHMRYKz OUTRbnV5lmsgqDrmqhYKyveZrY+qwdnSVXSOYKc0mmOOU/DEDT2HvzXnw0XQyhTJLIg4 Gykq5GRs+NPb8YJZnQWpYLJZycvh48j66AirTesrMjDVzlEAak8lnvUT10MoJlyv5plg y7lmdbcc+15LUIp0p8krjorFt01e9yix9gRI+cSDIEgTENsvwqt+mGGiWNRhMpMfDamT 0y+Q== 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=Vd3KTs3zfUbsLp3AY/GgOxrywylBBmYCO0jqCU9xzGM=; b=UCIBVNFfqdsAk12iSLT9sLpV1ShM9DG4vvlKudyPf/E2Rjk2sV/BveSIIzuZh3P8h2 KU+23CurpI28dCuyo30gU+YognfPFCowCU7WpKRBJqyhyRvGAStgpKLO09wdulFAOZ5R 8Tbn0K2IhR3U9NdTQTOU/kaxdHQtSNstnZFJ/LhGQDdVUj7gCmh5ZUrBUlpcs/TqRuMU S861o3sb0GFaRDzsJGoZKo2JlX9ttjsA3xxpeEW03Eqc9e/pfe+qLJVa38YcHW/j3Te3 2cVOjlYpUSnQB4Qvbmyq2KfoCYVXQm7fRE71aVbf70zKI5gscIydadhBpB9R217E061U EbrQ== X-Gm-Message-State: AHQUAubjLIkFe0JeVJjjKJLdN27FPYlZiBpndTB9dq9DTji38jDxfIZK Px+9JcBojBjp/+X+xeXdG7VkmB7N X-Google-Smtp-Source: AHgI3IaiWZ2vqcBBzPL36imCxbcxPAae6HBf4C6RA+9QTmhVPKWCT2jZPazYukRBWmeBKbVLQVFLDQ== X-Received: by 2002:adf:dfd1:: with SMTP id q17mr13828712wrn.27.1549562281366; Thu, 07 Feb 2019 09:58:01 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:06 +0100 Message-Id: <1549562254-41157-24-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-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::443 Subject: [Qemu-devel] [PATCH 23/51] 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 , thuth@redhat.com, philmd@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 | 11 ----------- hw/9pfs/Kconfig | 2 +- hw/block/Kconfig | 7 +++++-- hw/char/Kconfig | 2 ++ hw/display/Kconfig | 2 ++ hw/input/Kconfig | 4 +++- hw/net/Kconfig | 2 ++ hw/scsi/Kconfig | 4 +++- hw/virtio/Kconfig | 7 +++++++ 11 files changed, 25 insertions(+), 18 deletions(-) delete mode 100644 default-configs/virtio.mak diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index c0826f5..53e9d5e 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 82d0726..0000000 --- a/default-configs/virtio.mak +++ /dev/null @@ -1,11 +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_VIRTIO_SCSI=3Dy -CONFIG_VIRTIO_SERIAL=3Dy diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig index 32071c1..e658e40 100644 --- a/hw/9pfs/Kconfig +++ b/hw/9pfs/Kconfig @@ -3,4 +3,4 @@ config VIRTFS config VIRTIO_9P bool default y - depends on VIRTFS + depends on VIRTFS && VIRTIO diff --git a/hw/block/Kconfig b/hw/block/Kconfig index 6a23659..00f9dad 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -28,8 +28,11 @@ config NVME_PCI =20 config VIRTIO_BLK bool + default y + depends on VIRTIO =20 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 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 6d58f93..0f659e9 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -95,6 +95,8 @@ config QXL =20 config VIRTIO_GPU bool + default y + depends on VIRTIO =20 config VIRTIO_VGA bool diff --git a/hw/input/Kconfig b/hw/input/Kconfig index e05b7be..e2e66f0 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 - depends on LINUX + depends on VIRTIO && LINUX =20 config TSC210X bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index 982e139..dc69e55 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -95,6 +95,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