From nobody Sun Oct 5 01:45:10 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 1551729041893244.43292337277182; Mon, 4 Mar 2019 11:50:41 -0800 (PST) Received: from localhost ([127.0.0.1]:59934 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tbe-0002Ai-Os for importer@patchew.org; Mon, 04 Mar 2019 14:50:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCk-00027R-Md for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCi-0004Oe-9n for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:46 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:39620) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCg-0004JL-AA for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:44 -0500 Received: by mail-wr1-x42b.google.com with SMTP id l5so6631390wrw.6 for ; Mon, 04 Mar 2019 10:20:41 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:39 -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=iSXk9KCicYfgF8uwfUzcght9fB88UzP387jWbnzflKQ=; b=e6PkzUgM6xfi+PPk26mLe9uuvfsHG++EXx5H+rP+l/cYXB5MOypjdszoMnFR5Bae5W gALNvokGhKtw7zkMOdhQ771+CC14Sacgvdxjfqa0Z1VGi+XNYQhj6Ee4qeP1hRvlB/mk mH49vUSG9NNL52LyNq4OBBxjm3lCr9BFTPYk8+TUwHJIViIwtwAuUhzaURwxKpufb+o0 EM2cRukwqx1fBhFGQsJ/dCfWHxXvnVmltPypl6X31TptpLBSPYDtyv91EHQTaLBM4Aun ViUqemK0Y+CiR802t3RyiZViQiOgTzX37LGguZTjgw/05jG8bQ/f/na+MyIuN8w7ows2 hICQ== 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=iSXk9KCicYfgF8uwfUzcght9fB88UzP387jWbnzflKQ=; b=V3UK4QVigntvcBfoPUnxqIHouHXdbs6SEQjC7NfF1xI+wQ0KRlUB6s6qPrNJX9Y1kh GtnQe7nsp6ON1pu2DpJ7mxNJr2AjQQ7BbakRBBCT6gH0hm0uipLD38tJEhFonz65iJiV hSb7xKgEG6UFDdVFTjoO9AralD3Y6uquBQGWaRGj63ff2JpB4toR50SZ9EcVpdm66Gfb n/NvCnMR7gAeVqLA3Ud4TMhFbHBQJtZSL695xDJ45ymALJ5GvazXs0nlXg4EfbLCZKEq IMoZCiU2n4+y08yHwthk2EbpLirifBqIAlqnbSzVQ1UBE6MRB9FjAoQhkBuD8+sibl2r P6Bg== X-Gm-Message-State: APjAAAUXBKvhMqTSk6rcoNH+vfr+/pfwfxfs6SJmZJZFcn/04ZgC8tsn xwrN4x291f7TnCD76iQhd7VAeTm3 X-Google-Smtp-Source: APXvYqw89GcuIy1n55FLB3FamnZ/T4MVxjtsN3W6QKpi4f5Hnh7J5kR0OtCbXSsXEOoiwQ6ckVu0wQ== X-Received: by 2002:adf:ffcd:: with SMTP id x13mr13153457wrs.20.1551723640413; Mon, 04 Mar 2019 10:20:40 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:45 +0100 Message-Id: <1551723614-1823-26-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551723614-1823-1-git-send-email-pbonzini@redhat.com> References: <1551723614-1823-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::42b Subject: [Qemu-devel] [PULL 25/54] 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 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/block/Kconfig | 2 ++ hw/char/Kconfig | 2 ++ hw/display/Kconfig | 2 +- hw/input/Kconfig | 4 +++- hw/net/Kconfig | 2 ++ hw/scsi/Kconfig | 2 ++ hw/virtio/Kconfig | 7 +++++++ hw/virtio/Makefile.objs | 2 ++ 11 files changed, 21 insertions(+), 15 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 7e6d467..0000000 --- a/default-configs/virtio.mak +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG_VIRTIO=3Dy -CONFIG_VIRTIO_BALLOON=3Dy -CONFIG_VIRTIO_BLK=3Dy -CONFIG_VIRTIO_CRYPTO=3Dy -CONFIG_VIRTIO_GPU=3Dy -CONFIG_EDID=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/block/Kconfig b/hw/block/Kconfig index 0aa82ac..f89e4eb 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -28,6 +28,8 @@ config NVME_PCI =20 config VIRTIO_BLK bool + default y + depends on VIRTIO =20 config VHOST_USER_BLK bool 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 5529d0f..e126cbb 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -95,7 +95,7 @@ config QXL =20 config VIRTIO_GPU bool - default y if PCI_DEVICES + default y depends on VIRTIO select EDID =20 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 86b880b..c562b69 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 a696ff0..c0031a4 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -43,6 +43,8 @@ config SPAPR_VSCSI =20 config VIRTIO_SCSI bool + default y + depends on VIRTIO select SCSI =20 config VHOST_USER_SCSI 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 diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs index a3eb8ed..f2ab667 100644 --- a/hw/virtio/Makefile.objs +++ b/hw/virtio/Makefile.objs @@ -29,6 +29,8 @@ obj-$(CONFIG_VIRTIO_BLK) +=3D virtio-blk-pci.o obj-$(CONFIG_VIRTIO_NET) +=3D virtio-net-pci.o obj-$(CONFIG_VIRTIO_SERIAL) +=3D virtio-serial-pci.o endif +else +common-obj-y +=3D vhost-stub.o endif =20 common-obj-$(CONFIG_ALL) +=3D vhost-stub.o --=20 1.8.3.1