From nobody Sun Oct 5 00:06:42 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 1551726165044894.2128356919483; Mon, 4 Mar 2019 11:02:45 -0800 (PST) Received: from localhost ([127.0.0.1]:59238 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0srK-0003eH-2W for importer@patchew.org; Mon, 04 Mar 2019 14:02:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45589) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCJ-0001j3-PN for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCJ-0003b3-48 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:19 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:41180) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCI-0003aG-SV for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:19 -0500 Received: by mail-wr1-x42e.google.com with SMTP id n2so6632541wrw.8 for ; Mon, 04 Mar 2019 10:20:18 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:17 -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=UELZZFGuOSKHSOTDqFd4P08XlGWHaWt9WwMO4hy4Irs=; b=pcrCUI5uvugkR7dl8G4lnQbtQzdc9Xc4ANOan0e778OE17jHNRPNGVEMlyqRn/0kks w0mMKJUpWHK8pwfs7rPgL+D/mWM+IcXfJL2xJ2C/Cffk1c5Hb56iXnpj9X40aS/igBYi ZOpJcYe6y/7vkkce3jSmTtJ/gR/nLc+ev360l8MhQ1LaiYlYQ5iNclx6OVjd74A3YiHB qq2Ib4EbDKrr8oA2J48FaC1mQHAa8VU6kVeUzUJ1eLUTeqZuLMtFQYCRaPXRRdxJOJz+ durJSUU4gV33czoN71Mv9nhdVgoTWSKsiKlvze2Hlc88805TuM92rtxMMBPcyJ4b6P+1 SwVQ== 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=UELZZFGuOSKHSOTDqFd4P08XlGWHaWt9WwMO4hy4Irs=; b=qzon3hmHeFK83dHvcBRZlI9pi/HmS9178BmjvavTzMVmxegDaZ2LJq0unTnmxGJMZr 91YGoGuodYlEK26ts8fNbfvW7/c6xP9YTID8lYA881cmSpNhsbvGlH8FJuKKhn3ijlVj WGF8sLP9BccPUYLn2wFYnHz7uOmEOIlTSdh1V+/YeePtr59LHD8XpO2NOGyoj9i6OG6W vBDjTfWFvsfOvtja+K/fI09/481DWq3NcVWp7MPoNdz/Hqe/7iNVwdSRJlsddfGIhHGG SL7Z2dDrCoVnVQE2VEQptSpGW4EOMcBzWOPPpGdcmh2bE/v8Qu1p1u6p6yg0ZyRIzDgR LNIg== X-Gm-Message-State: APjAAAX2AwahsyBduQlogMgdQRczzUI8TT4YbbpdAmu2K8cBhdK5eHvL 5zQP9psnBngsnWwPGkStGWT+sPJb X-Google-Smtp-Source: APXvYqyDuxyaBeyRNZMwvckeYucGJjInLUPYuVMUlKBvMoNvDK5viQL4DhYAEoqCjpTQESaW1wNtjg== X-Received: by 2002:a05:6000:1142:: with SMTP id d2mr13265738wrx.43.1551723617511; Mon, 04 Mar 2019 10:20:17 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:21 +0100 Message-Id: <1551723614-1823-2-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::42e Subject: [Qemu-devel] [PULL 01/54] block: fix recursion in hw/block/dataplane 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" There are Xen files in hw/block/dataplane that should be compiled even if virtio-blk is disabled. Signed-off-by: Paolo Bonzini --- hw/block/Makefile.objs | 3 ++- hw/block/dataplane/Makefile.objs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs index e206b8e..f5f643f 100644 --- a/hw/block/Makefile.objs +++ b/hw/block/Makefile.objs @@ -12,5 +12,6 @@ common-obj-$(CONFIG_NVME_PCI) +=3D nvme.o obj-$(CONFIG_SH4) +=3D tc58128.o =20 obj-$(CONFIG_VIRTIO_BLK) +=3D virtio-blk.o -obj-$(CONFIG_VIRTIO_BLK) +=3D dataplane/ obj-$(CONFIG_VHOST_USER_BLK) +=3D vhost-user-blk.o + +obj-y +=3D dataplane/ diff --git a/hw/block/dataplane/Makefile.objs b/hw/block/dataplane/Makefile= .objs index c6c68db..0c52702 100644 --- a/hw/block/dataplane/Makefile.objs +++ b/hw/block/dataplane/Makefile.objs @@ -1,2 +1,2 @@ -obj-y +=3D virtio-blk.o +obj-$(CONFIG_VIRTIO_BLK) +=3D virtio-blk.o obj-$(CONFIG_XEN) +=3D xen-block.o --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551727356208771.1055085741874; Mon, 4 Mar 2019 11:22:36 -0800 (PST) Received: from localhost ([127.0.0.1]:59535 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tAW-0003Hj-3c for importer@patchew.org; Mon, 04 Mar 2019 14:22:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCK-0001ju-L0 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCJ-0003bX-QC for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:20 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:40567) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCJ-0003av-IX for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:19 -0500 Received: by mail-wr1-x435.google.com with SMTP id q1so6645616wrp.7 for ; Mon, 04 Mar 2019 10:20:19 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:17 -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=R3GjwA6mCMsy8iR3C99D8ELRROaMgKrmWV10YFgy+YE=; b=joueLt4PxoKcfp3GfSXLDfjLJWxsqZlrwaNFEO0KjIwmq1Eiii6TpaleV+fZO40Pzq BEbQN4Qu+0Lrpn7CQ723YiF3XnlJ/byVUQw9TdFsYUGzHokqmizvrBjObVUKxJ+YzVe6 ZUyl1rgq8lnyBg2dE3iKEYfuWTPVChowI/qdtFaXvDzZ6+xGCq1Lux9DcZot5quZaib4 x17ZPDJm9PktOmLJ2UV5Otqc7OA7UoOgAsyNPz6Vzt8ckQ48t4XozsfxmguRuDczDtR3 O8OuQK7sP3KzeEY5wHmWF0b9vNRr5epzozYp5UxRPCjMxJ4UiyVaguUoqWwMFm9CNv6E 7tOA== 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=R3GjwA6mCMsy8iR3C99D8ELRROaMgKrmWV10YFgy+YE=; b=jk7BBZwoeRShxomNIfpaHA0aMr4L5Buw3QSioi0HbRZxd5EysfIxZ5KzysYugcwJDf rZcoRXCspVBB3OD549Kl73rZpQN5H/AznaFTC6JT8NBOk6mJumgqUtkE6H/Xkh85Jtvj i69sMoMOPKO1oak1h7LvqmD4nM5MnVMCBxek+6L1FnZ4t89YmaApd4ccsbI2PyBq8SZT SbTJpT0GuESAfBRl05HaEZllphLND06j5r6IQUAlxdvXWjYq5LHAngnTcr121aLuXrYX cpsdDv6JOXh+jB5Hbpn5qG18D8iMGBRQjPRom6Zj88Ka55W/mc/MdVokpY2Jgsv0biGP kUyw== X-Gm-Message-State: APjAAAUKdZ4UjtqRk90KLSkoqJbPw4mJJfuHphZlvAK9A7sg2EmZAQaO 3ig5qjHVifQ19Zc5PIAfwVjJvEtu X-Google-Smtp-Source: APXvYqxMMiKQKC4QDTUlcf6L5sgdli8loOtJ+BtXt4q4yQpeZj/k808jHAYLz6msLYVbMayArt38LQ== X-Received: by 2002:a5d:4e43:: with SMTP id r3mr14228922wrt.162.1551723618325; Mon, 04 Mar 2019 10:20:18 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:22 +0100 Message-Id: <1551723614-1823-3-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::435 Subject: [Qemu-devel] [PULL 02/54] 9pfs: remove unnecessary conditionals 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" The VIRTIO_9P || VIRTFS && XEN condition can be computed in hw/Makefile.obj= s, removing an "if" from hw/9pfs/Makefile.objs. Signed-off-by: Paolo Bonzini --- hw/9pfs/Makefile.objs | 2 -- hw/Makefile.objs | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs index 8ac0496..70ded6f 100644 --- a/hw/9pfs/Makefile.objs +++ b/hw/9pfs/Makefile.objs @@ -1,11 +1,9 @@ -ifeq ($(call lor,$(CONFIG_VIRTIO_9P),$(CONFIG_XEN)),y) common-obj-y =3D 9p.o 9p-util.o common-obj-y +=3D 9p-local.o 9p-xattr.o common-obj-y +=3D 9p-xattr-user.o 9p-posix-acl.o common-obj-y +=3D coth.o cofs.o codir.o cofile.o common-obj-y +=3D coxattr.o 9p-synth.o common-obj-y +=3D 9p-proxy.o -endif =20 common-obj-$(CONFIG_XEN) +=3D xen-9p-backend.o obj-$(CONFIG_VIRTIO_9P) +=3D virtio-9p-device.o diff --git a/hw/Makefile.objs b/hw/Makefile.objs index e2fcd6a..2d9b42d 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -1,4 +1,4 @@ -devices-dirs-$(call land,$(CONFIG_VIRTFS),$(call lor,$(CONFIG_VIRTIO),$(CO= NFIG_XEN))) +=3D 9pfs/ +devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$= (CONFIG_XEN))) +=3D 9pfs/ devices-dirs-$(CONFIG_SOFTMMU) +=3D acpi/ devices-dirs-$(CONFIG_SOFTMMU) +=3D adc/ devices-dirs-$(CONFIG_SOFTMMU) +=3D audio/ --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551727707130208.13173621412489; Mon, 4 Mar 2019 11:28:27 -0800 (PST) Received: from localhost ([127.0.0.1]:59616 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tG9-0008JZ-UD for importer@patchew.org; Mon, 04 Mar 2019 14:28:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45619) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCL-0001kX-Fe for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCK-0003cy-Sp for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:21 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:40556) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCK-0003bn-Lc for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:20 -0500 Received: by mail-wr1-x429.google.com with SMTP id q1so6645667wrp.7 for ; Mon, 04 Mar 2019 10:20:20 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:18 -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=9lVLeG1ksHNTEM+GfBsC7/Je1BRYkA1pEkmdAaTB6cc=; b=RB+LiLzYfjTCtA9VCT2J65AB+VzmyHDK8FVYyLrsHzeM+z/QWfxNkHs5cIRGPBxd4o DjzvD8fjIST1Vku2fb8+Y7C6NtV7ODC99jPR97cSKiOQtXLoqJcLJ5XGqkAZOwFIdoJ0 LY1vONV2g3p/6VSNU3SLekOAkG9rYWfTLbXzAz52yh88vojTf0V/22PswOr1yTmuqUrr kW5f1lY9uP1TY6o1Zc8wkfpSFWnQQxpcdO+Ep0gzV/B39m7xf3oFlTjqOwZs8DFTlNoq PHun+qR+qit+D9nLiAV7vZKf1VSLNFvXNphflfOjyEDiWNqcVkWG7wCTwU6mqrlUQxbf Lm5A== 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=9lVLeG1ksHNTEM+GfBsC7/Je1BRYkA1pEkmdAaTB6cc=; b=P1eYEC4Cp6pxkycLF95p4XHRm6JckJRZkLudlzk5P6+n8UAEBwHyj1BxMpSWNzSuBD O4RG9L/GUk95wftd762N7rYTKdGLEBcB277JvX1576zYGcWJ7bTQZpees3ATa67oZqsb 9ThtgdKZUeEMY9qtxfV0iMQ7Mx0dpwkMPAmAGWG8ud5D4uuRMm8LVNTYLLNS9Ia6LbZJ k4lHLGtMFogo57nfhtSb3SxRwQMSEbgMnbR4I5gLwA48i9rLpni/OhTdNZohUS1zJ6Qo WkShjblAKVFq/JvpRr/Qbnh1aISlb8SC8ylLiiOMmkax4d2z6GOo52B2sV7p7RiwIgs8 cwsw== X-Gm-Message-State: APjAAAXff65/G3qp/p8RS+D9jMsvFt/GaLgTGXHWKVEvSq7KnWKmv6uE WW6amnzJrdo5gGw6o7x870XEhS7n X-Google-Smtp-Source: APXvYqz0Dl8anFebdhhHYsNHrrwbDqa2S8Qsg0K1gSmDs0GMGeN6y87EYyFy1rLEfZmSsPzWzrdtQQ== X-Received: by 2002:adf:b648:: with SMTP id i8mr13294552wre.319.1551723619245; Mon, 04 Mar 2019 10:20:19 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:23 +0100 Message-Id: <1551723614-1823-4-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::429 Subject: [Qemu-devel] [PULL 03/54] xtensa: rename CONFIG_XTENSA_FPGA to CONFIG_XTENSA_XTFPGA 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" Match the symbol name that is used e.g. in Linux (drivers/spi/Kconfig). Signed-off-by: Paolo Bonzini --- default-configs/xtensa-softmmu.mak | 2 +- default-configs/xtensaeb-softmmu.mak | 2 +- hw/xtensa/Makefile.objs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/default-configs/xtensa-softmmu.mak b/default-configs/xtensa-so= ftmmu.mak index baf90ca..7aa7fa6 100644 --- a/default-configs/xtensa-softmmu.mak +++ b/default-configs/xtensa-softmmu.mak @@ -5,4 +5,4 @@ CONFIG_OPENCORES_ETH=3Dy CONFIG_PFLASH_CFI01=3Dy =20 CONFIG_XTENSA_SIM=3Dy -CONFIG_XTENSA_FPGA=3Dy +CONFIG_XTENSA_XTFPGA=3Dy diff --git a/default-configs/xtensaeb-softmmu.mak b/default-configs/xtensae= b-softmmu.mak index baf90ca..7aa7fa6 100644 --- a/default-configs/xtensaeb-softmmu.mak +++ b/default-configs/xtensaeb-softmmu.mak @@ -5,4 +5,4 @@ CONFIG_OPENCORES_ETH=3Dy CONFIG_PFLASH_CFI01=3Dy =20 CONFIG_XTENSA_SIM=3Dy -CONFIG_XTENSA_FPGA=3Dy +CONFIG_XTENSA_XTFPGA=3Dy diff --git a/hw/xtensa/Makefile.objs b/hw/xtensa/Makefile.objs index fa86730..0bbfccd 100644 --- a/hw/xtensa/Makefile.objs +++ b/hw/xtensa/Makefile.objs @@ -2,4 +2,4 @@ obj-y +=3D mx_pic.o obj-y +=3D pic_cpu.o obj-y +=3D xtensa_memory.o obj-$(CONFIG_XTENSA_SIM) +=3D sim.o -obj-$(CONFIG_XTENSA_FPGA) +=3D xtfpga.o +obj-$(CONFIG_XTENSA_XTFPGA) +=3D xtfpga.o --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 15517269382360.6954925197507009; Mon, 4 Mar 2019 11:15:38 -0800 (PST) Received: from localhost ([127.0.0.1]:59420 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0t3h-0006A8-Fn for importer@patchew.org; Mon, 04 Mar 2019 14:15:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45655) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCO-0001lF-AL for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCM-0003eq-3h for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:24 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:39620) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCL-0003dR-Nr for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:22 -0500 Received: by mail-wr1-x42e.google.com with SMTP id l5so6630487wrw.6 for ; Mon, 04 Mar 2019 10:20:21 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:19 -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 :mime-version:content-transfer-encoding; bh=OhD6HQS2fsUbDNTMT18XrFba46DAk0OcTFU5gDGhqPY=; b=djl58/fxhuZSHXKM8Bov8JG2Q2mYfl3yIn6M9jjqV0rikw9S3mhRsDQZeFoYonv0Zo lRNznaVHvSYz/EzmOpcUn0xZyeEzRnc9OVaWWeEpZN3WGvfbQfoSUcqIvE2vLEVok5s1 P4HgF0pLZTfqXKv0RXkF8FkJp1/Qs0xHwKfuopNt3k9dpGRQLdekVVIwJjk8Dm3Ev/j9 0QWpz4ezIHGIztB600AKF1SzHMJq3NSnpsmz760enbRi1euRC/tmJTkc/H/S6EeBCPQM I88ixOiMXm3p/YNGlYy+1EcHvs1tRxbWiCjG3fr87J26W0qEoVn8eedoGc9eZbk77qMR EbrA== 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:mime-version:content-transfer-encoding; bh=OhD6HQS2fsUbDNTMT18XrFba46DAk0OcTFU5gDGhqPY=; b=h2dlkvA8iwuKuil/dRBd7eMDxEz2MtsHPmj4oqH2G/I+963ck8ZfZRSWgSWHDVkKu1 ENGK99VF7gGc4/mgtv/Wn2sUdt5cnuVcJQbB+AnqXkPkvgFpAng0K/eGr50FLQOWUmL8 rRPUD2dCLFM98cJek5MrkVt7FHGOqptG6uLaR1oc9V1kuUG22yZgT7XFix3QZZMaThP7 +R4G5edbl6koNlWKrXm1IwIsAxseBcZNKSxq3XP+e7bu42RfieF4JyV8vxL+ddusj1bZ 6bQf3kzhHFzpXf2DDNciZgimniyHJkhpoM/+5vZH/KRCaaX2hcY1AudAdpW0osBweBUr pNWQ== X-Gm-Message-State: APjAAAUmuqov6bq0mSBHFzebJL/mJ3I7nBsN+bDwJr7upsUKGrMStkGe VF87UVPEvTDQ4BXAC0q9c4jExPXb X-Google-Smtp-Source: APXvYqys+FL1zIqoLolhgZhVfOPGhDWg4FuudiPmSo9EQCAkGT4iqt7GsCLRCTiDTC/Tg1CXMP7Kxg== X-Received: by 2002:a5d:4147:: with SMTP id c7mr14380829wrq.235.1551723620199; Mon, 04 Mar 2019 10:20:20 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:24 +0100 Message-Id: <1551723614-1823-5-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> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e Subject: [Qemu-devel] [PULL 04/54] minikconfig: add parser skeleton 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) This implements a scanner and recursive descent parser for Kconfig-like configuration files. The only "action" of the parser is for now to detect undefined variables and process include files. The main differences between Kconfig and this are: * only the "bool" type is supported * variables can only be defined once * choices are not supported (but they could be added as syntactic sugar for multiple Boolean values) * menus and other graphical concepts (prompts, help text) are not supported * assignments ("CONFIG_FOO=3Dy", "CONFIG_FOO=3Dn") are parsed as part of the Kconfig language, not as a separate file. The idea was originally by =C3=81kos Kov=C3=A1cs, but I could not find his implementation so I had to redo it. Signed-off-by: Paolo Bonzini Message-Id: <20190123065618.3520-23-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- scripts/minikconf.py | 441 +++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 441 insertions(+) create mode 100644 scripts/minikconf.py diff --git a/scripts/minikconf.py b/scripts/minikconf.py new file mode 100644 index 0000000..fd75d96 --- /dev/null +++ b/scripts/minikconf.py @@ -0,0 +1,441 @@ +# +# Mini-Kconfig parser +# +# Copyright (c) 2015 Red Hat Inc. +# +# Authors: +# Paolo Bonzini +# +# This work is licensed under the terms of the GNU GPL, version 2 +# or, at your option, any later version. See the COPYING file in +# the top-level directory. + +from __future__ import print_function +import os +import sys + +__all__ =3D [ 'KconfigParserError', 'KconfigData', 'KconfigParser' ] + +def debug_print(*args): + #print('# ' + (' '.join(str(x) for x in args))) + pass + +# ------------------------------------------- +# KconfigData implements the Kconfig semantics. For now it can only +# detect undefined symbols, i.e. symbols that were referenced in +# assignments or dependencies but were not declared with "config FOO". +# +# Semantic actions are represented by methods called do_*. The do_var +# method return the semantic value of a variable (which right now is +# just its name). +# ------------------------------------------- + +class KconfigData: + def __init__(self): + self.previously_included =3D [] + self.incl_info =3D None + self.defined_vars =3D set() + self.referenced_vars =3D set() + + # semantic analysis ------------- + + def check_undefined(self): + undef =3D False + for i in self.referenced_vars: + if not (i in self.defined_vars): + print("undefined symbol %s" % (i), file=3Dsys.stderr) + undef =3D True + return undef + + # semantic actions ------------- + + def do_declaration(self, var): + if (var in self.defined_vars): + raise Exception('variable "' + var + '" defined twice') + + self.defined_vars.add(var) + + # var is a string with the variable's name. + # + # For now this just returns the variable's name itself. + def do_var(self, var): + self.referenced_vars.add(var) + return var + + def do_assignment(self, var, val): + pass + + def do_default(self, var, val, cond=3DNone): + pass + + def do_depends_on(self, var, expr): + pass + + def do_select(self, var, symbol, cond=3DNone): + pass + + def do_imply(self, var, symbol, cond=3DNone): + pass + +# ------------------------------------------- +# KconfigParser implements a recursive descent parser for (simplified) +# Kconfig syntax. +# ------------------------------------------- + +# tokens table +TOKENS =3D {} +TOK_NONE =3D -1 +TOK_LPAREN =3D 0; TOKENS[TOK_LPAREN] =3D '"("'; +TOK_RPAREN =3D 1; TOKENS[TOK_RPAREN] =3D '")"'; +TOK_EQUAL =3D 2; TOKENS[TOK_EQUAL] =3D '"=3D"'; +TOK_AND =3D 3; TOKENS[TOK_AND] =3D '"&&"'; +TOK_OR =3D 4; TOKENS[TOK_OR] =3D '"||"'; +TOK_NOT =3D 5; TOKENS[TOK_NOT] =3D '"!"'; +TOK_DEPENDS =3D 6; TOKENS[TOK_DEPENDS] =3D '"depends"'; +TOK_ON =3D 7; TOKENS[TOK_ON] =3D '"on"'; +TOK_SELECT =3D 8; TOKENS[TOK_SELECT] =3D '"select"'; +TOK_IMPLY =3D 9; TOKENS[TOK_IMPLY] =3D '"imply"'; +TOK_CONFIG =3D 10; TOKENS[TOK_CONFIG] =3D '"config"'; +TOK_DEFAULT =3D 11; TOKENS[TOK_DEFAULT] =3D '"default"'; +TOK_Y =3D 12; TOKENS[TOK_Y] =3D '"y"'; +TOK_N =3D 13; TOKENS[TOK_N] =3D '"n"'; +TOK_SOURCE =3D 14; TOKENS[TOK_SOURCE] =3D '"source"'; +TOK_BOOL =3D 15; TOKENS[TOK_BOOL] =3D '"bool"'; +TOK_IF =3D 16; TOKENS[TOK_IF] =3D '"if"'; +TOK_ID =3D 17; TOKENS[TOK_ID] =3D 'identifier'; +TOK_EOF =3D 18; TOKENS[TOK_EOF] =3D 'end of file'; + +class KconfigParserError(Exception): + def __init__(self, parser, msg, tok=3DNone): + self.loc =3D parser.location() + tok =3D tok or parser.tok + if tok !=3D TOK_NONE: + location =3D TOKENS.get(tok, None) or ('"%s"' % tok) + msg =3D '%s before %s' % (msg, location) + self.msg =3D msg + + def __str__(self): + return "%s: %s" % (self.loc, self.msg) + +class KconfigParser: + @classmethod + def parse(self, fp): + data =3D KconfigData() + parser =3D KconfigParser(data) + parser.parse_file(fp) + if data.check_undefined(): + raise KconfigParserError(parser, "there were undefined symbols= ") + + return data + + def __init__(self, data): + self.data =3D data + + def parse_file(self, fp): + self.abs_fname =3D os.path.abspath(fp.name) + self.fname =3D fp.name + self.data.previously_included.append(self.abs_fname) + self.src =3D fp.read() + if self.src =3D=3D '' or self.src[-1] !=3D '\n': + self.src +=3D '\n' + self.cursor =3D 0 + self.line =3D 1 + self.line_pos =3D 0 + self.get_token() + self.parse_config() + + # file management ----- + + def error_path(self): + inf =3D self.data.incl_info + res =3D "" + while inf: + res =3D ("In file included from %s:%d:\n" % (inf['file'], + inf['line'])) + res + inf =3D inf['parent'] + return res + + def location(self): + col =3D 1 + for ch in self.src[self.line_pos:self.pos]: + if ch =3D=3D '\t': + col +=3D 8 - ((col - 1) % 8) + else: + col +=3D 1 + return '%s%s:%d:%d' %(self.error_path(), self.fname, self.line, co= l) + + def do_include(self, include): + incl_abs_fname =3D os.path.join(os.path.dirname(self.abs_fname), + include) + # catch inclusion cycle + inf =3D self.data.incl_info + while inf: + if incl_abs_fname =3D=3D os.path.abspath(inf['file']): + raise KconfigParserError(self, "Inclusion loop for %s" + % include) + inf =3D inf['parent'] + + # skip multiple include of the same file + if incl_abs_fname in self.data.previously_included: + return + try: + fp =3D open(incl_abs_fname, 'r') + except IOError as e: + raise KconfigParserError(self, + '%s: %s' % (e.strerror, include)) + + inf =3D self.data.incl_info + self.data.incl_info =3D { 'file': self.fname, 'line': self.line, + 'parent': inf } + KconfigParser(self.data).parse_file(fp) + self.data.incl_info =3D inf + + # recursive descent parser ----- + + # y_or_n: Y | N + def parse_y_or_n(self): + if self.tok =3D=3D TOK_Y: + self.get_token() + return True + if self.tok =3D=3D TOK_N: + self.get_token() + return False + raise KconfigParserError(self, 'Expected "y" or "n"') + + # var: ID + def parse_var(self): + if self.tok =3D=3D TOK_ID: + val =3D self.val + self.get_token() + return self.data.do_var(val) + else: + raise KconfigParserError(self, 'Expected identifier') + + # assignment_var: ID (starting with "CONFIG_") + def parse_assignment_var(self): + if self.tok =3D=3D TOK_ID: + val =3D self.val + if not val.startswith("CONFIG_"): + raise KconfigParserError(self, + 'Expected identifier starting with "CONFIG_"', = TOK_NONE) + self.get_token() + return self.data.do_var(val[7:]) + else: + raise KconfigParserError(self, 'Expected identifier') + + # assignment: var EQUAL y_or_n + def parse_assignment(self): + var =3D self.parse_assignment_var() + if self.tok !=3D TOK_EQUAL: + raise KconfigParserError(self, 'Expected "=3D"') + self.get_token() + self.data.do_assignment(var, self.parse_y_or_n()) + + # primary: NOT primary + # | LPAREN expr RPAREN + # | var + def parse_primary(self): + if self.tok =3D=3D TOK_NOT: + self.get_token() + self.parse_primary() + elif self.tok =3D=3D TOK_LPAREN: + self.get_token() + self.parse_expr() + if self.tok !=3D TOK_RPAREN: + raise KconfigParserError(self, 'Expected ")"') + self.get_token() + elif self.tok =3D=3D TOK_ID: + self.parse_var() + else: + raise KconfigParserError(self, 'Expected "!" or "(" or identif= ier') + + # disj: primary (OR primary)* + def parse_disj(self): + self.parse_primary() + while self.tok =3D=3D TOK_OR: + self.get_token() + self.parse_primary() + + # expr: disj (AND disj)* + def parse_expr(self): + self.parse_disj() + while self.tok =3D=3D TOK_AND: + self.get_token() + self.parse_disj() + + # condition: IF expr + # | empty + def parse_condition(self): + if self.tok =3D=3D TOK_IF: + self.get_token() + return self.parse_expr() + else: + return None + + # property: DEFAULT y_or_n condition + # | DEPENDS ON expr + # | SELECT var condition + # | BOOL + def parse_property(self, var): + if self.tok =3D=3D TOK_DEFAULT: + self.get_token() + val =3D self.parse_y_or_n() + cond =3D self.parse_condition() + self.data.do_default(var, val, cond) + elif self.tok =3D=3D TOK_DEPENDS: + self.get_token() + if self.tok !=3D TOK_ON: + raise KconfigParserError(self, 'Expected "on"') + self.get_token() + self.data.do_depends_on(var, self.parse_expr()) + elif self.tok =3D=3D TOK_SELECT: + self.get_token() + symbol =3D self.parse_var() + cond =3D self.parse_condition() + self.data.do_select(var, symbol, cond) + elif self.tok =3D=3D TOK_IMPLY: + self.get_token() + symbol =3D self.parse_var() + cond =3D self.parse_condition() + self.data.do_imply(var, symbol, cond) + elif self.tok =3D=3D TOK_BOOL: + self.get_token() + else: + raise KconfigParserError(self, 'Error in recursive descent?') + + # properties: properties property + # | /* empty */ + def parse_properties(self, var): + had_default =3D False + while self.tok =3D=3D TOK_DEFAULT or self.tok =3D=3D TOK_DEPENDS o= r \ + self.tok =3D=3D TOK_SELECT or self.tok =3D=3D TOK_BOOL or \ + self.tok =3D=3D TOK_IMPLY: + self.parse_property(var) + self.data.do_default(var, False) + + # for nicer error message + if self.tok !=3D TOK_SOURCE and self.tok !=3D TOK_CONFIG and \ + self.tok !=3D TOK_ID and self.tok !=3D TOK_EOF: + raise KconfigParserError(self, 'expected "source", "config", i= dentifier, ' + + '"default", "depends on", "imply" or "select"') + + # declaration: config var properties + def parse_declaration(self): + if self.tok =3D=3D TOK_CONFIG: + self.get_token() + var =3D self.parse_var() + self.data.do_declaration(var) + self.parse_properties(var) + else: + raise KconfigParserError(self, 'Error in recursive descent?') + + # clause: SOURCE + # | declaration + # | assignment + def parse_clause(self): + if self.tok =3D=3D TOK_SOURCE: + val =3D self.val + self.get_token() + self.do_include(val) + elif self.tok =3D=3D TOK_CONFIG: + self.parse_declaration() + elif self.tok =3D=3D TOK_ID: + self.parse_assignment() + else: + raise KconfigParserError(self, 'expected "source", "config" or= identifier') + + # config: clause+ EOF + def parse_config(self): + while self.tok !=3D TOK_EOF: + self.parse_clause() + return self.data + + # scanner ----- + + def get_token(self): + while True: + self.tok =3D self.src[self.cursor] + self.pos =3D self.cursor + self.cursor +=3D 1 + + self.val =3D None + self.tok =3D self.scan_token() + if self.tok is not None: + return + + def check_keyword(self, rest): + if not self.src.startswith(rest, self.cursor): + return False + length =3D len(rest) + if self.src[self.cursor + length].isalnum() or self.src[self.curso= r + length] =3D=3D '|': + return False + self.cursor +=3D length + return True + + def scan_token(self): + if self.tok =3D=3D '#': + self.cursor =3D self.src.find('\n', self.cursor) + return None + elif self.tok =3D=3D '=3D': + return TOK_EQUAL + elif self.tok =3D=3D '(': + return TOK_LPAREN + elif self.tok =3D=3D ')': + return TOK_RPAREN + elif self.tok =3D=3D '&' and self.src[self.pos+1] =3D=3D '&': + self.cursor +=3D 1 + return TOK_AND + elif self.tok =3D=3D '|' and self.src[self.pos+1] =3D=3D '|': + self.cursor +=3D 1 + return TOK_OR + elif self.tok =3D=3D '!': + return TOK_NOT + elif self.tok =3D=3D 'd' and self.check_keyword("epends"): + return TOK_DEPENDS + elif self.tok =3D=3D 'o' and self.check_keyword("n"): + return TOK_ON + elif self.tok =3D=3D 's' and self.check_keyword("elect"): + return TOK_SELECT + elif self.tok =3D=3D 'i' and self.check_keyword("mply"): + return TOK_IMPLY + elif self.tok =3D=3D 'c' and self.check_keyword("onfig"): + return TOK_CONFIG + elif self.tok =3D=3D 'd' and self.check_keyword("efault"): + return TOK_DEFAULT + elif self.tok =3D=3D 'b' and self.check_keyword("ool"): + return TOK_BOOL + elif self.tok =3D=3D 'i' and self.check_keyword("f"): + return TOK_IF + elif self.tok =3D=3D 'y' and self.check_keyword(""): + return TOK_Y + elif self.tok =3D=3D 'n' and self.check_keyword(""): + return TOK_N + elif (self.tok =3D=3D 's' and self.check_keyword("ource")) or \ + self.tok =3D=3D 'i' and self.check_keyword("nclude"): + # source FILENAME + # include FILENAME + while self.src[self.cursor].isspace(): + self.cursor +=3D 1 + start =3D self.cursor + self.cursor =3D self.src.find('\n', self.cursor) + self.val =3D self.src[start:self.cursor] + return TOK_SOURCE + elif self.tok.isalpha(): + # identifier + while self.src[self.cursor].isalnum() or self.src[self.cursor]= =3D=3D '_': + self.cursor +=3D 1 + self.val =3D self.src[self.pos:self.cursor] + return TOK_ID + elif self.tok =3D=3D '\n': + if self.cursor =3D=3D len(self.src): + return TOK_EOF + self.line +=3D 1 + self.line_pos =3D self.cursor + elif not self.tok.isspace(): + raise KconfigParserError(self, 'invalid input') + + return None + +if __name__ =3D=3D '__main__': + fname =3D len(sys.argv) > 1 and sys.argv[1] or 'Kconfig.test' + KconfigParser.parse(open(fname, 'r')) --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 155172643581614.161715346297115; Mon, 4 Mar 2019 11:07:15 -0800 (PST) Received: from localhost ([127.0.0.1]:59307 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sve-0007BI-IE for importer@patchew.org; Mon, 04 Mar 2019 14:07:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCO-0001lE-AJ for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCM-0003gC-Ok for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:24 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:35403) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCM-0003eH-GF for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:22 -0500 Received: by mail-wm1-x32f.google.com with SMTP id y15so144129wma.0 for ; Mon, 04 Mar 2019 10:20:22 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:20 -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=xXjALrAqXDRv0kzUZR34KdC14OmcAsIaHvlc3UuW4Y4=; b=qgzj2FcOrq9C7HkzQZ4Be6aUT6rT+J90bo+ILZTgMT7OqxnXRIqAt28G2YLtze5Bu1 39E+kp54zAxKSSXOdf/zrcCH/3tssokM41NJupEAEichopoMzC6OsAXP02feOT6R/cO1 72Eit6Ldfo4cPfla7Bk6AITcuZA2P/DOuRPvziD3CYuNluDndWj9SADEd83AA4ep/fdC RwyoJUGNs1cs9lTI+79sVezsqWFkeKU7u1n5nEtQX9YacdEQBoz3zv7Fq437Gm5LzoSh z2qhcN4xo2iPwnLhWctadskJAkENIhS2MDkyRbbfRhjIAUuXit0UOV6eV9mUUqivBmVq 3OxA== 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=xXjALrAqXDRv0kzUZR34KdC14OmcAsIaHvlc3UuW4Y4=; b=QuLepKug6dIqbub1EQA5nx+mU/YuknffWUI/fU1WjWzea1VXzRreKW4hIvAqr4PwhX KvZeMgySMFYETJUuuxQ4WGVDXm7MsLnj3Gs6ri/bx5bW56LbQKixGgapxpUmGn8XQ5f4 oRhxYvK7EskKiXmUU764IgC9bNTf+GOIx0ftxAro4SQ+M3lC4QqAoNCfA4nXCsTK83P6 s3JaMzWkp3bf1GTTVB1vhby7AdRzrKT98GoxYbpghEN599xpkiNZhxN+HPvi+MjXs9EH NN1jcbCD1Uq6iH19utrx0/wohSCY2+jYwJieHT1IcWKCMQ+h464vbjPyiL+pYdxznEH+ awig== X-Gm-Message-State: APjAAAVdh4k+XQGwifAxraU1Dytf7l75qLVpojIUFFuFLYBT6dszY3Iz B74nzIgoXno1FAvd6/Fjvgt6iM4m X-Google-Smtp-Source: APXvYqyJkOs+xWKSZypyUhB/ngknvlfeRqoG2E1aoCX7K/o/XrJzCiDk0zqcTYNGytGTjVLBOWP56w== X-Received: by 2002:a1c:d049:: with SMTP id h70mr257164wmg.81.1551723621005; Mon, 04 Mar 2019 10:20:21 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:25 +0100 Message-Id: <1551723614-1823-6-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::32f Subject: [Qemu-devel] [PULL 05/54] minikconfig: add AST 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" Add Python classes that represent the Kconfig abstract syntax tree. The abstract syntax tree is stored as a list of clauses. For example: config FOO depends on BAR select BAZ is represented as three clauses: FOO depends on BAR FOO default n select BAZ if FOO Signed-off-by: Paolo Bonzini Message-Id: <20190123065618.3520-24-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- scripts/minikconf.py | 121 +++++++++++++++++++++++++++++++++++++++++++----= ---- 1 file changed, 102 insertions(+), 19 deletions(-) diff --git a/scripts/minikconf.py b/scripts/minikconf.py index fd75d96..f0cc3b9 100644 --- a/scripts/minikconf.py +++ b/scripts/minikconf.py @@ -31,11 +31,84 @@ def debug_print(*args): # ------------------------------------------- =20 class KconfigData: + class Expr: + def __and__(self, rhs): + return KconfigData.AND(self, rhs) + def __or__(self, rhs): + return KconfigData.OR(self, rhs) + def __invert__(self): + return KconfigData.NOT(self) + + class AND(Expr): + def __init__(self, lhs, rhs): + self.lhs =3D lhs + self.rhs =3D rhs + def __str__(self): + return "(%s && %s)" % (self.lhs, self.rhs) + + class OR(Expr): + def __init__(self, lhs, rhs): + self.lhs =3D lhs + self.rhs =3D rhs + def __str__(self): + return "(%s || %s)" % (self.lhs, self.rhs) + + class NOT(Expr): + def __init__(self, lhs): + self.lhs =3D lhs + def __str__(self): + return "!%s" % (self.lhs) + + class Var(Expr): + def __init__(self, name): + self.name =3D name + self.value =3D None + def __str__(self): + return self.name + + class Clause: + def __init__(self, dest): + self.dest =3D dest + + class AssignmentClause(Clause): + def __init__(self, dest, value): + KconfigData.Clause.__init__(self, dest) + self.value =3D value + def __str__(self): + return "%s=3D%s" % (self.dest, 'y' if self.value else 'n') + + class DefaultClause(Clause): + def __init__(self, dest, value, cond=3DNone): + KconfigData.Clause.__init__(self, dest) + self.value =3D value + self.cond =3D cond + def __str__(self): + value =3D 'y' if self.value else 'n' + if self.cond is None: + return "config %s default %s" % (self.dest, value) + else: + return "config %s default %s if %s" % (self.dest, value, s= elf.cond) + + class DependsOnClause(Clause): + def __init__(self, dest, expr): + KconfigData.Clause.__init__(self, dest) + self.expr =3D expr + def __str__(self): + return "config %s depends on %s" % (self.dest, self.expr) + + class SelectClause(Clause): + def __init__(self, dest, cond): + KconfigData.Clause.__init__(self, dest) + self.cond =3D cond + def __str__(self): + return "select %s if %s" % (self.dest, self.cond) + def __init__(self): self.previously_included =3D [] self.incl_info =3D None self.defined_vars =3D set() - self.referenced_vars =3D set() + self.referenced_vars =3D dict() + self.clauses =3D list() =20 # semantic analysis ------------- =20 @@ -53,29 +126,34 @@ class KconfigData: if (var in self.defined_vars): raise Exception('variable "' + var + '" defined twice') =20 - self.defined_vars.add(var) + self.defined_vars.add(var.name) =20 # var is a string with the variable's name. - # - # For now this just returns the variable's name itself. def do_var(self, var): - self.referenced_vars.add(var) - return var + if (var in self.referenced_vars): + return self.referenced_vars[var] + + var_obj =3D self.referenced_vars[var] =3D KconfigData.Var(var) + return var_obj =20 def do_assignment(self, var, val): - pass + self.clauses.append(KconfigData.AssignmentClause(var, val)) =20 def do_default(self, var, val, cond=3DNone): - pass + self.clauses.append(KconfigData.DefaultClause(var, val, cond)) =20 def do_depends_on(self, var, expr): - pass + self.clauses.append(KconfigData.DependsOnClause(var, expr)) =20 def do_select(self, var, symbol, cond=3DNone): - pass + cond =3D (cond & var) if cond is not None else var + self.clauses.append(KconfigData.SelectClause(symbol, cond)) =20 def do_imply(self, var, symbol, cond=3DNone): - pass + # "config X imply Y [if COND]" is the same as + # "config Y default y if X [&& COND]" + cond =3D (cond & var) if cond is not None else var + self.do_default(symbol, True, cond) =20 # ------------------------------------------- # KconfigParser implements a recursive descent parser for (simplified) @@ -237,31 +315,34 @@ class KconfigParser: def parse_primary(self): if self.tok =3D=3D TOK_NOT: self.get_token() - self.parse_primary() + val =3D ~self.parse_primary() elif self.tok =3D=3D TOK_LPAREN: self.get_token() - self.parse_expr() + val =3D self.parse_expr() if self.tok !=3D TOK_RPAREN: raise KconfigParserError(self, 'Expected ")"') self.get_token() elif self.tok =3D=3D TOK_ID: - self.parse_var() + val =3D self.parse_var() else: raise KconfigParserError(self, 'Expected "!" or "(" or identif= ier') + return val =20 # disj: primary (OR primary)* def parse_disj(self): - self.parse_primary() + lhs =3D self.parse_primary() while self.tok =3D=3D TOK_OR: self.get_token() - self.parse_primary() + lhs =3D lhs | self.parse_primary() + return lhs =20 # expr: disj (AND disj)* def parse_expr(self): - self.parse_disj() + lhs =3D self.parse_disj() while self.tok =3D=3D TOK_AND: self.get_token() - self.parse_disj() + lhs =3D lhs & self.parse_disj() + return lhs =20 # condition: IF expr # | empty @@ -438,4 +519,6 @@ class KconfigParser: =20 if __name__ =3D=3D '__main__': fname =3D len(sys.argv) > 1 and sys.argv[1] or 'Kconfig.test' - KconfigParser.parse(open(fname, 'r')) + data =3D KconfigParser.parse(open(fname, 'r')) + for i in data.clauses: + print i --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551727140120907.8680600675646; Mon, 4 Mar 2019 11:19:00 -0800 (PST) Received: from localhost ([127.0.0.1]:59478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0t70-0000Hx-4g for importer@patchew.org; Mon, 04 Mar 2019 14:18:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45686) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCP-0001mW-Eq for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCN-0003iB-Vm for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:25 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:53710) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCN-0003gK-Jg for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:23 -0500 Received: by mail-wm1-x332.google.com with SMTP id e74so127669wmg.3 for ; Mon, 04 Mar 2019 10:20:23 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:21 -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=UiI8dVkbOVUhXiTaDmDBPtP/Q0hl0k3utzcfjnk4g3Y=; b=H28N32SZbJT6zulWkZfTIFUBrl9qi9YitgX+aQTAiCWF0E3uSJK4GXY8BGrnmKPAqR OEh1mPCGXIHFecsh/rmHYiSFfWKpmM8Jhky3abpFToyapMCGdEZfxftEF5GDskAjkHvU bL3wRCYbCRucrw5W85WToSzRu0CUoAq3QQzHUioegMNL5Yg+tZAFreK3vpY9R5i4AcU1 Fd+xkeyE66Mb0hJnNWs0DZM/xPYVbYCqPRfYmgIR1d2iszRqE7h8u4lSA/YU1IxQLQjN cFits1xz607YS3hm52KHcrDF4HgL/AfTrZ2pyRN0E7hKtMfRXjM3hDInSq/H0piFtq+Q LiUw== 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=UiI8dVkbOVUhXiTaDmDBPtP/Q0hl0k3utzcfjnk4g3Y=; b=J9qXoaFsIRxlJCl2uYRmiShje+z8iRvStr9/+Fa4j+Ul9lbSBFBz6snsrd81/pxc22 /Mq+jeXRq1pTZh73RA8XnHgtfYu2/XwlhpaVzVfrfqCO12UVecnfbyVG+KPtYIt3MYb3 95A1y/UsgrJDeQdr0ERcVR5OxqGwo2f6O4HH39Qpr+qt2FMQkKKdZty4sf/zX4w4G+JP U4hPgzxaPvXgtsK2+rTBb1LMI6hsMYn7LG5RNrskkbsAeoNGLW5RGWncSAgUcQqGGvRC 6DD2Ntrp+tBYfBYm/1z+zeH5rpQvB+SGMPDP2+FfZSXLR2wB7cnzt6DNdI4MFbzboIi0 yO3Q== X-Gm-Message-State: APjAAAXZCqnH+UrgrOozaFx3yOi69PXrtescCb9NRJzlDokKFsivCD4+ ghZt2QQR3FgxBOxUSzR2N3u6FVZv X-Google-Smtp-Source: APXvYqxCqakJxiAkKYjAeXx10fJZEGAoZnYMZJ0XuTVBS4hPzTxkDUGzcXYwb58Eq+De9e/H/hQ5iQ== X-Received: by 2002:a1c:f502:: with SMTP id t2mr269905wmh.124.1551723622127; Mon, 04 Mar 2019 10:20:22 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:26 +0100 Message-Id: <1551723614-1823-7-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::332 Subject: [Qemu-devel] [PULL 06/54] minikconfig: add semantic analysis 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" There are three parts in the semantic analysis: 1) evaluating expressions. This is done as a simple visit of the Expr nodes. 2) ordering clauses. This is done by constructing a graph of variables. There is an edge from X to Y if Y depends on X, if X selects Y, or if X appears in a conditional selection of Y; in other words, if the value of X can affect the value of Y. Each clause has a "destination" variable whose value can be affected by the clause, and clauses will be processed according to a topological sorting of their destination variables. Defaults are processed after all other clauses with the same destination. 3) deriving the value of the variables. This is done by processing the clauses in the topological order provided by the previous step. A "depends on" clause will force a variable to False, a "select" clause will force a variable to True, an assignment will force a variable to its RHS. A default will set a variable to its RHS if it has not been set before. Because all variables have a default, after visiting all clauses all variables will have been set. Signed-off-by: Paolo Bonzini Message-Id: <20190123065618.3520-25-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- scripts/minikconf.py | 144 +++++++++++++++++++++++++++++++++++++++++++++++= ---- 1 file changed, 135 insertions(+), 9 deletions(-) diff --git a/scripts/minikconf.py b/scripts/minikconf.py index f0cc3b9..d89fb09 100644 --- a/scripts/minikconf.py +++ b/scripts/minikconf.py @@ -14,7 +14,8 @@ from __future__ import print_function import os import sys =20 -__all__ =3D [ 'KconfigParserError', 'KconfigData', 'KconfigParser' ] +__all__ =3D [ 'KconfigDataError', 'KconfigParserError', + 'KconfigData', 'KconfigParser' ] =20 def debug_print(*args): #print('# ' + (' '.join(str(x) for x in args))) @@ -30,6 +31,13 @@ def debug_print(*args): # just its name). # ------------------------------------------- =20 +class KconfigDataError(Exception): + def __init__(self, msg): + self.msg =3D msg + + def __str__(self): + return self.msg + class KconfigData: class Expr: def __and__(self, rhs): @@ -39,6 +47,12 @@ class KconfigData: def __invert__(self): return KconfigData.NOT(self) =20 + # Abstract methods + def add_edges_to(self, var): + pass + def evaluate(self): + assert False + class AND(Expr): def __init__(self, lhs, rhs): self.lhs =3D lhs @@ -46,6 +60,12 @@ class KconfigData: def __str__(self): return "(%s && %s)" % (self.lhs, self.rhs) =20 + def add_edges_to(self, var): + self.lhs.add_edges_to(var) + self.rhs.add_edges_to(var) + def evaluate(self): + return self.lhs.evaluate() and self.rhs.evaluate() + class OR(Expr): def __init__(self, lhs, rhs): self.lhs =3D lhs @@ -53,35 +73,85 @@ class KconfigData: def __str__(self): return "(%s || %s)" % (self.lhs, self.rhs) =20 + def add_edges_to(self, var): + self.lhs.add_edges_to(var) + self.rhs.add_edges_to(var) + def evaluate(self): + return self.lhs.evaluate() or self.rhs.evaluate() + class NOT(Expr): def __init__(self, lhs): self.lhs =3D lhs def __str__(self): return "!%s" % (self.lhs) =20 + def add_edges_to(self, var): + self.lhs.add_edges_to(var) + def evaluate(self): + return not self.lhs.evaluate() + class Var(Expr): def __init__(self, name): self.name =3D name self.value =3D None + self.outgoing =3D set() + self.clauses_for_var =3D list() def __str__(self): return self.name =20 + def has_value(self): + return not (self.value is None) + def set_value(self, val, clause): + self.clauses_for_var.append(clause) + if self.has_value() and self.value !=3D val: + print("The following clauses were found for " + self.name) + for i in self.clauses_for_var: + print(" " + str(i), file=3Dsys.stderr) + raise KconfigDataError('contradiction between clauses when= setting %s' % self) + debug_print("=3D> %s is now %s" % (self.name, val)) + self.value =3D val + + # depth first search of the dependency graph + def dfs(self, visited, f): + if self in visited: + return + visited.add(self) + for v in self.outgoing: + v.dfs(visited, f) + f(self) + + def add_edges_to(self, var): + self.outgoing.add(var) + def evaluate(self): + if not self.has_value(): + raise KconfigDataError('cycle found including %s' % self) + return self.value + class Clause: def __init__(self, dest): self.dest =3D dest + def priority(self): + return 0 + def process(self): + pass =20 class AssignmentClause(Clause): def __init__(self, dest, value): KconfigData.Clause.__init__(self, dest) self.value =3D value def __str__(self): - return "%s=3D%s" % (self.dest, 'y' if self.value else 'n') + return "CONFIG_%s=3D%s" % (self.dest, 'y' if self.value else '= n') + + def process(self): + self.dest.set_value(self.value, self) =20 class DefaultClause(Clause): def __init__(self, dest, value, cond=3DNone): KconfigData.Clause.__init__(self, dest) self.value =3D value self.cond =3D cond + if not (self.cond is None): + self.cond.add_edges_to(self.dest) def __str__(self): value =3D 'y' if self.value else 'n' if self.cond is None: @@ -89,20 +159,38 @@ class KconfigData: else: return "config %s default %s if %s" % (self.dest, value, s= elf.cond) =20 + def priority(self): + # Defaults are processed just before leaving the variable + return -1 + def process(self): + if not self.dest.has_value() and \ + (self.cond is None or self.cond.evaluate()): + self.dest.set_value(self.value, self) + class DependsOnClause(Clause): def __init__(self, dest, expr): KconfigData.Clause.__init__(self, dest) self.expr =3D expr + self.expr.add_edges_to(self.dest) def __str__(self): return "config %s depends on %s" % (self.dest, self.expr) =20 + def process(self): + if not self.expr.evaluate(): + self.dest.set_value(False, self) + class SelectClause(Clause): def __init__(self, dest, cond): KconfigData.Clause.__init__(self, dest) self.cond =3D cond + self.cond.add_edges_to(self.dest) def __str__(self): return "select %s if %s" % (self.dest, self.cond) =20 + def process(self): + if self.cond.evaluate(): + self.dest.set_value(True, self) + def __init__(self): self.previously_included =3D [] self.incl_info =3D None @@ -120,11 +208,54 @@ class KconfigData: undef =3D True return undef =20 + def compute_config(self): + if self.check_undefined(): + raise KconfigDataError("there were undefined symbols") + return None + + debug_print("Input:") + for clause in self.clauses: + debug_print(clause) + + debug_print("\nDependency graph:") + for i in self.referenced_vars: + debug_print(i, "->", [str(x) for x in self.referenced_vars[i].= outgoing]) + + # The reverse of the depth-first order is the topological sort + dfo =3D dict() + visited =3D set() + debug_print("\n") + def visit_fn(var): + debug_print(var, "has DFS number", len(dfo)) + dfo[var] =3D len(dfo) + + for name, v in self.referenced_vars.items(): + self.do_default(v, False) + v.dfs(visited, visit_fn) + + # Put higher DFS numbers and higher priorities first. This + # places the clauses in topological order and places defaults + # after assignments and dependencies. + self.clauses.sort(key=3Dlambda x: (-dfo[x.dest], -x.priority())) + + debug_print("\nSorted clauses:") + for clause in self.clauses: + debug_print(clause) + clause.process() + + debug_print("") + values =3D dict() + for name, v in self.referenced_vars.items(): + debug_print("Evaluating", name) + values[name] =3D v.evaluate() + + return values + # semantic actions ------------- =20 def do_declaration(self, var): if (var in self.defined_vars): - raise Exception('variable "' + var + '" defined twice') + raise KconfigDataError('variable "' + var + '" defined twice') =20 self.defined_vars.add(var.name) =20 @@ -201,9 +332,6 @@ class KconfigParser: data =3D KconfigData() parser =3D KconfigParser(data) parser.parse_file(fp) - if data.check_undefined(): - raise KconfigParserError(parser, "there were undefined symbols= ") - return data =20 def __init__(self, data): @@ -392,7 +520,6 @@ class KconfigParser: self.tok =3D=3D TOK_SELECT or self.tok =3D=3D TOK_BOOL or \ self.tok =3D=3D TOK_IMPLY: self.parse_property(var) - self.data.do_default(var, False) =20 # for nicer error message if self.tok !=3D TOK_SOURCE and self.tok !=3D TOK_CONFIG and \ @@ -520,5 +647,4 @@ class KconfigParser: if __name__ =3D=3D '__main__': fname =3D len(sys.argv) > 1 and sys.argv[1] or 'Kconfig.test' data =3D KconfigParser.parse(open(fname, 'r')) - for i in data.clauses: - print i + print data.compute_config() --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551726766410543.6580893718701; Mon, 4 Mar 2019 11:12:46 -0800 (PST) Received: from localhost ([127.0.0.1]:59394 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0t10-0003lj-Bm for importer@patchew.org; Mon, 04 Mar 2019 14:12:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45684) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCP-0001mU-EO for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCO-0003jW-Id for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:25 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:54676) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCO-0003hJ-As for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:24 -0500 Received: by mail-wm1-x333.google.com with SMTP id f3so121887wmj.4 for ; Mon, 04 Mar 2019 10:20:24 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:22 -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 :mime-version:content-transfer-encoding; bh=zRhC+Mbb+E+8nv9OQNUQsGzCw63kx+GW3DftObh9Nes=; b=QqxmEhUqS/5TaJcjblVlkbguK6aO94aqgVFo0zehlojA8gGHeVGQ1yjbYoHMLJVU2F KBVeP+lH+6RYXgL++U1fX8ChUC8JQB5lAUBy1sChovNByN3nuYZcg1mrz86qSDt9BZ88 CkxOHoJNuYtD/8wHSPcy2eyA+5ywoK9o/Zp92Col/xrL0EGUrnbL45XOzxcHfedEAF/Q +KbUQm7uEbpoPl44dFqj7buoZYoM78pOhUMn+GABTA/9DNDCs4+Ip7thnow86y+iKiHJ sktCG2pwOOQ89dBaFJTdgf152IrE28FA5HDRTEn4xEQ8KsDrEHe15z8v1MWDA5EdsGqB dVNg== 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:mime-version:content-transfer-encoding; bh=zRhC+Mbb+E+8nv9OQNUQsGzCw63kx+GW3DftObh9Nes=; b=j14RAYi/BmMj03eAKCU6YgxfIzZwZunPNzi2lQz6XwRjRRzNvm8FUQyfONgcnZrEuS QMNiIUPMLX5SU2OOXn9wPdEl6CmVc2C7beYJziV8mbPGAXl1KQKH5MIO79khd1J6GMD0 1fhCGsVEq1lTm8huCXxPyb7wIhv3wjzrOGE+D/fiyITTmJrklV/b4BL3kbAJMVQqTubU bISKIATSXuSlfi99xK6xtDIeJ+49SRcqqdsVqMSvNrb3qrQZIShC87spgV+abZq+81V8 6ZD20joGNC2Iy8+4J6DDahfq9o/B620twfjLLsStGGPAeG8pk4xswrz+HN8MlPIQ9EZ/ 7R+A== X-Gm-Message-State: APjAAAU6ZxykDG1fgSaB5femRFCMwAMfPS4sT1D1KprMGXUq7ZuwvQ55 lN5nwgnaMTf7vBrGtbma+7Jkcau9 X-Google-Smtp-Source: APXvYqxQyQizVmmyTTTOne5jGs9lj1U7zZoRTbPqOVo0dFty6wCusThPDyzZp+bZYpIXq63jtexPdw== X-Received: by 2002:a1c:e084:: with SMTP id x126mr271777wmg.39.1551723623071; Mon, 04 Mar 2019 10:20:23 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:27 +0100 Message-Id: <1551723614-1823-8-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> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::333 Subject: [Qemu-devel] [PULL 07/54] hw/display: make edid configurable 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) From: Yang Zhong Use CONFIG_EDID to make edid-generate.c and edid-region.c configurable. Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-26-yang.zhong@intel.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- default-configs/pci.mak | 1 + default-configs/virtio.mak | 1 + hw/display/Makefile.objs | 4 +--- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 037636f..0552190 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -49,3 +49,4 @@ CONFIG_IVSHMEM_DEVICE=3D$(CONFIG_IVSHMEM) CONFIG_ROCKER=3Dy CONFIG_VFIO=3D$(CONFIG_LINUX) CONFIG_VFIO_PCI=3Dy +CONFIG_EDID=3Dy diff --git a/default-configs/virtio.mak b/default-configs/virtio.mak index b653aa0..3abf68a 100644 --- a/default-configs/virtio.mak +++ b/default-configs/virtio.mak @@ -6,6 +6,7 @@ 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 diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 7c4ae9a..576fca4 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -1,4 +1,4 @@ -common-obj-y +=3D edid-generate.o +common-obj-$(CONFIG_EDID) +=3D edid-generate.o edid-region.o =20 common-obj-$(CONFIG_FW_CFG_DMA) +=3D ramfb.o common-obj-$(CONFIG_FW_CFG_DMA) +=3D ramfb-standalone.o @@ -15,12 +15,10 @@ common-obj-$(CONFIG_SSD0323) +=3D ssd0323.o common-obj-$(CONFIG_XEN) +=3D xenfb.o =20 common-obj-$(CONFIG_VGA_PCI) +=3D vga-pci.o -common-obj-$(CONFIG_VGA_PCI) +=3D edid-region.o common-obj-$(CONFIG_VGA_ISA) +=3D vga-isa.o common-obj-$(CONFIG_VGA_ISA_MM) +=3D vga-isa-mm.o common-obj-$(CONFIG_VMWARE_VGA) +=3D vmware_vga.o common-obj-$(CONFIG_BOCHS_DISPLAY) +=3D bochs-display.o -common-obj-$(CONFIG_BOCHS_DISPLAY) +=3D edid-region.o =20 common-obj-$(CONFIG_BLIZZARD) +=3D blizzard.o common-obj-$(CONFIG_EXYNOS4) +=3D exynos4210_fimd.o --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 155172825935879.89870310267554; Mon, 4 Mar 2019 11:37:39 -0800 (PST) Received: from localhost ([127.0.0.1]:59760 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tP5-0007am-UD for importer@patchew.org; Mon, 04 Mar 2019 14:37:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCU-0001p2-DW for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCQ-0003nq-Jw for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:30 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:33256) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCQ-0003m4-7R for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:26 -0500 Received: by mail-wm1-x32d.google.com with SMTP id c13so403467wmb.0 for ; Mon, 04 Mar 2019 10:20:26 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:23 -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=QJlg6nyUNHmg57ar4EBRY4AYUJnvu/q0uaCxTCe5OsU=; b=sFx3+ORsiGfreBj/2nFycryf5WPU6UY/Vznqjw+606HpkZ3zNzKWbgPicnqtlRf98W p4LFOC+GTSVn5E8ZzeP6Vs4qmoz4cuII41vreIJktVhwUzz4wsSdi9V93LCw9EMJikK5 oMq+tJYtstk9qlGH3/Uue8zzzeidAm1PKi0T3A4EcySja0QUYgADO+Af6sJrpwk52loq /6wmMyh7vb8klT1/YeUeh0IW/tk6ltFJHkSXQG6+8xBI5RhX9R5OBl7L/BO+k64CTByL 2wex6NUEGrFLhP7XthTsENSiFj+tTFyPyODB4xmkdD3aeG48oOGFwAkcK8DILomtcpx7 ujmA== 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=QJlg6nyUNHmg57ar4EBRY4AYUJnvu/q0uaCxTCe5OsU=; b=rH9YetSrNOc+mmhDhrP2bF62GV2wd9TowinA9FNQmeTjfOX3cY919XSuXZocOErS8S oaupPb9FSYHfR7dr9AQzb9q1OGLa4NAcxLcCGLXCnMttHM1N6kupLN9RvS8FkIGtmEf6 lPFhl9MgtSR9xWy/qcJGPmLyEte56nR20QDgzSExNRQrbM8FSAjBlKKWvMqSP1acTamY YsBxT9gLTDrXxmELhNYvw6Xg/9LEgE0zBz62PXhOtErQfIDfpENFB8zA3Bx13WmTtg2I WVECheoKKOLGchQ5rSxRrN4frk2U4p8cmCHjGWrOEDQK2Xk8s49LHdOTISWDjj8IhMH4 W3sg== X-Gm-Message-State: APjAAAVwFGPXUjSXAML5GNjrCE6KanWSTOv8WtyqDk7rZgEyR6bQEyLG ZTUj1cMlKVC523G180alfSSwhtR8 X-Google-Smtp-Source: APXvYqy2Q1ZMa8QGWfBV1mrxg89tVR1AnPMzjp/kguVxbYxpK8MrBB60TfAS7uWvcgAV8NcgJXaJ+Q== X-Received: by 2002:a1c:7906:: with SMTP id l6mr253458wme.83.1551723624078; Mon, 04 Mar 2019 10:20:24 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:28 +0100 Message-Id: <1551723614-1823-9-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::32d Subject: [Qemu-devel] [PULL 08/54] kconfig: introduce kconfig files 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" The Kconfig files were generated mostly with this script: for i in `grep -ho CONFIG_[A-Z0-9_]* default-configs/* | sort -u`; do set fnord `git grep -lw $i -- 'hw/*/Makefile.objs' ` shift if test $# =3D 1; then cat >> $(dirname $1)/Kconfig << EOF config ${i#CONFIG_} bool EOF git add $(dirname $1)/Kconfig else echo $i $* fi done sed -i '$d' hw/*/Kconfig for i in hw/*; do if test -d $i && ! test -f $i/Kconfig; then touch $i/Kconfig git add $i/Kconfig fi done Whenever a symbol is referenced from multiple subdirectories, the script prints the list of directories that reference the symbol. These symbols have to be added manually to the Kconfig files. Kconfig.host and hw/Kconfig were created manually. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-27-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- Kconfig.host | 32 ++++++++++++++ hw/9pfs/Kconfig | 2 + hw/Kconfig | 68 +++++++++++++++++++++++++++++ hw/acpi/Kconfig | 20 +++++++++ hw/adc/Kconfig | 2 + hw/alpha/Kconfig | 2 + hw/arm/Kconfig | 119 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ hw/audio/Kconfig | 35 +++++++++++++++ hw/block/Kconfig | 29 ++++++++++++ hw/bt/Kconfig | 2 + hw/char/Kconfig | 32 ++++++++++++++ hw/core/Kconfig | 11 +++++ hw/cpu/Kconfig | 8 ++++ hw/cris/Kconfig | 5 +++ hw/display/Kconfig | 77 ++++++++++++++++++++++++++++++++ hw/dma/Kconfig | 20 +++++++++ hw/gpio/Kconfig | 8 ++++ hw/hppa/Kconfig | 2 + hw/hyperv/Kconfig | 5 +++ hw/i2c/Kconfig | 20 +++++++++ hw/i386/Kconfig | 23 ++++++++++ hw/ide/Kconfig | 35 +++++++++++++++ hw/input/Kconfig | 23 ++++++++++ hw/intc/Kconfig | 47 ++++++++++++++++++++ hw/ipack/Kconfig | 2 + hw/ipmi/Kconfig | 14 ++++++ hw/isa/Kconfig | 23 ++++++++++ hw/lm32/Kconfig | 5 +++ hw/m68k/Kconfig | 8 ++++ hw/mem/Kconfig | 8 ++++ hw/microblaze/Kconfig | 8 ++++ hw/mips/Kconfig | 20 +++++++++ hw/misc/Kconfig | 94 +++++++++++++++++++++++++++++++++++++++ hw/misc/macio/Kconfig | 11 +++++ hw/moxie/Kconfig | 2 + hw/net/Kconfig | 92 ++++++++++++++++++++++++++++++++++++++ hw/nios2/Kconfig | 5 +++ hw/nvram/Kconfig | 8 ++++ hw/openrisc/Kconfig | 2 + hw/pci-bridge/Kconfig | 20 +++++++++ hw/pci-host/Kconfig | 35 +++++++++++++++ hw/pci/Kconfig | 2 + hw/pcmcia/Kconfig | 2 + hw/ppc/Kconfig | 44 +++++++++++++++++++ hw/riscv/Kconfig | 20 +++++++++ hw/s390x/Kconfig | 2 + hw/scsi/Kconfig | 26 +++++++++++ hw/sd/Kconfig | 11 +++++ hw/sh4/Kconfig | 11 +++++ hw/smbios/Kconfig | 2 + hw/sparc/Kconfig | 11 +++++ hw/sparc64/Kconfig | 5 +++ hw/ssi/Kconfig | 14 ++++++ hw/timer/Kconfig | 53 ++++++++++++++++++++++ hw/tpm/Kconfig | 11 +++++ hw/tricore/Kconfig | 2 + hw/unicore32/Kconfig | 2 + hw/usb/Kconfig | 53 ++++++++++++++++++++++ hw/vfio/Kconfig | 20 +++++++++ hw/virtio/Kconfig | 17 ++++++++ hw/watchdog/Kconfig | 11 +++++ hw/xtensa/Kconfig | 5 +++ scripts/minikconf.py | 35 +++++++++++++-- 63 files changed, 1340 insertions(+), 3 deletions(-) create mode 100644 Kconfig.host create mode 100644 hw/9pfs/Kconfig create mode 100644 hw/Kconfig create mode 100644 hw/acpi/Kconfig create mode 100644 hw/adc/Kconfig create mode 100644 hw/alpha/Kconfig create mode 100644 hw/arm/Kconfig create mode 100644 hw/audio/Kconfig create mode 100644 hw/block/Kconfig create mode 100644 hw/bt/Kconfig create mode 100644 hw/char/Kconfig create mode 100644 hw/core/Kconfig create mode 100644 hw/cpu/Kconfig create mode 100644 hw/cris/Kconfig create mode 100644 hw/display/Kconfig create mode 100644 hw/dma/Kconfig create mode 100644 hw/gpio/Kconfig create mode 100644 hw/hppa/Kconfig create mode 100644 hw/hyperv/Kconfig create mode 100644 hw/i2c/Kconfig create mode 100644 hw/i386/Kconfig create mode 100644 hw/ide/Kconfig create mode 100644 hw/input/Kconfig create mode 100644 hw/intc/Kconfig create mode 100644 hw/ipack/Kconfig create mode 100644 hw/ipmi/Kconfig create mode 100644 hw/isa/Kconfig create mode 100644 hw/lm32/Kconfig create mode 100644 hw/m68k/Kconfig create mode 100644 hw/mem/Kconfig create mode 100644 hw/microblaze/Kconfig create mode 100644 hw/mips/Kconfig create mode 100644 hw/misc/Kconfig create mode 100644 hw/misc/macio/Kconfig create mode 100644 hw/moxie/Kconfig create mode 100644 hw/net/Kconfig create mode 100644 hw/nios2/Kconfig create mode 100644 hw/nvram/Kconfig create mode 100644 hw/openrisc/Kconfig create mode 100644 hw/pci-bridge/Kconfig create mode 100644 hw/pci-host/Kconfig create mode 100644 hw/pci/Kconfig create mode 100644 hw/pcmcia/Kconfig create mode 100644 hw/ppc/Kconfig create mode 100644 hw/riscv/Kconfig create mode 100644 hw/s390x/Kconfig create mode 100644 hw/scsi/Kconfig create mode 100644 hw/sd/Kconfig create mode 100644 hw/sh4/Kconfig create mode 100644 hw/smbios/Kconfig create mode 100644 hw/sparc/Kconfig create mode 100644 hw/sparc64/Kconfig create mode 100644 hw/ssi/Kconfig create mode 100644 hw/timer/Kconfig create mode 100644 hw/tpm/Kconfig create mode 100644 hw/tricore/Kconfig create mode 100644 hw/unicore32/Kconfig create mode 100644 hw/usb/Kconfig create mode 100644 hw/vfio/Kconfig create mode 100644 hw/virtio/Kconfig create mode 100644 hw/watchdog/Kconfig create mode 100644 hw/xtensa/Kconfig diff --git a/Kconfig.host b/Kconfig.host new file mode 100644 index 0000000..1147e42 --- /dev/null +++ b/Kconfig.host @@ -0,0 +1,32 @@ +# These are "proxy" symbols used to pass config-host.mak values +# down to Kconfig. + +config KVM + bool + +config IVHSMEM + bool + +config LINUX + bool + +config OPENGL + bool + +config SPICE + bool + +config IVSHMEM + bool + +config TPM + bool + +config VHOST_USER + bool + +config XEN + bool + +config VIRTFS + bool diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig new file mode 100644 index 0000000..a475099 --- /dev/null +++ b/hw/9pfs/Kconfig @@ -0,0 +1,2 @@ +config VIRTIO_9P + bool diff --git a/hw/Kconfig b/hw/Kconfig new file mode 100644 index 0000000..c4f1547 --- /dev/null +++ b/hw/Kconfig @@ -0,0 +1,68 @@ +# devices Kconfig +source 9pfs/Kconfig +source acpi/Kconfig +source adc/Kconfig +source audio/Kconfig +source block/Kconfig +source bt/Kconfig +source char/Kconfig +source core/Kconfig +source display/Kconfig +source dma/Kconfig +source gpio/Kconfig +source hyperv/Kconfig +source i2c/Kconfig +source ide/Kconfig +source input/Kconfig +source intc/Kconfig +source ipack/Kconfig +source ipmi/Kconfig +source isa/Kconfig +source mem/Kconfig +source misc/Kconfig +source net/Kconfig +source nvram/Kconfig +source pci-bridge/Kconfig +source pci-host/Kconfig +source pcmcia/Kconfig +source pci/Kconfig +source scsi/Kconfig +source sd/Kconfig +source smbios/Kconfig +source ssi/Kconfig +source timer/Kconfig +source tpm/Kconfig +source usb/Kconfig +source virtio/Kconfig +source vfio/Kconfig +source watchdog/Kconfig + +# arch Kconfig +source arm/Kconfig +source alpha/Kconfig +source cris/Kconfig +source hppa/Kconfig +source i386/Kconfig +source lm32/Kconfig +source m68k/Kconfig +source microblaze/Kconfig +source mips/Kconfig +source moxie/Kconfig +source nios2/Kconfig +source openrisc/Kconfig +source ppc/Kconfig +source riscv/Kconfig +source s390x/Kconfig +source sh4/Kconfig +source sparc/Kconfig +source sparc64/Kconfig +source tricore/Kconfig +source unicore32/Kconfig +source xtensa/Kconfig + +# Symbols used by multiple targets +config XILINX + bool + +config XILINX_AXI + bool diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig new file mode 100644 index 0000000..c485a34 --- /dev/null +++ b/hw/acpi/Kconfig @@ -0,0 +1,20 @@ +config ACPI + bool + +config ACPI_X86 + bool + +config ACPI_X86_ICH + bool + +config ACPI_CPU_HOTPLUG + bool + +config ACPI_MEMORY_HOTPLUG + bool + +config ACPI_NVDIMM + bool + +config ACPI_VMGENID + bool diff --git a/hw/adc/Kconfig b/hw/adc/Kconfig new file mode 100644 index 0000000..25d2229 --- /dev/null +++ b/hw/adc/Kconfig @@ -0,0 +1,2 @@ +config STM32F2XX_ADC + bool diff --git a/hw/alpha/Kconfig b/hw/alpha/Kconfig new file mode 100644 index 0000000..c5d0438 --- /dev/null +++ b/hw/alpha/Kconfig @@ -0,0 +1,2 @@ +config DP264 + bool diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig new file mode 100644 index 0000000..e4386ce --- /dev/null +++ b/hw/arm/Kconfig @@ -0,0 +1,119 @@ +config ARM_VIRT + bool + +config DIGIC + bool + +config EXYNOS4 + bool + +config HIGHBANK + bool + +config INTEGRATOR + bool + +config MAINSTONE + bool + +config MUSICPAL + bool + +config NETDUINO2 + bool + +config NSERIES + bool + +config OMAP + bool + +config PXA2XX + bool + +config REALVIEW + bool + +config STELLARIS + bool + +config STRONGARM + bool + +config VERSATILE + bool + +config ZYNQ + bool + +config ARM_V7M + bool + +config ALLWINNER_A10 + bool + +config RASPI + bool + +config STM32F205_SOC + bool + +config XLNX_ZYNQMP_ARM + bool + +config XLNX_VERSAL + bool + +config FSL_IMX25 + bool + +config FSL_IMX31 + bool + +config FSL_IMX6 + bool + +config ASPEED_SOC + bool + +config MPS2 + bool + +config FSL_IMX7 + bool + +config ARM_SMMUV3 + bool + +config FSL_IMX6UL + bool + +config NRF51_SOC + bool + +config MSF2 + bool + +config ZAURUS + bool + +config A9MPCORE + bool + +config A15MPCORE + bool + +config ARM11MPCORE + bool + +config ARMSSE + bool + +config ARMSSE_CPUID + bool + +config ARMSSE_MHU + bool + +config MUSCA + bool diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig new file mode 100644 index 0000000..207baee --- /dev/null +++ b/hw/audio/Kconfig @@ -0,0 +1,35 @@ +config SB16 + bool + +config ES1370 + bool + +config AC97 + bool + +config ADLIB + bool + +config GUS + bool + +config CS4231A + bool + +config HDA + bool + +config PCSPK + bool + +config WM8750 + bool + +config PL041 + bool + +config CS4231 + bool + +config MARVELL_88W8618 + bool diff --git a/hw/block/Kconfig b/hw/block/Kconfig new file mode 100644 index 0000000..9d418bc --- /dev/null +++ b/hw/block/Kconfig @@ -0,0 +1,29 @@ +config FDC + bool + +config SSI_M25P80 + bool + +config NAND + bool + +config PFLASH_CFI01 + bool + +config PFLASH_CFI02 + bool + +config ECC + bool + +config ONENAND + bool + +config NVME_PCI + bool + +config VIRTIO_BLK + bool + +config VHOST_USER_BLK + bool diff --git a/hw/bt/Kconfig b/hw/bt/Kconfig new file mode 100644 index 0000000..554a9ee --- /dev/null +++ b/hw/bt/Kconfig @@ -0,0 +1,2 @@ +config BLUETOOTH + bool diff --git a/hw/char/Kconfig b/hw/char/Kconfig new file mode 100644 index 0000000..26c1324 --- /dev/null +++ b/hw/char/Kconfig @@ -0,0 +1,32 @@ +config ESCC + bool + +config PARALLEL + bool + +config PL011 + bool + +config SERIAL + bool + +config SERIAL_ISA + bool + +config SERIAL_PCI + bool + +config VIRTIO_SERIAL + bool + +config STM32F2XX_USART + bool + +config CMSDK_APB_UART + bool + +config SCLPCONSOLE + bool + +config TERMINAL3270 + bool diff --git a/hw/core/Kconfig b/hw/core/Kconfig new file mode 100644 index 0000000..c2a1ae8 --- /dev/null +++ b/hw/core/Kconfig @@ -0,0 +1,11 @@ +config EMPTY_SLOT + bool + +config PTIMER + bool + +config FITLOADER + bool + +config PLATFORM_BUS + bool diff --git a/hw/cpu/Kconfig b/hw/cpu/Kconfig new file mode 100644 index 0000000..1767d02 --- /dev/null +++ b/hw/cpu/Kconfig @@ -0,0 +1,8 @@ +config ARM11MPCORE + bool + +config A9MPCORE + bool + +config A15MPCORE + bool diff --git a/hw/cris/Kconfig b/hw/cris/Kconfig new file mode 100644 index 0000000..86954ab --- /dev/null +++ b/hw/cris/Kconfig @@ -0,0 +1,5 @@ +config AXIS + bool + +config ETRAXFS + bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig new file mode 100644 index 0000000..d5c022c --- /dev/null +++ b/hw/display/Kconfig @@ -0,0 +1,77 @@ +config EDID + bool + +config FW_CFG_DMA + bool + +config ADS7846 + bool + +config VGA_CIRRUS + bool + +config G364FB + bool + +config JAZZ_LED + bool + +config PL110 + bool + +config SII9022 + bool + +config SSD0303 + bool + +config SSD0323 + bool + +config VGA_PCI + bool + +config VGA_ISA + bool + +config VGA_ISA_MM + bool + +config VMWARE_VGA + bool + +config BOCHS_DISPLAY + bool + +config BLIZZARD + bool + +config FRAMEBUFFER + bool + +config MILKYMIST_TMU2 + bool + +config SM501 + bool + +config TCX + bool + +config CG3 + bool + +config VGA + bool + +config QXL + bool + +config VIRTIO_GPU + bool + +config VIRTIO_VGA + bool + +config DPCD + bool diff --git a/hw/dma/Kconfig b/hw/dma/Kconfig new file mode 100644 index 0000000..b9ce1c5 --- /dev/null +++ b/hw/dma/Kconfig @@ -0,0 +1,20 @@ +config RC4030 + bool + +config PL080 + bool + +config PL330 + bool + +config I82374 + bool + +config I8257 + bool + +config ZYNQ_DEVCFG + bool + +config STP2000 + bool diff --git a/hw/gpio/Kconfig b/hw/gpio/Kconfig new file mode 100644 index 0000000..d0a4abf --- /dev/null +++ b/hw/gpio/Kconfig @@ -0,0 +1,8 @@ +config MAX7310 + bool + +config PL061 + bool + +config GPIO_KEY + bool diff --git a/hw/hppa/Kconfig b/hw/hppa/Kconfig new file mode 100644 index 0000000..5ce48ef --- /dev/null +++ b/hw/hppa/Kconfig @@ -0,0 +1,2 @@ +config DINO + bool diff --git a/hw/hyperv/Kconfig b/hw/hyperv/Kconfig new file mode 100644 index 0000000..be724b7 --- /dev/null +++ b/hw/hyperv/Kconfig @@ -0,0 +1,5 @@ +config HYPERV + bool + +config HYPERV_TESTDEV + bool diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig new file mode 100644 index 0000000..d6d4402 --- /dev/null +++ b/hw/i2c/Kconfig @@ -0,0 +1,20 @@ +config I2C + bool + +config SMBUS_EEPROM + bool + +config DDC + bool + +config VERSATILE_I2C + bool + +config ACPI_SMBUS + bool + +config BITBANG_I2C + bool + +config IMX_I2C + bool diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig new file mode 100644 index 0000000..c851e2b --- /dev/null +++ b/hw/i386/Kconfig @@ -0,0 +1,23 @@ +config SEV + bool + +config I440FX + bool + +config ISAPC + bool + +config Q35 + bool + +config VTD + bool + +config AMD_IOMMU + bool + +config VMPORT + bool + +config VMMOUSE + bool diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig new file mode 100644 index 0000000..5ec4495 --- /dev/null +++ b/hw/ide/Kconfig @@ -0,0 +1,35 @@ +config IDE_CORE + bool + +config IDE_QDEV + bool + +config IDE_PCI + bool + +config IDE_ISA + bool + +config IDE_PIIX + bool + +config IDE_CMD646 + bool + +config IDE_MACIO + bool + +config IDE_MMIO + bool + +config IDE_VIA + bool + +config MICRODRIVE + bool + +config AHCI + bool + +config IDE_SII3112 + bool diff --git a/hw/input/Kconfig b/hw/input/Kconfig new file mode 100644 index 0000000..91bae47 --- /dev/null +++ b/hw/input/Kconfig @@ -0,0 +1,23 @@ +config ADB + bool + +config LM832X + bool + +config PCKBD + bool + +config PL050 + bool + +config STELLARIS_INPUT + bool + +config TSC2005 + bool + +config VIRTIO_INPUT + bool + +config TSC210X + bool diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig new file mode 100644 index 0000000..69adbd1 --- /dev/null +++ b/hw/intc/Kconfig @@ -0,0 +1,47 @@ +config HEATHROW_PIC + bool + +config I8259 + bool + +config PL190 + bool + +config IOAPIC + bool + +config ARM_GIC + bool + +config OPENPIC + bool + +config APIC + bool + +config ARM_GIC_KVM + bool + +config OPENPIC_KVM + bool + +config XICS + bool + +config XICS_SPAPR + bool + +config XICS_KVM + bool + +config ALLWINNER_A10_PIC + bool + +config S390_FLIC + bool + +config S390_FLIC_KVM + bool + +config OMPIC + bool diff --git a/hw/ipack/Kconfig b/hw/ipack/Kconfig new file mode 100644 index 0000000..481e0d2 --- /dev/null +++ b/hw/ipack/Kconfig @@ -0,0 +1,2 @@ +config IPACK + bool diff --git a/hw/ipmi/Kconfig b/hw/ipmi/Kconfig new file mode 100644 index 0000000..68f8ba1 --- /dev/null +++ b/hw/ipmi/Kconfig @@ -0,0 +1,14 @@ +config IPMI + bool + +config IPMI_LOCAL + bool + +config IPMI_EXTERN + bool + +config ISA_IPMI_KCS + bool + +config ISA_IPMI_BT + bool diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig new file mode 100644 index 0000000..b59d074 --- /dev/null +++ b/hw/isa/Kconfig @@ -0,0 +1,23 @@ +config ISA_BUS + bool + +config APM + bool + +config I82378 + bool + +config PC87312 + bool + +config PIIX4 + bool + +config VT82C686 + bool + +config SMC37C669 + bool + +config LPC_ICH9 + bool diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig new file mode 100644 index 0000000..84c530e --- /dev/null +++ b/hw/lm32/Kconfig @@ -0,0 +1,5 @@ +config LM32 + bool + +config MILKYMIST + bool diff --git a/hw/m68k/Kconfig b/hw/m68k/Kconfig new file mode 100644 index 0000000..cd66ada --- /dev/null +++ b/hw/m68k/Kconfig @@ -0,0 +1,8 @@ +config AN5206 + bool + +config MCF5206 + bool + +config MCF5208 + bool diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig new file mode 100644 index 0000000..a3a4372 --- /dev/null +++ b/hw/mem/Kconfig @@ -0,0 +1,8 @@ +config DIMM + bool + +config MEM_DEVICE + bool + +config NVDIMM + bool diff --git a/hw/microblaze/Kconfig b/hw/microblaze/Kconfig new file mode 100644 index 0000000..44683b2 --- /dev/null +++ b/hw/microblaze/Kconfig @@ -0,0 +1,8 @@ +config PETALOGIX_S3ADSP1800 + bool + +config PETALOGIX_ML605 + bool + +config XLNX_ZYNQMP_PMU + bool diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig new file mode 100644 index 0000000..348c9bf --- /dev/null +++ b/hw/mips/Kconfig @@ -0,0 +1,20 @@ +config R4K + bool + +config MALTA + bool + +config MIPSSIM + bool + +config JAZZ + bool + +config FULONG + bool + +config MIPS_CPS + bool + +config MIPS_BOSTON + bool diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig new file mode 100644 index 0000000..d512634 --- /dev/null +++ b/hw/misc/Kconfig @@ -0,0 +1,94 @@ +config APPLESMC + bool + +config MAX111X + bool + +config TMP105 + bool + +config TMP421 + bool + +config ISA_DEBUG + bool + +config SGA + bool + +config ISA_TESTDEV + bool + +config PCI_TESTDEV + bool + +config EDU + bool + +config PCA9552 + bool + +config PL310 + bool + +config INTEGRATOR_DEBUG + bool + +config A9SCU + bool + +config ARM11SCU + bool + +config MOS6522 + bool + +config MACIO + bool + +config IVSHMEM_DEVICE + bool + +config ECCMEMCTL + bool + +config IMX + bool + +config STM32F2XX_SYSCFG + bool + +config MIPS_ITU + bool + +config MPS2_FPGAIO + bool + +config MPS2_SCC + bool + +config TZ_MPC + bool + +config TZ_MSC + bool + +config TZ_PPC + bool + +config IOTKIT_SECCTL + bool + +config IOTKIT_SYSCTL + bool + +config IOTKIT_SYSINFO + bool + +config PVPANIC + bool + +config AUX + bool + +source macio/Kconfig diff --git a/hw/misc/macio/Kconfig b/hw/misc/macio/Kconfig new file mode 100644 index 0000000..c6caeb6 --- /dev/null +++ b/hw/misc/macio/Kconfig @@ -0,0 +1,11 @@ +config CUDA + bool + +config MAC_PMU + bool + +config MAC_DBDMA + bool + +config MACIO_GPIO + bool diff --git a/hw/moxie/Kconfig b/hw/moxie/Kconfig new file mode 100644 index 0000000..03f62e3 --- /dev/null +++ b/hw/moxie/Kconfig @@ -0,0 +1,2 @@ +config MOXIESIM + bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig new file mode 100644 index 0000000..ad56fc0 --- /dev/null +++ b/hw/net/Kconfig @@ -0,0 +1,92 @@ +config DP8393X + bool + +config NE2000_PCI + bool + +config EEPRO100_PCI + bool + +config PCNET_PCI + bool + +config PCNET_COMMON + bool + +config E1000_PCI + bool + +config E1000E_PCI_EXPRESS + bool + +config RTL8139_PCI + bool + +config VMXNET3_PCI + bool + +config SMC91C111 + bool + +config LAN9118 + bool + +config NE2000_ISA + bool + +config OPENCORES_ETH + bool + +config XGMAC + bool + +config MIPSNET + bool + +config ALLWINNER_EMAC + bool + +config IMX_FEC + bool + +config CADENCE + bool + +config STELLARIS_ENET + bool + +config LANCE + bool + +config SUNHME + bool + +config FTGMAC100 + bool + +config SUNGEM + bool + +config COLDFIRE + bool + +config XILINX_ETHLITE + bool + +config VIRTIO_NET + bool + +config ETSEC + bool + +config ROCKER + bool + +config CAN_BUS + bool + +config CAN_PCI + bool + +config CAN_SJA1000 + bool diff --git a/hw/nios2/Kconfig b/hw/nios2/Kconfig new file mode 100644 index 0000000..22817e4 --- /dev/null +++ b/hw/nios2/Kconfig @@ -0,0 +1,5 @@ +config NIOS2_10M50 + bool + +config NIOS2 + bool diff --git a/hw/nvram/Kconfig b/hw/nvram/Kconfig new file mode 100644 index 0000000..1f5ec95 --- /dev/null +++ b/hw/nvram/Kconfig @@ -0,0 +1,8 @@ +config DS1225Y + bool + +config AT24C + bool + +config MAC_NVRAM + bool diff --git a/hw/openrisc/Kconfig b/hw/openrisc/Kconfig new file mode 100644 index 0000000..7aef98d --- /dev/null +++ b/hw/openrisc/Kconfig @@ -0,0 +1,2 @@ +config OR1K_SIM + bool diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig new file mode 100644 index 0000000..bb19b7a --- /dev/null +++ b/hw/pci-bridge/Kconfig @@ -0,0 +1,20 @@ +config PCIE_PORT + bool + +config PXB + bool + +config XIO3130 + bool + +config IOH3420 + bool + +config I82801B11 + bool + +config DEC_PCI + bool + +config SIMBA + bool diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig new file mode 100644 index 0000000..2edc5bb --- /dev/null +++ b/hw/pci-host/Kconfig @@ -0,0 +1,35 @@ +config PAM + bool + +config PREP_PCI + bool + +config GRACKLE_PCI + bool + +config UNIN_PCI + bool + +config PPCE500_PCI + bool + +config VERSATILE_PCI + bool + +config PCI_SABRE + bool + +config PCI_PIIX + bool + +config PCI_EXPRESS_Q35 + bool + +config PCI_EXPRESS_GENERIC_BRIDGE + bool + +config PCI_EXPRESS_XILINX + bool + +config PCI_EXPRESS_DESIGNWARE + bool diff --git a/hw/pci/Kconfig b/hw/pci/Kconfig new file mode 100644 index 0000000..d3d2205 --- /dev/null +++ b/hw/pci/Kconfig @@ -0,0 +1,2 @@ +config PCI + bool diff --git a/hw/pcmcia/Kconfig b/hw/pcmcia/Kconfig new file mode 100644 index 0000000..41f2df9 --- /dev/null +++ b/hw/pcmcia/Kconfig @@ -0,0 +1,2 @@ +config PCMCIA + bool diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig new file mode 100644 index 0000000..6087454 --- /dev/null +++ b/hw/ppc/Kconfig @@ -0,0 +1,44 @@ +config PSERIES + bool + +config SPAPR_RNG + bool + +config POWERNV + bool + +config PPC405 + bool + +config PPC440 + bool + +config PPC4XX + bool + +config SAM460EX + bool + +config PREP + bool + +config RS6000_MC + bool + +config MAC_OLDWORLD + bool + +config MAC_NEWWORLD + bool + +config E500 + bool + +config VIRTEX + bool + +config XIVE + bool + +config XIVE_SPAPR + bool diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig new file mode 100644 index 0000000..4989589 --- /dev/null +++ b/hw/riscv/Kconfig @@ -0,0 +1,20 @@ +config HTIF + bool + +config HART + bool + +config SIFIVE + bool + +config SIFIVE_E + bool + +config SIFIVE_U + bool + +config SPIKE + bool + +config RISCV_VIRT + bool diff --git a/hw/s390x/Kconfig b/hw/s390x/Kconfig new file mode 100644 index 0000000..303db7f --- /dev/null +++ b/hw/s390x/Kconfig @@ -0,0 +1,2 @@ +config S390_CCW_VIRTIO + bool diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig new file mode 100644 index 0000000..eb78478 --- /dev/null +++ b/hw/scsi/Kconfig @@ -0,0 +1,26 @@ +config SCSI + bool + +config LSI_SCSI_PCI + bool + +config MPTSAS_SCSI_PCI + bool + +config MEGASAS_SCSI_PCI + bool + +config VMW_PVSCSI_SCSI_PCI + bool + +config ESP + bool + +config ESP_PCI + bool + +config VIRTIO_SCSI + bool + +config VHOST_USER_SCSI + bool diff --git a/hw/sd/Kconfig b/hw/sd/Kconfig new file mode 100644 index 0000000..4f43bbb --- /dev/null +++ b/hw/sd/Kconfig @@ -0,0 +1,11 @@ +config PL181 + bool + +config SSI_SD + bool + +config SD + bool + +config SDHCI + bool diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig new file mode 100644 index 0000000..417a72f --- /dev/null +++ b/hw/sh4/Kconfig @@ -0,0 +1,11 @@ +config R2D + bool + +config SHIX + bool + +config SH7750 + bool + +config SH4 + bool diff --git a/hw/smbios/Kconfig b/hw/smbios/Kconfig new file mode 100644 index 0000000..553adf4 --- /dev/null +++ b/hw/smbios/Kconfig @@ -0,0 +1,2 @@ +config SMBIOS + bool diff --git a/hw/sparc/Kconfig b/hw/sparc/Kconfig new file mode 100644 index 0000000..3795754 --- /dev/null +++ b/hw/sparc/Kconfig @@ -0,0 +1,11 @@ +config SUN4M + bool + +config LEON3 + bool + +config GRLIB + bool + +config SLAVIO + bool diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig new file mode 100644 index 0000000..8c13345 --- /dev/null +++ b/hw/sparc64/Kconfig @@ -0,0 +1,5 @@ +config SUN4U + bool + +config NIAGARA + bool diff --git a/hw/ssi/Kconfig b/hw/ssi/Kconfig new file mode 100644 index 0000000..5a03110 --- /dev/null +++ b/hw/ssi/Kconfig @@ -0,0 +1,14 @@ +config PL022 + bool + +config SSI + bool + +config XILINX_SPI + bool + +config XILINX_SPIPS + bool + +config STM32F2XX_SPI + bool diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig new file mode 100644 index 0000000..7dbc121 --- /dev/null +++ b/hw/timer/Kconfig @@ -0,0 +1,53 @@ +config ARM_TIMER + bool + +config ARM_MPTIMER + bool + +config A9_GTIMER + bool + +config DS1338 + bool + +config HPET + bool + +config I8254 + bool + +config M41T80 + bool + +config M48T59 + bool + +config PL031 + bool + +config TWL92230 + bool + +config XLNX_ZYNQMP + bool + +config ALTERA_TIMER + bool + +config MC146818RTC + bool + +config ALLWINNER_A10_PIT + bool + +config STM32F2XX_TIMER + bool + +config SUN4V_RTC + bool + +config CMSDK_APB_TIMER + bool + +config CMSDK_APB_DUALTIMER + bool diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig new file mode 100644 index 0000000..00511e2 --- /dev/null +++ b/hw/tpm/Kconfig @@ -0,0 +1,11 @@ +config TPM_TIS + bool + +config TPM_CRB + bool + +config TPM_PASSTHROUGH + bool + +config TPM_EMULATOR + bool diff --git a/hw/tricore/Kconfig b/hw/tricore/Kconfig new file mode 100644 index 0000000..9313409 --- /dev/null +++ b/hw/tricore/Kconfig @@ -0,0 +1,2 @@ +config TRICORE + bool diff --git a/hw/unicore32/Kconfig b/hw/unicore32/Kconfig new file mode 100644 index 0000000..b3cf294 --- /dev/null +++ b/hw/unicore32/Kconfig @@ -0,0 +1,2 @@ +config PUV3 + bool diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig new file mode 100644 index 0000000..cbf5c5d --- /dev/null +++ b/hw/usb/Kconfig @@ -0,0 +1,53 @@ +config USB + bool + +config USB_UHCI + bool + +config USB_OHCI + bool + +config USB_EHCI + bool + +config USB_EHCI_SYSBUS + bool + +config USB_XHCI + bool + +config USB_XHCI_NEC + bool + +config USB_MUSB + bool + +config TUSB6010 + bool + +config USB_TABLET_WACOM + bool + +config USB_STORAGE_BOT + bool + +config USB_STORAGE_UAS + bool + +config USB_AUDIO + bool + +config USB_SERIAL + bool + +config USB_NETWORK + bool + +config USB_BLUETOOTH + bool + +config USB_SMARTCARD + bool + +config USB_STORAGE_MTP + bool diff --git a/hw/vfio/Kconfig b/hw/vfio/Kconfig new file mode 100644 index 0000000..3606967 --- /dev/null +++ b/hw/vfio/Kconfig @@ -0,0 +1,20 @@ +config VFIO + bool + +config VFIO_PCI + bool + +config VFIO_CCW + bool + +config VFIO_PLATFORM + bool + +config VFIO_XGMAC + bool + +config VFIO_AMD_XGBE + bool + +config VFIO_AP + bool diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig new file mode 100644 index 0000000..ebf1812 --- /dev/null +++ b/hw/virtio/Kconfig @@ -0,0 +1,17 @@ +config VIRTIO + bool + +config VIRTIO_RNG + bool + +config VIRTIO_PCI + bool + +config VIRTIO_MMIO + bool + +config VIRTIO_BALLOON + bool + +config VIRTIO_CRYPTO + bool diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig new file mode 100644 index 0000000..cd0244f --- /dev/null +++ b/hw/watchdog/Kconfig @@ -0,0 +1,11 @@ +config CMSDK_APB_WATCHDOG + bool + +config WDT_IB6300ESB + bool + +config WDT_IB700 + bool + +config WDT_DIAG288 + bool diff --git a/hw/xtensa/Kconfig b/hw/xtensa/Kconfig new file mode 100644 index 0000000..97543a9 --- /dev/null +++ b/hw/xtensa/Kconfig @@ -0,0 +1,5 @@ +config XTENSA_SIM + bool + +config XTENSA_FPGA + bool diff --git a/scripts/minikconf.py b/scripts/minikconf.py index d89fb09..6bedc57 100644 --- a/scripts/minikconf.py +++ b/scripts/minikconf.py @@ -13,6 +13,7 @@ from __future__ import print_function import os import sys +import re =20 __all__ =3D [ 'KconfigDataError', 'KconfigParserError', 'KconfigData', 'KconfigParser' ] @@ -350,6 +351,12 @@ class KconfigParser: self.get_token() self.parse_config() =20 + def do_assignment(self, var, val): + if not var.startswith("CONFIG_"): + raise Error('assigned variable should start with CONFIG_') + var =3D self.data.do_var(var[7:]) + self.data.do_assignment(var, val) + # file management ----- =20 def error_path(self): @@ -645,6 +652,28 @@ class KconfigParser: return None =20 if __name__ =3D=3D '__main__': - fname =3D len(sys.argv) > 1 and sys.argv[1] or 'Kconfig.test' - data =3D KconfigParser.parse(open(fname, 'r')) - print data.compute_config() + argv =3D sys.argv + if len(argv) =3D=3D 1: + print ("%s: at least one argument is required" % argv[0], file=3Ds= ys.stderr) + sys.exit(1) + + data =3D KconfigData() + parser =3D KconfigParser(data) + for arg in argv[3:]: + m =3D re.match(r'^(CONFIG_[A-Z0-9_]+)=3D([yn]?)$', arg) + if m is not None: + name, value =3D m.groups() + parser.do_assignment(name, value =3D=3D 'y') + else: + fp =3D open(arg, 'r') + parser.parse_file(fp) + fp.close() + + config =3D data.compute_config() + for key in sorted(config.keys()): + print ('CONFIG_%s=3D%s' % (key, ('y' if config[key] else 'n'))) + + deps =3D open(argv[2], 'w') + for fname in data.previously_included: + print ('%s: %s' % (argv[1], fname), file=3Ddeps) + deps.close() --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551727875978995.7404824762751; Mon, 4 Mar 2019 11:31:15 -0800 (PST) Received: from localhost ([127.0.0.1]:59673 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tIu-0002Vg-Mh for importer@patchew.org; Mon, 04 Mar 2019 14:31:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCT-0001oV-6X for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCR-0003on-0c for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:29 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:50739) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCQ-0003mu-Je for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:26 -0500 Received: by mail-wm1-x32c.google.com with SMTP id x7so147388wmj.0 for ; Mon, 04 Mar 2019 10:20:26 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:24 -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=4V4I75ADJha8t4SqZ3iup/vvVj2M6WgC+pgPJaLbE7o=; b=lNb4fQDxyrn8bYyK54OvLfajgYMSPflV85wVlZtI3DRddcRxGCWfZrL6GCNDNn4uu5 mfhDORWCVxol5faxUU1RqQl+SOXPJIU953FL4zDeQ0RhlUkyVKxK9ARRSsMHmIqnbZxn FUcKZLDP5n1UGimdbF4HHxQV1NBejsqgPsRqVmfWlmi6pF7JyiHSwwSUAAwgl/zQS++3 4vHhzhk1HuPrDZqE8jvokM308bbebHMetnZsXer2Gz9Aqtjinq4sxzEC/YZ9yAdnGfNR cQ14q0X1BAdu+IyGw2KICDcpIoNxaNYAhY6fft4NTGbb5K0HuIE/1yoYr+tR8KM/S2wg wgtg== 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=4V4I75ADJha8t4SqZ3iup/vvVj2M6WgC+pgPJaLbE7o=; b=NsqAHnP2aY6OkrD5L7qBR8SPgxDycb+J3rSDxqb2cD8wesQXuy86rhyM5T+IBshRud z7VgCC0EEYyaWmQnlHK7nuTGlgv01tn9NP1fUPxVafc2hxEMBX3z96NsEgnCAPNoGC+W MtH1dfynu8x/ptMbNFJi3R19sWHglQbR4bA+voAi3W2WIr1klv5qAmOK9Qjiipcx7J0N YFskRt4NXkZAwnuo0lL1xiMnhzkVQj2uutnKD6wCGrQ+JgOYhXczTkZaSO9A02UHi0u2 H2sa0v7gwpx4I+C96ng8694vGrvuszrBKPkNrGmp1BXtu+O+nkIGB8oBBfnm8Un0HkKl daWQ== X-Gm-Message-State: APjAAAXoRtKg13pfOemMtpIfXXtBMeLlf9+CuzWNEz4w4H8hhxUlwRPz 7RbzVzPKsbNnDkKmla3hd2JUinm8 X-Google-Smtp-Source: APXvYqy1BFpdOWWNKVz8fpYdLCcGa7N0zmWnTqKMtn+yItO1l3/Dmbnba1Lu1wL8Wm2bZ4Y8iyY+Iw== X-Received: by 2002:a1c:80d6:: with SMTP id b205mr268102wmd.109.1551723624981; Mon, 04 Mar 2019 10:20:24 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:29 +0100 Message-Id: <1551723614-1823-10-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::32c Subject: [Qemu-devel] [PULL 09/54] build: switch to 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" The make_device_config.sh script is replaced by minikconf, which is modified to support the same command line as its predecessor. The roots of the parsing are default-configs/*.mak, Kconfig.host and hw/Kconfig. One difference with make_device_config.sh is that all symbols have to be defined in a Kconfig file, including those coming from the configure script. This is the reason for the Kconfig.host file introduced in the previous patch. Whenever a file in default-configs/*.mak used $(...) to refer to a config-host.mak symbol, this is replaced by a Kconfig dependency; this part must be done already in this patch for bisectability. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Acked-by: Thomas Huth Message-Id: <20190123065618.3520-28-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- Kconfig.host | 6 +++++- Makefile | 26 +++++++++++++++++++++----- Makefile.target | 7 ++++++- configure | 6 ++++++ default-configs/arm-softmmu.mak | 3 --- default-configs/hyperv.mak | 1 - default-configs/i386-softmmu.mak | 5 +---- default-configs/lm32-softmmu.mak | 1 - default-configs/pci.mak | 2 -- default-configs/ppc-softmmu.mak | 1 - default-configs/ppc64-softmmu.mak | 5 ----- default-configs/s390x-softmmu.mak | 4 +--- default-configs/virtio.mak | 4 ---- hw/9pfs/Kconfig | 2 ++ hw/arm/Kconfig | 1 + hw/block/Kconfig | 3 +++ hw/display/Kconfig | 3 +++ hw/hyperv/Kconfig | 1 + hw/i386/Kconfig | 8 ++++++++ hw/input/Kconfig | 5 +++++ hw/intc/Kconfig | 12 ++++++++++++ hw/misc/Kconfig | 2 ++ hw/ppc/Kconfig | 5 +++++ hw/scsi/Kconfig | 8 ++++++++ hw/tpm/Kconfig | 1 + hw/vfio/Kconfig | 9 +++++++++ hw/xtensa/Kconfig | 2 +- rules.mak | 2 +- scripts/make_device_config.sh | 30 ------------------------------ 29 files changed, 102 insertions(+), 63 deletions(-) delete mode 100644 scripts/make_device_config.sh diff --git a/Kconfig.host b/Kconfig.host index 1147e42..f96c77d 100644 --- a/Kconfig.host +++ b/Kconfig.host @@ -1,5 +1,6 @@ # These are "proxy" symbols used to pass config-host.mak values -# down to Kconfig. +# down to Kconfig. See also MINIKCONF_ARGS in the Makefile: +# these two need to be kept in sync. =20 config KVM bool @@ -13,6 +14,9 @@ config LINUX config OPENGL bool =20 +config X11 + bool + config SPICE bool =20 diff --git a/Makefile b/Makefile index 2208bde..0c9cc3e 100644 --- a/Makefile +++ b/Makefile @@ -313,8 +313,8 @@ DOCS=3D endif =20 SUBDIR_MAKEFLAGS=3D$(if $(V),,--no-print-directory --quiet) BUILD_DIR=3D$(= BUILD_DIR) -SUBDIR_DEVICES_MAK=3D$(patsubst %, %/config-devices.mak, $(TARGET_DIRS)) -SUBDIR_DEVICES_MAK_DEP=3D$(patsubst %, %-config-devices.mak.d, $(TARGET_DI= RS)) +SUBDIR_DEVICES_MAK=3D$(patsubst %, %/config-devices.mak, $(filter %-softmm= u, $(TARGET_DIRS))) +SUBDIR_DEVICES_MAK_DEP=3D$(patsubst %, %.d, $(SUBDIR_DEVICES_MAK)) =20 ifeq ($(SUBDIR_DEVICES_MAK),) config-all-devices.mak: @@ -329,9 +329,25 @@ endif =20 -include $(SUBDIR_DEVICES_MAK_DEP) =20 -%/config-devices.mak: default-configs/%.mak $(SRC_PATH)/scripts/make_devic= e_config.sh - $(call quiet-command, \ - $(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $< $*-confi= g-devices.mak.d $@ > $@.tmp,"GEN","$@.tmp") +# This has to be kept in sync with Kconfig.host. +MINIKCONF_ARGS =3D \ + $@ $*-config.devices.mak.d $< $(MINIKCONF_INPUTS) \ + CONFIG_KVM=3D$(CONFIG_KVM) \ + CONFIG_SPICE=3D$(CONFIG_SPICE) \ + CONFIG_IVSHMEM=3D$(CONFIG_IVSHMEM) \ + CONFIG_TPM=3D$(CONFIG_TPM) \ + CONFIG_XEN=3D$(CONFIG_XEN) \ + CONFIG_OPENGL=3D$(CONFIG_OPENGL) \ + CONFIG_X11=3D$(CONFIG_X11) \ + CONFIG_VHOST_USER=3D$(CONFIG_VHOST_USER) \ + CONFIG_VIRTFS=3D$(CONFIG_VIRTFS) \ + CONFIG_LINUX=3D$(CONFIG_LINUX) + +MINIKCONF_INPUTS =3D $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig +MINIKCONF =3D $(PYTHON) $(SRC_PATH)/scripts/minikconf.py \ + +$(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak $(MINIK= CONF_INPUTS) $(BUILD_DIR)/config-host.mak + $(call quiet-command, $(MINIKCONF) $(MINIKCONF_ARGS) > $@.tmp, "GEN", "$@= .tmp") $(call quiet-command, if test -f $@; then \ if cmp -s $@.old $@; then \ mv $@.tmp $@; \ diff --git a/Makefile.target b/Makefile.target index 3b79e70..ec72733 100644 --- a/Makefile.target +++ b/Makefile.target @@ -4,9 +4,12 @@ BUILD_DIR?=3D$(CURDIR)/.. =20 include ../config-host.mak include config-target.mak -include config-devices.mak include $(SRC_PATH)/rules.mak =20 +ifdef CONFIG_SOFTMMU +include config-devices.mak +endif + $(call set-vpath, $(SRC_PATH):$(BUILD_DIR)) ifdef CONFIG_LINUX QEMU_CFLAGS +=3D -I../linux-headers @@ -201,7 +204,9 @@ all-obj-$(CONFIG_SOFTMMU) +=3D $(crypto-obj-y) all-obj-$(CONFIG_SOFTMMU) +=3D $(io-obj-y) all-obj-$(CONFIG_SOFTMMU) +=3D $(slirp-obj-y) =20 +ifdef CONFIG_SOFTMMU $(QEMU_PROG_BUILD): config-devices.mak +endif =20 COMMON_LDADDS =3D ../libqemuutil.a =20 diff --git a/configure b/configure index cefeb8f..3cc6a94 100755 --- a/configure +++ b/configure @@ -7427,12 +7427,18 @@ fi =20 if supported_xen_target $target; then echo "CONFIG_XEN=3Dy" >> $config_target_mak + echo "$target/config-devices.mak: CONFIG_XEN=3Dy" >> $config_host_mak if test "$xen_pci_passthrough" =3D yes; then echo "CONFIG_XEN_PCI_PASSTHROUGH=3Dy" >> "$config_target_mak" fi +else + echo "$target/config-devices.mak: CONFIG_XEN=3Dn" >> $config_host_mak fi if supported_kvm_target $target; then echo "CONFIG_KVM=3Dy" >> $config_target_mak + echo "$target/config-devices.mak: CONFIG_KVM=3Dy" >> $config_host_mak +else + echo "$target/config-devices.mak: CONFIG_KVM=3Dn" >> $config_host_mak fi if supported_hax_target $target; then echo "CONFIG_HAX=3Dy" >> $config_target_mak diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index bd6943b..797bfa5 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -51,7 +51,6 @@ CONFIG_ARM_V7M=3Dy CONFIG_NETDUINO2=3Dy =20 CONFIG_ARM_GIC=3Dy -CONFIG_ARM_GIC_KVM=3D$(CONFIG_KVM) CONFIG_ARM_TIMER=3Dy CONFIG_ARM_MPTIMER=3Dy CONFIG_A9_GTIMER=3Dy @@ -126,8 +125,6 @@ CONFIG_VERSATILE_PCI=3Dy CONFIG_VERSATILE_I2C=3Dy =20 CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy -CONFIG_VFIO=3D$(CONFIG_LINUX) -CONFIG_VFIO_PLATFORM=3Dy CONFIG_VFIO_XGMAC=3Dy CONFIG_VFIO_AMD_XGBE=3Dy =20 diff --git a/default-configs/hyperv.mak b/default-configs/hyperv.mak index 5d0d9fd..bc38061 100644 --- a/default-configs/hyperv.mak +++ b/default-configs/hyperv.mak @@ -1,2 +1 @@ -CONFIG_HYPERV=3D$(CONFIG_KVM) CONFIG_HYPERV_TESTDEV=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 15b6287..412c8c5 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -4,7 +4,6 @@ include pci.mak include sound.mak include usb.mak include hyperv.mak -CONFIG_QXL=3D$(CONFIG_SPICE) CONFIG_VGA_ISA=3Dy CONFIG_VGA_CIRRUS=3Dy CONFIG_VMWARE_VGA=3Dy @@ -37,8 +36,6 @@ CONFIG_HPET=3Dy CONFIG_APPLESMC=3Dy CONFIG_I8259=3Dy CONFIG_PFLASH_CFI01=3Dy -CONFIG_TPM_TIS=3D$(CONFIG_TPM) -CONFIG_TPM_CRB=3D$(CONFIG_TPM) CONFIG_MC146818RTC=3Dy CONFIG_PCI_PIIX=3Dy CONFIG_WDT_IB700=3Dy @@ -66,9 +63,9 @@ CONFIG_ACPI_SMBUS=3Dy CONFIG_SMBUS_EEPROM=3Dy CONFIG_FW_CFG_DMA=3Dy CONFIG_I2C=3Dy -CONFIG_SEV=3D$(CONFIG_KVM) CONFIG_VTD=3Dy CONFIG_AMD_IOMMU=3Dy CONFIG_PAM=3Dy +CONFIG_PC=3Dy CONFIG_I440FX=3Dy CONFIG_Q35=3Dy diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmm= u.mak index 4049b23..ef0f4ba 100644 --- a/default-configs/lm32-softmmu.mak +++ b/default-configs/lm32-softmmu.mak @@ -2,7 +2,6 @@ =20 CONFIG_LM32=3Dy CONFIG_MILKYMIST=3Dy -CONFIG_MILKYMIST_TMU2=3D$(call land,$(CONFIG_X11),$(CONFIG_OPENGL)) CONFIG_FRAMEBUFFER=3Dy CONFIG_PTIMER=3Dy CONFIG_PFLASH_CFI01=3Dy diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 0552190..ac01909 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -45,8 +45,6 @@ CONFIG_EDU=3Dy CONFIG_VGA=3Dy CONFIG_VGA_PCI=3Dy CONFIG_BOCHS_DISPLAY=3Dy -CONFIG_IVSHMEM_DEVICE=3D$(CONFIG_IVSHMEM) CONFIG_ROCKER=3Dy -CONFIG_VFIO=3D$(CONFIG_LINUX) CONFIG_VFIO_PCI=3Dy CONFIG_EDID=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 52acb7c..90118cb 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -18,7 +18,6 @@ CONFIG_I8259=3Dy CONFIG_XILINX=3Dy CONFIG_XILINX_ETHLITE=3Dy CONFIG_E500=3Dy -CONFIG_OPENPIC_KVM=3D$(call land,$(CONFIG_E500),$(CONFIG_KVM)) CONFIG_PLATFORM_BUS=3Dy CONFIG_ETSEC=3Dy CONFIG_PPC405=3Dy diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-soft= mmu.mak index 7f34ad0..a0a9151 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -13,11 +13,6 @@ CONFIG_ISA_IPMI_BT=3Dy # For pSeries CONFIG_PSERIES=3Dy CONFIG_VIRTIO_VGA=3Dy -CONFIG_XICS=3D$(CONFIG_PSERIES) -CONFIG_XICS_SPAPR=3D$(CONFIG_PSERIES) -CONFIG_XICS_KVM=3D$(call land,$(CONFIG_PSERIES),$(CONFIG_KVM)) -CONFIG_XIVE=3D$(CONFIG_PSERIES) -CONFIG_XIVE_SPAPR=3D$(CONFIG_PSERIES) CONFIG_MEM_DEVICE=3Dy CONFIG_DIMM=3Dy CONFIG_SPAPR_RNG=3Dy diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-soft= mmu.mak index 6f2c6ce..2794ffb 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -1,12 +1,10 @@ CONFIG_PCI=3Dy -CONFIG_VIRTIO_PCI=3D$(CONFIG_PCI) +CONFIG_VIRTIO_PCI=3Dy include virtio.mak CONFIG_SCLPCONSOLE=3Dy CONFIG_TERMINAL3270=3Dy CONFIG_S390_FLIC=3Dy -CONFIG_S390_FLIC_KVM=3D$(CONFIG_KVM) CONFIG_WDT_DIAG288=3Dy CONFIG_S390_CCW_VIRTIO=3Dy -CONFIG_VFIO=3D$(CONFIG_LINUX) CONFIG_VFIO_CCW=3Dy CONFIG_VFIO_AP=3Dy diff --git a/default-configs/virtio.mak b/default-configs/virtio.mak index 3abf68a..5a2930c 100644 --- a/default-configs/virtio.mak +++ b/default-configs/virtio.mak @@ -1,7 +1,4 @@ -CONFIG_VHOST_USER_SCSI=3D$(CONFIG_VHOST_USER) -CONFIG_VHOST_USER_BLK=3D$(CONFIG_VHOST_USER) CONFIG_VIRTIO=3Dy -CONFIG_VIRTIO_9P=3D$(CONFIG_VIRTFS) CONFIG_VIRTIO_BALLOON=3Dy CONFIG_VIRTIO_BLK=3Dy CONFIG_VIRTIO_CRYPTO=3Dy @@ -13,4 +10,3 @@ CONFIG_VIRTIO_RNG=3Dy CONFIG_SCSI=3Dy CONFIG_VIRTIO_SCSI=3Dy CONFIG_VIRTIO_SERIAL=3Dy -CONFIG_VIRTIO_INPUT_HOST=3D$(CONFIG_LINUX) diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig index a475099..8c5032c 100644 --- a/hw/9pfs/Kconfig +++ b/hw/9pfs/Kconfig @@ -1,2 +1,4 @@ config VIRTIO_9P bool + default y + depends on VIRTFS && VIRTIO diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index e4386ce..9eab67b 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -1,5 +1,6 @@ config ARM_VIRT bool + imply VFIO_PLATFORM =20 config DIGIC bool diff --git a/hw/block/Kconfig b/hw/block/Kconfig index 9d418bc..4a64d83 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -27,3 +27,6 @@ config VIRTIO_BLK =20 config VHOST_USER_BLK bool + # Only PCI devices are provided for now + default y if VIRTIO_PCI + depends on VHOST_USER && LINUX && VIRTIO diff --git a/hw/display/Kconfig b/hw/display/Kconfig index d5c022c..1149ea2 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -51,6 +51,8 @@ config FRAMEBUFFER =20 config MILKYMIST_TMU2 bool + default y + depends on OPENGL && X11 =20 config SM501 bool @@ -66,6 +68,7 @@ config VGA =20 config QXL bool + depends on SPICE && PCI =20 config VIRTIO_GPU bool diff --git a/hw/hyperv/Kconfig b/hw/hyperv/Kconfig index be724b7..632c3a6 100644 --- a/hw/hyperv/Kconfig +++ b/hw/hyperv/Kconfig @@ -1,5 +1,6 @@ config HYPERV bool + depends on KVM =20 config HYPERV_TESTDEV bool diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index c851e2b..93f8609 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -1,5 +1,13 @@ config SEV bool + depends on KVM + +config PC + bool + imply HYPERV + imply QXL + imply SEV + imply TPM_TIS =20 config I440FX bool diff --git a/hw/input/Kconfig b/hw/input/Kconfig index 91bae47..c729dcd 100644 --- a/hw/input/Kconfig +++ b/hw/input/Kconfig @@ -19,5 +19,10 @@ config TSC2005 config VIRTIO_INPUT bool =20 +config VIRTIO_INPUT_HOST + bool + default y + depends on LINUX + config TSC210X bool diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index 69adbd1..6eea14e 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -21,18 +21,28 @@ config APIC =20 config ARM_GIC_KVM bool + default y + depends on ARM_GIC && KVM =20 config OPENPIC_KVM bool + default y + depends on OPENPIC && KVM =20 config XICS bool + default y + depends on PSERIES =20 config XICS_SPAPR bool + default y + depends on PSERIES =20 config XICS_KVM bool + default y + depends on XICS && KVM =20 config ALLWINNER_A10_PIC bool @@ -42,6 +52,8 @@ config S390_FLIC =20 config S390_FLIC_KVM bool + default y + depends on S390_FLIC && KVM =20 config OMPIC bool diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index d512634..fc068ef 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -48,6 +48,8 @@ config MACIO =20 config IVSHMEM_DEVICE bool + default y + depends on PCI && LINUX && IVSHMEM =20 config ECCMEMCTL bool diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 6087454..1d5d72f 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -1,5 +1,6 @@ config PSERIES bool + select VFIO if LINUX =20 config SPAPR_RNG bool @@ -39,6 +40,10 @@ config VIRTEX =20 config XIVE bool + default y + depends on PSERIES =20 config XIVE_SPAPR bool + default y + depends on PSERIES diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig index eb78478..982537b 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -19,8 +19,16 @@ config ESP config ESP_PCI bool =20 +config SPAPR_VSCSI + bool + default y + depends on PSERIES + config VIRTIO_SCSI bool =20 config VHOST_USER_SCSI bool + # Only PCI devices are provided for now + default y if VIRTIO_PCI + depends on VHOST_USER && LINUX && VIRTIO diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig index 00511e2..10a30f8 100644 --- a/hw/tpm/Kconfig +++ b/hw/tpm/Kconfig @@ -1,5 +1,6 @@ config TPM_TIS bool + depends on TPM =20 config TPM_CRB bool diff --git a/hw/vfio/Kconfig b/hw/vfio/Kconfig index 3606967..0fdff10 100644 --- a/hw/vfio/Kconfig +++ b/hw/vfio/Kconfig @@ -1,14 +1,21 @@ config VFIO bool + depends on LINUX =20 config VFIO_PCI bool + select VFIO + depends on LINUX =20 config VFIO_CCW bool + select VFIO + depends on LINUX =20 config VFIO_PLATFORM bool + select VFIO + depends on LINUX =20 config VFIO_XGMAC bool @@ -18,3 +25,5 @@ config VFIO_AMD_XGBE =20 config VFIO_AP bool + select VFIO + depends on LINUX diff --git a/hw/xtensa/Kconfig b/hw/xtensa/Kconfig index 97543a9..dc8eaf6 100644 --- a/hw/xtensa/Kconfig +++ b/hw/xtensa/Kconfig @@ -1,5 +1,5 @@ config XTENSA_SIM bool =20 -config XTENSA_FPGA +config XTENSA_XTFPGA bool diff --git a/rules.mak b/rules.mak index 86e033d..62cf02e 100644 --- a/rules.mak +++ b/rules.mak @@ -144,7 +144,7 @@ cc-option =3D $(if $(shell $(CC) $1 $2 -S -o /dev/null = -xc /dev/null \ cc-c-option =3D $(if $(shell $(CC) $1 $2 -c -o /dev/null -xc /dev/null \ >/dev/null 2>&1 && echo OK), $2, $3) =20 -VPATH_SUFFIXES =3D %.c %.h %.S %.cc %.cpp %.m %.mak %.texi %.sh %.rc +VPATH_SUFFIXES =3D %.c %.h %.S %.cc %.cpp %.m %.mak %.texi %.sh %.rc Kconf= ig% set-vpath =3D $(if $1,$(foreach PATTERN,$(VPATH_SUFFIXES),$(eval vpath $(P= ATTERN) $1))) =20 # install-prog list, dir diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh deleted file mode 100644 index 354af31..0000000 --- a/scripts/make_device_config.sh +++ /dev/null @@ -1,30 +0,0 @@ -#! /bin/sh -# Writes a target device config file to stdout, from a default and from -# include directives therein. Also emits Makefile dependencies. -# -# Usage: make_device_config.sh SRC DEPFILE-NAME DEPFILE-TARGET > DEST - -src=3D$1 -dep=3D$2 -target=3D$3 -src_dir=3D$(dirname $src) -all_includes=3D - -process_includes () { - cat $1 | grep '^include' | \ - while read include file ; do - all_includes=3D"$all_includes $src_dir/$file" - process_includes $src_dir/$file - done -} - -f=3D$src -while [ -n "$f" ] ; do - f=3D$(cat $f | tr -d '\r' | awk '/^include / {printf "'$src_dir'/%s ", $= 2}') - [ $? =3D 0 ] || exit 1 - all_includes=3D"$all_includes $f" -done -process_includes $src - -cat $src $all_includes | grep -v '^include' -echo "$target: $all_includes" > $dep --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551726604294217.5022626091427; Mon, 4 Mar 2019 11:10:04 -0800 (PST) Received: from localhost ([127.0.0.1]:59333 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0syN-0001BJ-58 for importer@patchew.org; Mon, 04 Mar 2019 14:09:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45731) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCS-0001oS-FS for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCR-0003pM-CU for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:28 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:37677) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCR-0003nw-5Q for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:27 -0500 Received: by mail-wm1-x333.google.com with SMTP id x10so126551wmg.2 for ; Mon, 04 Mar 2019 10:20:27 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:25 -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=oZwdQDJy2dRtoO9mRDQbyY3aBbhsmouLW4NyoHWWLIM=; b=NosGhaI2Dkh/iGwrn7rF9a36WqCiIDuUMqeG+c8Fj1jwCPqik1kETlK80BBT4IczQN OQMR73HfnW47mfjqWH/iSrqwoXXgpybKmlN3s5aUOpgA2guHEV0I/q84LTa6hyvPAbn9 WWKQ3fQTLJJjLWG6iub76QpvUFxt1kK8vDizcd1zYKc42wtaBCOjL7O0lnZM43FZQNFt V641zzK4FCiFnbIl658qUQiBce7YJx68GbYklSJyFpUoMz2G7rV13yRcz7O6+HYcPE7n Xbf72nD2xuY8/dqWZfuD1cy2/JW8ZKCVrVnWkXyNe4qT0VtKTwT9C5KdiuQcJKVtc7mT f2ng== 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=oZwdQDJy2dRtoO9mRDQbyY3aBbhsmouLW4NyoHWWLIM=; b=amHRaCfTJYHePsBDs0AQG/4NC/suH0CRrTtmVdLQz36ktgvvlbSzEl7ZgTOdgxir12 uzzVj+YfLbEwUbiZSJp3xMVb6hmFzNWlvalXrT35XpevvscyrKMK1wuXAw1skoE3CTWF h8RJjFJ1X3awM58J8KMmHbQuv4nJ+Ess5wEeCCFAOU0+I8CKEjGRMfojNFEPKG0wqrhP 1ynOl403YY4niHnb9KlMru0KXg2g6PU443KH0Yus0Dc0/Y9xmW818IZll0sTGBXD2RJI uAfbxcsFpxl5JckNNprSVMdB+26eRUzIYbTPZY+iAfhANKVTG0rumndFHo17uNVwkAX0 8glQ== X-Gm-Message-State: APjAAAVRjlHgrUK1hdVRHpGz3wX+UXPtloArEHS9bQWI/sKhCVu+Z46p hvvR7AIpVQzxg+JN0MqnRiCkSPRh X-Google-Smtp-Source: APXvYqy8d8mXvkSttNPI5h5mtDRb2NYJLNQEUdu1ejsH7XUZMXezd4g9TLsu5uN328izIH+fwf1jeA== X-Received: by 2002:a1c:1a43:: with SMTP id a64mr266121wma.73.1551723625689; Mon, 04 Mar 2019 10:20:25 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:30 +0100 Message-Id: <1551723614-1823-11-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::333 Subject: [Qemu-devel] [PULL 10/54] minikconfig: implement allnoconfig and defconfig modes 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" Apart from defconfig (which is a no-op), allyesconfig/allnoconfig/randcondfig can be implemented simply by ignoring the RHS of assignments and "default" statements. The RHS is replaced respectively by "true", "false" or a random value. However, allyesconfig and randconfig do not quite work, because all the files for hw/ARCH/Kconfig are sourced and therefore you could end up enabling some ARM boards in x86 or things like that. This is left for future work, but I am leaving it in to help debugging minikconf itself. allnoconfig mode is tied to a new configure option, --without-default-devic= es. Signed-off-by: Paolo Bonzini --- Makefile | 1 + configure | 12 +++++++++++- scripts/minikconf.py | 39 ++++++++++++++++++++++++++++++++++----- 3 files changed, 46 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 0c9cc3e..b0293aa 100644 --- a/Makefile +++ b/Makefile @@ -331,6 +331,7 @@ endif =20 # This has to be kept in sync with Kconfig.host. MINIKCONF_ARGS =3D \ + $(CONFIG_MINIKCONF_MODE) \ $@ $*-config.devices.mak.d $< $(MINIKCONF_INPUTS) \ CONFIG_KVM=3D$(CONFIG_KVM) \ CONFIG_SPICE=3D$(CONFIG_SPICE) \ diff --git a/configure b/configure index 3cc6a94..0fdbab4 100755 --- a/configure +++ b/configure @@ -487,7 +487,7 @@ libxml2=3D"" docker=3D"no" debug_mutex=3D"no" libpmem=3D"" -libudev=3D"no" +default_devices=3D"yes" =20 # cross compilers defaults, can be overridden with --cross-cc-ARCH cross_cc_aarch64=3D"aarch64-linux-gnu-gcc" @@ -996,6 +996,10 @@ for opt do ;; --with-trace-file=3D*) trace_file=3D"$optarg" ;; + --with-default-devices) default_devices=3D"yes" + ;; + --without-default-devices) default_devices=3D"no" + ;; --enable-gprof) gprof=3D"yes" ;; --enable-gcov) gcov=3D"yes" @@ -6250,6 +6254,7 @@ echo "capstone $capstone" echo "docker $docker" echo "libpmem support $libpmem" echo "libudev $libudev" +echo "default devices $default_devices" =20 if test "$supported_cpu" =3D "no"; then echo @@ -6311,6 +6316,11 @@ echo "GIT_UPDATE=3D$git_update" >> $config_host_mak =20 echo "ARCH=3D$ARCH" >> $config_host_mak =20 +if test "$default_devices" =3D "yes" ; then + echo "CONFIG_MINIKCONF_MODE=3D--defconfig" >> $config_host_mak +else + echo "CONFIG_MINIKCONF_MODE=3D--allnoconfig" >> $config_host_mak +fi if test "$debug_tcg" =3D "yes" ; then echo "CONFIG_DEBUG_TCG=3Dy" >> $config_host_mak fi diff --git a/scripts/minikconf.py b/scripts/minikconf.py index 6bedc57..5421db0 100644 --- a/scripts/minikconf.py +++ b/scripts/minikconf.py @@ -14,9 +14,11 @@ from __future__ import print_function import os import sys import re +import random =20 __all__ =3D [ 'KconfigDataError', 'KconfigParserError', - 'KconfigData', 'KconfigParser' ] + 'KconfigData', 'KconfigParser' , + 'defconfig', 'allyesconfig', 'allnoconfig', 'randconfig' ] =20 def debug_print(*args): #print('# ' + (' '.join(str(x) for x in args))) @@ -39,6 +41,11 @@ class KconfigDataError(Exception): def __str__(self): return self.msg =20 +allyesconfig =3D lambda x: True +allnoconfig =3D lambda x: False +defconfig =3D lambda x: x +randconfig =3D lambda x: random.randint(0, 1) =3D=3D 1 + class KconfigData: class Expr: def __and__(self, rhs): @@ -192,7 +199,8 @@ class KconfigData: if self.cond.evaluate(): self.dest.set_value(True, self) =20 - def __init__(self): + def __init__(self, value_mangler=3Ddefconfig): + self.value_mangler =3D value_mangler self.previously_included =3D [] self.incl_info =3D None self.defined_vars =3D set() @@ -272,6 +280,7 @@ class KconfigData: self.clauses.append(KconfigData.AssignmentClause(var, val)) =20 def do_default(self, var, val, cond=3DNone): + val =3D self.value_mangler(val) self.clauses.append(KconfigData.DefaultClause(var, val, cond)) =20 def do_depends_on(self, var, expr): @@ -328,9 +337,10 @@ class KconfigParserError(Exception): return "%s: %s" % (self.loc, self.msg) =20 class KconfigParser: + @classmethod - def parse(self, fp): - data =3D KconfigData() + def parse(self, fp, mode=3DNone): + data =3D KconfigData(mode or KconfigParser.defconfig) parser =3D KconfigParser(data) parser.parse_file(fp) return data @@ -653,11 +663,30 @@ class KconfigParser: =20 if __name__ =3D=3D '__main__': argv =3D sys.argv + mode =3D defconfig + if len(sys.argv) > 1: + if argv[1] =3D=3D '--defconfig': + del argv[1] + elif argv[1] =3D=3D '--randconfig': + random.seed() + mode =3D randconfig + del argv[1] + elif argv[1] =3D=3D '--allyesconfig': + mode =3D allyesconfig + del argv[1] + elif argv[1] =3D=3D '--allnoconfig': + mode =3D allnoconfig + del argv[1] + if len(argv) =3D=3D 1: print ("%s: at least one argument is required" % argv[0], file=3Ds= ys.stderr) sys.exit(1) =20 - data =3D KconfigData() + if argv[1].startswith('-'): + print ("%s: invalid option %s" % (argv[0], argv[1]), file=3Dsys.st= derr) + sys.exit(1) + + data =3D KconfigData(mode) parser =3D KconfigParser(data) for arg in argv[3:]: m =3D re.match(r'^(CONFIG_[A-Z0-9_]+)=3D([yn]?)$', arg) --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551728066720256.206633400649; Mon, 4 Mar 2019 11:34:26 -0800 (PST) Received: from localhost ([127.0.0.1]:59697 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tM1-0004vL-9w for importer@patchew.org; Mon, 04 Mar 2019 14:34:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCU-0001oy-DM for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCS-0003qY-5p for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:29 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:56188) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCR-0003p1-Mb for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:27 -0500 Received: by mail-wm1-x332.google.com with SMTP id q187so115964wme.5 for ; Mon, 04 Mar 2019 10:20:27 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:25 -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=DJzr1h8T6kz1tVDPY6iOwYzXqvfqfn6mIo9R41kTp7U=; b=Fp1UEOvYl7KtB85CJUEPFI6ikQUH8zYKWG4jPNCE9SLDiWP7RuzYitPtBeo4YeBq97 ylILfy870VewuptJv1xSaEQlYkLI2NIncfLoGKTaL62FdpRMh9DmMWk3wCcKhFwMgU7F vg+mdt/skeuhqwUQPppEGI1e26seZQX9JL/CQiiXoA/2AFVRgGvMrttNBR7wBPKtcWdi NPij3fgnG4LGXCTHzSuxs8MkzSsqiSGrtSTlJjafusLoTNNFfjDpexHUB52Nyp0pQ7eG mIFJioQPuBCORz9HNHi09eRYYLe3BVfM/jF116yK9SnAp87oktQyJev0krYzvTpPl6Am vaRg== 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=DJzr1h8T6kz1tVDPY6iOwYzXqvfqfn6mIo9R41kTp7U=; b=De4dIvvkJ9D0OUCJTbi/ppa0ttBjA/RcdNfW1kWEqveDOb5W42XVqGx11/9xSF1yfA G0xKzfKBLbm3S5YZzI4YhBxK7yLHlWxjXFR5BrxoGjVpJwa4KIW9tLHxZR2OMM50T2VC 5sr4JCsXHzggXxRh6jgwJosHNQWI2HVE99Ql4phvZE2Vxp/jTj9tfw4WXRlBeHvYhHFh m+6MvFJ+P3cKonI1xKMILDxIBFB+zKXW2LTKg1AJ1j5EKkvFptKAm+rd2JV/HZBsK84b +8D3uWcIhNDM2MBHAwBpGpyBmr0q5lzZ5c1klptgJNpp3a0X3efIBIxB57q9eOEQ3k6O hssw== X-Gm-Message-State: APjAAAUAKytxyEIrqBrWwKldurm1P6jsp7ktl2IncQc1gytENeK9vk01 t+l6csbTl64SdiEMs+3uDtsrLZ3T X-Google-Smtp-Source: APXvYqzCfvht/4OXYKP71oWzdLGP+LKj4x6ZZwYTp1eqB2OjSHqbv73eX/Zms+3vPp5mXU7rCQdiQQ== X-Received: by 2002:a1c:2885:: with SMTP id o127mr265783wmo.135.1551723626426; Mon, 04 Mar 2019 10:20:26 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:31 +0100 Message-Id: <1551723614-1823-12-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::332 Subject: [Qemu-devel] [PULL 11/54] kconfig: introduce CONFIG_TEST_DEVICES 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" Devices that are mostly used for testing purposes (for example in endianness-test) will be moved under a new symbol CONFIG_TEST_DEVICES that can be disabled in the default-configs file. This makes it easier to drop this code from QEMU if desirable. Signed-off-by: Paolo Bonzini --- default-configs/alpha-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 1 + default-configs/mips-softmmu-common.mak | 1 + default-configs/ppc-softmmu.mak | 1 + default-configs/sh4-softmmu.mak | 1 + default-configs/sh4eb-softmmu.mak | 1 + default-configs/sparc64-softmmu.mak | 1 + hw/Kconfig | 3 +++ 8 files changed, 10 insertions(+) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index 49cb7ce..74501ca 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -18,5 +18,6 @@ CONFIG_IDE_CMD646=3Dy CONFIG_I8259=3Dy CONFIG_MC146818RTC=3Dy CONFIG_ISA_TESTDEV=3Dy +CONFIG_TEST_DEVICES=3Dy CONFIG_SMC37C669=3Dy CONFIG_DP264=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 412c8c5..1d43fb2 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -4,6 +4,7 @@ include pci.mak include sound.mak include usb.mak include hyperv.mak +CONFIG_TEST_DEVICES=3Dy CONFIG_VGA_ISA=3Dy CONFIG_VGA_CIRRUS=3Dy CONFIG_VMWARE_VGA=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index ded7498..331bdc5 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -41,3 +41,4 @@ CONFIG_MALTA=3Dy CONFIG_MIPSSIM=3Dy CONFIG_ACPI_SMBUS=3Dy CONFIG_SMBUS_EEPROM=3Dy +CONFIG_TEST_DEVICES=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 90118cb..a58d81a 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -3,6 +3,7 @@ include pci.mak include sound.mak include usb.mak +CONFIG_TEST_DEVICES=3Dy =20 # For embedded PPCs: CONFIG_PPC4XX=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 1fdb009..38c7290 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -12,6 +12,7 @@ CONFIG_SM501=3Dy CONFIG_I2C=3Dy CONFIG_DDC=3Dy CONFIG_ISA_TESTDEV=3Dy +CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy CONFIG_I8259=3Dy CONFIG_I8254=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index 3b550a5..c966cca 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -12,6 +12,7 @@ CONFIG_SM501=3Dy CONFIG_I2C=3Dy CONFIG_DDC=3Dy CONFIG_ISA_TESTDEV=3Dy +CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy CONFIG_I8259=3Dy CONFIG_I8254=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index 1fae488..415d4e0 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -16,6 +16,7 @@ CONFIG_SIMBA=3Dy CONFIG_SUNHME=3Dy CONFIG_MC146818RTC=3Dy CONFIG_ISA_TESTDEV=3Dy +CONFIG_TEST_DEVICES=3Dy CONFIG_SUN4V_RTC=3Dy CONFIG_SUN4U=3Dy CONFIG_NIAGARA=3Dy diff --git a/hw/Kconfig b/hw/Kconfig index c4f1547..f902c8f 100644 --- a/hw/Kconfig +++ b/hw/Kconfig @@ -61,6 +61,9 @@ source unicore32/Kconfig source xtensa/Kconfig =20 # Symbols used by multiple targets +config TEST_DEVICES + bool + config XILINX bool =20 --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551728322867288.7307659671385; Mon, 4 Mar 2019 11:38:42 -0800 (PST) Received: from localhost ([127.0.0.1]:59766 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tQ7-00008u-PI for importer@patchew.org; Mon, 04 Mar 2019 14:38:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45788) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCU-0001p1-DS for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCS-0003sX-W5 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:29 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:38939) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCS-0003qQ-MU for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:28 -0500 Received: by mail-wm1-x32f.google.com with SMTP id z84so116540wmg.4 for ; Mon, 04 Mar 2019 10:20:28 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:26 -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=7WDM50PNostX9ZUDu+wTPWUAQMJCGaD7KIt6Trmmc9c=; b=cs8GQU9ivmQ/D0SLQsChX63beJKMNUcbUIg7tjvcuidspSpCGAd0PU1oUwjvrgtiTY /pCaMZn0SzZ/SQxQoUISM6APPwzC3l9cA+RrVzttIvywK6x/m1BKxkj6dA8vPlEbD2/Y o/o6du1GawtkS8pWv/KdjMV4hrBB8VyW/+ZaZ3qESRtOi3CtiLQyDDjwl9opGzdSx7DS HY/2To292/L1jI7id87cmIi4J1CuhQMNCSvP13d8d5MK2MoxiWEzFsQOMAZJhZxr1uTo vHOPOSXxYwE9d04edaBvpQD5iT76s6mbrDDJkh88fNoP7pM7scHweI/CXijBVJPYgXk7 CBpw== 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=7WDM50PNostX9ZUDu+wTPWUAQMJCGaD7KIt6Trmmc9c=; b=HJvb9HVhCZsjLCwvX7Hg3SJwvpz9+iK67ScI8GwlDHcAPUJUeJpMIEDvLrpfiwD5xb 9qrVr90EZUGB8/zRk3uYL2TO2g9mCmlbQVIcQp4gx9R8GpzJY3vzI7r2a3dpOrQMIN70 Mpw7bkgUmgyuSpCaoFicfmy4vXKtEhS3MK/BwO8gNa+hVWx40NUHtFSmKVpsvLIjASrw frQ74r1/yzNLfk0hmLLxlGzCbXdmcMkbnTD6+DDrXldB4dTH1tz+ub8xx36MXzHB8LiH JvOf5wnwQ9E11qO6JCfLHAS8CN/CMBtSvFRqvD0fWgofpTdel0kR1+D4g7SbrTfql8Ms KEsA== X-Gm-Message-State: APjAAAVT7hkZUBApplTMYLzm7I5Ux4lLVHSbcYdQlUsetkJCtOxzfFYs tiPQaXp4Lxc7Gm//NNOG4wO5d61r X-Google-Smtp-Source: APXvYqwDTWQCd9mgmDIHN54fjjZCU/rqJO/I34BRmNXVgurYbdgM5cxxZ3eeHS8F99OKkaTWLZJvnw== X-Received: by 2002:a1c:4844:: with SMTP id v65mr303549wma.66.1551723627384; Mon, 04 Mar 2019 10:20:27 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:32 +0100 Message-Id: <1551723614-1823-13-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::32f Subject: [Qemu-devel] [PULL 12/54] ide: express 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" Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-29-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/alpha-softmmu.mak | 2 -- default-configs/hppa-softmmu.mak | 1 - default-configs/pci.mak | 3 --- default-configs/sparc64-softmmu.mak | 1 - hw/ide/Kconfig | 15 +++++++++++++++ 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index 74501ca..3fd656e 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -11,8 +11,6 @@ CONFIG_PARALLEL=3Dy CONFIG_FDC=3Dy CONFIG_PCKBD=3Dy CONFIG_VGA_CIRRUS=3Dy -CONFIG_IDE_CORE=3Dy -CONFIG_IDE_QDEV=3Dy CONFIG_VMWARE_VGA=3Dy CONFIG_IDE_CMD646=3Dy CONFIG_I8259=3Dy diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmm= u.mak index b594a6d..e0a6cdc 100644 --- a/default-configs/hppa-softmmu.mak +++ b/default-configs/hppa-softmmu.mak @@ -5,7 +5,6 @@ CONFIG_SERIAL_ISA=3Dy CONFIG_ISA_BUS=3Dy CONFIG_I8259=3Dy CONFIG_E1000_PCI=3Dy -CONFIG_IDE_ISA=3Dy CONFIG_IDE_CMD646=3Dy # CONFIG_IDE_MMIO=3Dy CONFIG_VIRTIO_VGA=3Dy diff --git a/default-configs/pci.mak b/default-configs/pci.mak index ac01909..fc5edfc 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -23,9 +23,6 @@ CONFIG_MPTSAS_SCSI_PCI=3Dy CONFIG_RTL8139_PCI=3Dy CONFIG_E1000_PCI=3Dy CONFIG_E1000E_PCI_EXPRESS=3Dy -CONFIG_IDE_CORE=3Dy -CONFIG_IDE_QDEV=3Dy -CONFIG_IDE_PCI=3Dy CONFIG_AHCI=3Dy CONFIG_ESP=3Dy CONFIG_ESP_PCI=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index 415d4e0..b17513b 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -9,7 +9,6 @@ CONFIG_SERIAL_ISA=3Dy CONFIG_PARALLEL=3Dy CONFIG_PCKBD=3Dy CONFIG_FDC=3Dy -CONFIG_IDE_ISA=3Dy CONFIG_IDE_CMD646=3Dy CONFIG_PCI_SABRE=3Dy CONFIG_SIMBA=3Dy diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig index 5ec4495..fe27705 100644 --- a/hw/ide/Kconfig +++ b/hw/ide/Kconfig @@ -3,33 +3,48 @@ config IDE_CORE =20 config IDE_QDEV bool + select IDE_CORE =20 config IDE_PCI bool + select IDE_CORE =20 config IDE_ISA bool + select IDE_QDEV =20 config IDE_PIIX bool + select IDE_PCI + select IDE_QDEV =20 config IDE_CMD646 bool + select IDE_PCI + select IDE_QDEV =20 config IDE_MACIO bool + select IDE_QDEV =20 config IDE_MMIO bool + select IDE_QDEV =20 config IDE_VIA bool + select IDE_PCI + select IDE_QDEV =20 config MICRODRIVE bool + select IDE_QDEV =20 config AHCI bool + select IDE_QDEV =20 config IDE_SII3112 bool + select IDE_PCI + select IDE_QDEV --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551726766070494.5068358870716; Mon, 4 Mar 2019 11:12:46 -0800 (PST) Received: from localhost ([127.0.0.1]:59392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0t0z-0003jW-6p for importer@patchew.org; Mon, 04 Mar 2019 14:12:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45812) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCV-0001rH-4O for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCU-0003uj-1g for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:31 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:51876) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCT-0003sw-PC for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:29 -0500 Received: by mail-wm1-x331.google.com with SMTP id n19so140420wmi.1 for ; Mon, 04 Mar 2019 10:20:29 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:27 -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=v7s6MY5AITZB0rextK+gQrnMM092HQg/Q6l9JaSmEiA=; b=eUpVrdikIIs3UDeG4LIuzEMrGqGw+/4r8jlFt2JqPbk4Ffbel+9i8TtdmDbdWotFqj QKqaBmeALX3FjsCekRCKMJwiBrBh3lqWY1WfdYsSnRmKTM00bV7E4Ma5s4RvSv91fGCd Rr4Bn6cc6Xe33lZVv/Vg/K2XZKEfSi1Hu2HuXqvVvbwKzvedMAoHabJWCKUvz99yQK8/ bM2yu/41Qf3kPlZuLkNd6uPiyzJTTPDtrDkv4daVdsGUmc90lgbA2Bhz97MgBu0Jxrsj L8QX8/pFhVHnmFhsttt5rGQBd5UT2GdFR8lmM+6/Ks7tOaSbjX1PybsveyRr9b922hJs UZVQ== 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=v7s6MY5AITZB0rextK+gQrnMM092HQg/Q6l9JaSmEiA=; b=DlG0TK817zrLr8sxy6pJoNXHBHYEAQ6TFWYWEVz7ciAtYamjwnC6vMd5SlZRHuT1rr zEXduUjkjHrq6b/t9D6T0yV2mN0MT7ESp1f922kB0TfJFG7EF83fjknGXcC7IPj8/CZt B2K3mRmEO0XkQCj3Qi5NojCgXqcdUF5xYaz6Bs+ghzzRUk2l+Xbu5JJRySS48oaS82Zc 0Nh8nOSVOujeWgyL2VYQGHVMUD9kUe5urwNFWiArOb4ViklA0bG0mowWHnwC5w0cAL+Y 6h1HSHycbVuHmioQr4uQY23AmIf59PQpT4jWKN80yvKlpNRTyaAwLipVnssarI2fxlXe WAMg== X-Gm-Message-State: APjAAAUy2Lhk0f928QxvOBSM3bPYrM1t682a/hhjkuNLNcgnv2WCAwS1 7BWT4Etc4qEY4fbFxhX5hb+2rs4n X-Google-Smtp-Source: APXvYqyejCIeZkikHrGoszfGUixqz+d0DejWmThmYwsAi5GFfT9VUPZX0IRFY43PIQqhSYaxhIWSGw== X-Received: by 2002:a1c:a74a:: with SMTP id q71mr21033wme.45.1551723628408; Mon, 04 Mar 2019 10:20:28 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:33 +0100 Message-Id: <1551723614-1823-14-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::331 Subject: [Qemu-devel] [PULL 13/54] hw/pci/Makefile.objs: make pcie configurable 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, "Michael S. Tsirkin" 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 Make pcie splited from pci and make it configurable. Signed-off-by: Yang Zhong Cc: Michael S. Tsirkin Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-30-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 1 + default-configs/mips64el-softmmu.mak | 1 + default-configs/ppc-softmmu.mak | 1 + default-configs/riscv32-softmmu.mak | 1 + default-configs/riscv64-softmmu.mak | 1 + hw/pci/Kconfig | 4 ++++ hw/pci/Makefile.objs | 9 +++++++-- 8 files changed, 17 insertions(+), 2 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 797bfa5..b430be5 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -124,6 +124,7 @@ CONFIG_VERSATILE=3Dy CONFIG_VERSATILE_PCI=3Dy CONFIG_VERSATILE_I2C=3Dy =20 +CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy CONFIG_VFIO_XGMAC=3Dy CONFIG_VFIO_AMD_XGBE=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 1d43fb2..256443e 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -45,6 +45,7 @@ CONFIG_ISA_TESTDEV=3Dy CONFIG_VMPORT=3Dy CONFIG_SGA=3Dy CONFIG_LPC_ICH9=3Dy +CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_Q35=3Dy CONFIG_APIC=3Dy CONFIG_IOAPIC=3Dy diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64e= l-softmmu.mak index 9eb1208..c6ad4da 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -12,4 +12,5 @@ CONFIG_JAZZ_LED=3Dy CONFIG_VT82C686=3Dy CONFIG_MIPS_BOSTON=3Dy CONFIG_FITLOADER=3Dy +CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_XILINX=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index a58d81a..5c576fe 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -24,6 +24,7 @@ CONFIG_ETSEC=3Dy CONFIG_PPC405=3Dy CONFIG_PPC440=3Dy CONFIG_VIRTEX=3Dy +CONFIG_PCI_EXPRESS=3Dy =20 # For Sam460ex CONFIG_SAM460EX=3Dy diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index 6533716..8c3a91a 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -8,6 +8,7 @@ CONFIG_VIRTIO_MMIO=3Dy =20 CONFIG_CADENCE=3Dy =20 +CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 CONFIG_VGA=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index 6533716..8c3a91a 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -8,6 +8,7 @@ CONFIG_VIRTIO_MMIO=3Dy =20 CONFIG_CADENCE=3Dy =20 +CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 CONFIG_VGA=3Dy diff --git a/hw/pci/Kconfig b/hw/pci/Kconfig index d3d2205..4ca2537 100644 --- a/hw/pci/Kconfig +++ b/hw/pci/Kconfig @@ -1,2 +1,6 @@ config PCI bool + +config PCI_EXPRESS + bool + select PCI diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs index 9f905e6..c78f2fb 100644 --- a/hw/pci/Makefile.objs +++ b/hw/pci/Makefile.objs @@ -2,8 +2,13 @@ common-obj-$(CONFIG_PCI) +=3D pci.o pci_bridge.o common-obj-$(CONFIG_PCI) +=3D msix.o msi.o common-obj-$(CONFIG_PCI) +=3D shpc.o common-obj-$(CONFIG_PCI) +=3D slotid_cap.o -common-obj-$(CONFIG_PCI) +=3D pci_host.o pcie_host.o -common-obj-$(CONFIG_PCI) +=3D pcie.o pcie_aer.o pcie_port.o +common-obj-$(CONFIG_PCI) +=3D pci_host.o + +# The functions in these modules can be used by devices too. Since we +# allow plugging PCIe devices into PCI buses, include them even if +# CONFIG_PCI_EXPRESS=3Dn. +common-obj-$(CONFIG_PCI) +=3D pcie.o pcie_aer.o +common-obj-$(CONFIG_PCI_EXPRESS) +=3D pcie_port.o pcie_host.o =20 common-obj-$(call lnot,$(CONFIG_PCI)) +=3D pci-stub.o common-obj-$(CONFIG_ALL) +=3D pci-stub.o --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551728484714908.1170456749151; Mon, 4 Mar 2019 11:41:24 -0800 (PST) Received: from localhost ([127.0.0.1]:59824 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tSj-0002Zm-Ke for importer@patchew.org; Mon, 04 Mar 2019 14:41:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45841) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCW-0001sv-Hs for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCV-0003y2-8W for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:32 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:33259) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCU-0003up-Uh for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:31 -0500 Received: by mail-wm1-x330.google.com with SMTP id c13so403563wmb.0 for ; Mon, 04 Mar 2019 10:20:30 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:28 -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=sC9bdwksV6J6txkuINEdgK3BHM/w8NYozEuNwkCArfc=; b=AraSa4VTIcaaNalsFdG9YlEQv4DsAy+FQWr5heguZFKM1PTlTReR25wCS1PSFYPl98 uRTc26ILIsCRi+jeDP0qxc7eK4ZF0ZEhGiWOrKY8Qspo9wn5ITD//38qtCuTgb5OkAzP jaByQs0bv261+sEFS9GO43TPw0MeBG47uikXwBzp/O5aG3D5cg5kbdml7NLSoLK/zj/J CCEKfBjlAMhMQUnPyBGdbvVGw8sEfubtEBClUVySam0NwBwOt2gQ6iOgUFAw4lCQh34W cvfBGmsAbE5KX/lFcg6/APTpxI7ioVkdTzMrc84qL9nRU7l0SQczPrybD5tQvEbtPhJK rcFg== 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=sC9bdwksV6J6txkuINEdgK3BHM/w8NYozEuNwkCArfc=; b=Bi65T+z9ldP0+inhCF3ESlLih2aRdKhgXo8uTYkNzZMyERZimgKrlDWtXy026vbv48 9ykUgTUslgA1WNMVxkiF0HMoWAuVetG4dhtYXK1b80gpZ09qV+yBSU+UOu+WWanuFAOW LROZ/1x+EOjQkJMdPVFUyKWSOA0FSBm4TsYgUB6si8HtxSxlssOjtMBq8IswhZsrbwVC 70Dzq4V+ytJoAd1TSZ8WCHecc0pB8cWSwxpxXvluj8Q7Khfuoy1bhgQMBfaIFGt0jB3n zvC4Mff9lHqPWHsxhMUx+pQLTkHIbE7SHOMNTIOLfgRDL1F6Fl1in0oEMfuA99xj+Ucv /USg== X-Gm-Message-State: APjAAAVVFQHb6yG04xV421HRtJNZa0N+VXEwqj9FyA7VFfSmbrsjTDki hQp+4PDL1Ttd4JYNrdFuCd1ZBjb4 X-Google-Smtp-Source: APXvYqxp9lyHAu7jfb9OrpJkViGndD7RHW4G/gEv+9q6QAT0m3GYSz60DmBW2FVOy8DZuIVZmRHt0g== X-Received: by 2002:a7b:cb8e:: with SMTP id m14mr265715wmi.64.1551723629302; Mon, 04 Mar 2019 10:20:29 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:34 +0100 Message-Id: <1551723614-1823-15-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::330 Subject: [Qemu-devel] [PULL 14/54] isa: express 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" Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-36-yang.zhong@intel.com> Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini --- default-configs/alpha-softmmu.mak | 1 - default-configs/i386-softmmu.mak | 9 --------- default-configs/mips-softmmu-common.mak | 1 - default-configs/ppc-softmmu.mak | 1 - default-configs/sh4-softmmu.mak | 1 - default-configs/sh4eb-softmmu.mak | 1 - default-configs/sparc64-softmmu.mak | 1 - hw/audio/Kconfig | 2 ++ hw/block/Kconfig | 2 ++ hw/char/Kconfig | 6 ++++++ hw/display/Kconfig | 3 +++ hw/dma/Kconfig | 1 + hw/i386/Kconfig | 1 + hw/ide/Kconfig | 1 + hw/input/Kconfig | 2 ++ hw/ipmi/Kconfig | 2 ++ hw/isa/Kconfig | 7 +++++++ hw/misc/Kconfig | 6 ++++++ hw/net/Kconfig | 4 ++++ hw/sparc64/Kconfig | 1 + hw/tpm/Kconfig | 2 +- hw/watchdog/Kconfig | 2 ++ 22 files changed, 41 insertions(+), 16 deletions(-) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index 3fd656e..8000a9a 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -15,7 +15,6 @@ CONFIG_VMWARE_VGA=3Dy CONFIG_IDE_CMD646=3Dy CONFIG_I8259=3Dy CONFIG_MC146818RTC=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_SMC37C669=3Dy CONFIG_DP264=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 256443e..c7e32ce 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -10,19 +10,12 @@ CONFIG_VGA_CIRRUS=3Dy CONFIG_VMWARE_VGA=3Dy CONFIG_VMXNET3_PCI=3Dy CONFIG_VIRTIO_VGA=3Dy -CONFIG_VMMOUSE=3Dy CONFIG_IPMI=3Dy CONFIG_IPMI_LOCAL=3Dy CONFIG_IPMI_EXTERN=3Dy CONFIG_ISA_IPMI_KCS=3Dy CONFIG_ISA_IPMI_BT=3Dy -CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy -CONFIG_PARALLEL=3Dy CONFIG_I8254=3Dy -CONFIG_PCSPK=3Dy -CONFIG_PCKBD=3Dy -CONFIG_FDC=3Dy CONFIG_ACPI=3Dy CONFIG_ACPI_X86=3Dy CONFIG_ACPI_X86_ICH=3Dy @@ -32,14 +25,12 @@ CONFIG_APM=3Dy CONFIG_I8257=3Dy CONFIG_IDE_ISA=3Dy CONFIG_IDE_PIIX=3Dy -CONFIG_NE2000_ISA=3Dy CONFIG_HPET=3Dy CONFIG_APPLESMC=3Dy CONFIG_I8259=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_MC146818RTC=3Dy CONFIG_PCI_PIIX=3Dy -CONFIG_WDT_IB700=3Dy CONFIG_ISA_DEBUG=3Dy CONFIG_ISA_TESTDEV=3Dy CONFIG_VMPORT=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index 331bdc5..cba8582 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -31,7 +31,6 @@ CONFIG_MIPSNET=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_I8259=3Dy CONFIG_MC146818RTC=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_EMPTY_SLOT=3Dy CONFIG_MIPS_CPS=3Dy CONFIG_MIPS_ITU=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 5c576fe..5ccdcb6 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -63,7 +63,6 @@ CONFIG_PREP=3Dy CONFIG_PREP_PCI=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_MC146818RTC=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_RS6000_MC=3Dy CONFIG_PARALLEL=3Dy CONFIG_I82374=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 38c7290..e406559 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -11,7 +11,6 @@ CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy CONFIG_I2C=3Dy CONFIG_DDC=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy CONFIG_I8259=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index c966cca..14dea69 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -11,7 +11,6 @@ CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy CONFIG_I2C=3Dy CONFIG_DDC=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy CONFIG_I8259=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index b17513b..1e519b3 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -14,7 +14,6 @@ CONFIG_PCI_SABRE=3Dy CONFIG_SIMBA=3Dy CONFIG_SUNHME=3Dy CONFIG_MC146818RTC=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_SUN4V_RTC=3Dy CONFIG_SUN4U=3Dy diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig index 207baee..45d3a6a 100644 --- a/hw/audio/Kconfig +++ b/hw/audio/Kconfig @@ -21,6 +21,8 @@ config HDA =20 config PCSPK bool + default y + depends on I8254 =20 config WM8750 bool diff --git a/hw/block/Kconfig b/hw/block/Kconfig index 4a64d83..aca8d11 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -1,5 +1,7 @@ config FDC bool + default y + depends on ISA_BUS =20 config SSI_M25P80 bool diff --git a/hw/char/Kconfig b/hw/char/Kconfig index 26c1324..fbb0a9b 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -3,6 +3,8 @@ config ESCC =20 config PARALLEL bool + default y + depends on ISA_BUS =20 config PL011 bool @@ -12,9 +14,13 @@ config SERIAL =20 config SERIAL_ISA bool + default y + depends on ISA_BUS + select SERIAL =20 config SERIAL_PCI bool + select SERIAL =20 config VIRTIO_SERIAL bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 1149ea2..bbd6dd9 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -33,9 +33,12 @@ config VGA_PCI =20 config VGA_ISA bool + depends on ISA_BUS + select VGA =20 config VGA_ISA_MM bool + select VGA =20 config VMWARE_VGA bool diff --git a/hw/dma/Kconfig b/hw/dma/Kconfig index b9ce1c5..751dec5 100644 --- a/hw/dma/Kconfig +++ b/hw/dma/Kconfig @@ -9,6 +9,7 @@ config PL330 =20 config I82374 bool + select I8257 =20 config I8257 bool diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 93f8609..0b3c8d9 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -14,6 +14,7 @@ config I440FX =20 config ISAPC bool + select ISA_BUS =20 config Q35 bool diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig index fe27705..88076a7 100644 --- a/hw/ide/Kconfig +++ b/hw/ide/Kconfig @@ -11,6 +11,7 @@ config IDE_PCI =20 config IDE_ISA bool + depends on ISA_BUS select IDE_QDEV =20 config IDE_PIIX diff --git a/hw/input/Kconfig b/hw/input/Kconfig index c729dcd..814f87f 100644 --- a/hw/input/Kconfig +++ b/hw/input/Kconfig @@ -6,6 +6,8 @@ config LM832X =20 config PCKBD bool + default y + depends on ISA_BUS =20 config PL050 bool diff --git a/hw/ipmi/Kconfig b/hw/ipmi/Kconfig index 68f8ba1..6a4f08f 100644 --- a/hw/ipmi/Kconfig +++ b/hw/ipmi/Kconfig @@ -9,6 +9,8 @@ config IPMI_EXTERN =20 config ISA_IPMI_KCS bool + depends on ISA_BUS =20 config ISA_IPMI_BT bool + depends on ISA_BUS diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index b59d074..af68af9 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -6,18 +6,25 @@ config APM =20 config I82378 bool + select ISA_BUS =20 config PC87312 bool + select ISA_BUS =20 config PIIX4 bool + select ISA_BUS =20 config VT82C686 bool + select ISA_BUS =20 config SMC37C669 bool + select ISA_BUS =20 config LPC_ICH9 bool + select ISA_BUS + select ACPI_X86_ICH diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index fc068ef..a1e4bd8 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -1,5 +1,6 @@ config APPLESMC bool + depends on ISA_BUS =20 config MAX111X bool @@ -12,12 +13,16 @@ config TMP421 =20 config ISA_DEBUG bool + depends on ISA_BUS =20 config SGA bool + depends on ISA_BUS =20 config ISA_TESTDEV bool + default y if TEST_DEVICES + depends on ISA_BUS =20 config PCI_TESTDEV bool @@ -89,6 +94,7 @@ config IOTKIT_SYSINFO =20 config PVPANIC bool + depends on ISA_BUS =20 config AUX bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index ad56fc0..f4b5ff2 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -33,6 +33,10 @@ config LAN9118 =20 config NE2000_ISA bool + default y + depends on ISA_BUS + depends on PCI # for NE2000State + select NE2000_PCI =20 config OPENCORES_ETH bool diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig index 8c13345..41f7295 100644 --- a/hw/sparc64/Kconfig +++ b/hw/sparc64/Kconfig @@ -1,5 +1,6 @@ config SUN4U bool + select ISA_BUS =20 config NIAGARA bool diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig index 10a30f8..e781995 100644 --- a/hw/tpm/Kconfig +++ b/hw/tpm/Kconfig @@ -1,6 +1,6 @@ config TPM_TIS bool - depends on TPM + depends on TPM && ISA_BUS =20 config TPM_CRB bool diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig index cd0244f..4bbd981 100644 --- a/hw/watchdog/Kconfig +++ b/hw/watchdog/Kconfig @@ -6,6 +6,8 @@ config WDT_IB6300ESB =20 config WDT_IB700 bool + default y + depends on ISA_BUS =20 config WDT_DIAG288 bool --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551727519521655.0320120345423; Mon, 4 Mar 2019 11:25:19 -0800 (PST) Received: from localhost ([127.0.0.1]:59558 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tD8-0005Vp-Tf for importer@patchew.org; Mon, 04 Mar 2019 14:25:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCY-0001vC-Lk for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCW-000400-HH for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:34 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:51869) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCW-0003yT-6D for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:32 -0500 Received: by mail-wm1-x329.google.com with SMTP id n19so140537wmi.1 for ; Mon, 04 Mar 2019 10:20:32 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:29 -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=pBuee7aaw+YRYEP3YtmyWObmim9fsj47g2eoR/5HkfA=; b=Tu8q3EyzshITPR/lPKLuDg6PE1Vh4vI1M1PE+SHnn87VNMQkxVbuKM4e+ES1RyyxHN BbM4XBBpSD/np2ik4C15igsyhElfrvchhE9TgkTyDNadihX4N+n+rMmLrN8k1Rp6kxwq /dKU+gh9qrHUf6z/sSM96t/4HQIQiGFIv0BEQOcGlRJjvpJoPF7kp8BWwFrtD2x/lMGl QqOXQxvtRA25mFFAJ8pIrXlVatmAss20huL4MhL3CbH2oDaCrVSt54GUUTmMF76asVkd r2Yb8t7LGQ95dpcO2jWgWigCHvzyQjZvL2cDHEqBxe/9QQUTU9f42WqXUNwi4dW6+kky V9yA== 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=pBuee7aaw+YRYEP3YtmyWObmim9fsj47g2eoR/5HkfA=; b=maLOLZhKVfa1Edohah01azkGsn78Kv7LYh+LKnZIYqKrHuF+UN4f51/Ooz8hVrg9ez L5H69F4Xkqc7kWF18uJnKFawgr1gn581H0rkjjNJYQrrGkEq7TNCFOp8QPqqoMNU1tWw TCR0lQSrrJqZ5B0NCTOxe448s7BDfaeXrRhkJt89fK/5c99oQyHYyiN7BLSZGoSAy+NH a7+dAOnlNQvWODQJxMmCZip09cTgahbwtCEfPhQuC/lTlsmxtRPbcf8FsskwUEkCd8oz 1tfcW2/KSe/+HpMBB1/B1L0ubC2J9YkaNi4rAkOSkAIgirkH3gD4d5WpZZQro3DHUg6j 8kQw== X-Gm-Message-State: APjAAAWwxEcfZ0FXK0z/40+Spv6ylvqceusC1Jom5+kvEkLG4gWYU7Mo rab6p0Lhj+8TSrZL3Ldib4d1Ol/9 X-Google-Smtp-Source: APXvYqxtG34wpuIt03sQBMnJpb7sbVAJjJBzu7/jHCHJtFHo53YfrvpnPmwhWZ7KymX6Xwzv0L5Cmg== X-Received: by 2002:a1c:7906:: with SMTP id l6mr253695wme.83.1551723630512; Mon, 04 Mar 2019 10:20:30 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:35 +0100 Message-Id: <1551723614-1823-16-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::329 Subject: [Qemu-devel] [PULL 15/54] build: convert pci.mak to 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, "Michael S. Tsirkin" 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" Instead of including the same list of devices for each target, set CONFIG_PCI to true, and make the devices default to present whenever PCI is available. However, s390x does not want all the PCI devices, so there is a separate symbol to enable them. Done mostly with the following script: while read i; do i=3D${i%=3Dy}; i=3D${i#CONFIG_} sed -i -e'/^config '$i'$/!b' -en \ -e'a\' -e' default y if PCI_DEVICES\' -e' depends on PCI'= \ `grep -lw $i hw/*/Kconfig` done < default-configs/pci.mak followed by replacing a few "depends on" clauses with "select" whenever the symbol is not really related to PCI. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Cc: Michael S. Tsirkin Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-31-yang.zhong@intel.com> Acked-by: Richard Henderson Signed-off-by: Paolo Bonzini --- default-configs/alpha-softmmu.mak | 3 ++- default-configs/arm-softmmu.mak | 7 ++++- default-configs/hppa-softmmu.mak | 5 +++- default-configs/i386-softmmu.mak | 5 ++-- default-configs/mips-softmmu-common.mak | 3 ++- default-configs/mips64el-softmmu.mak | 1 + default-configs/pci.mak | 47 -----------------------------= ---- default-configs/ppc-softmmu.mak | 3 ++- default-configs/riscv32-softmmu.mak | 4 +-- default-configs/riscv64-softmmu.mak | 4 +-- default-configs/sh4-softmmu.mak | 3 ++- default-configs/sh4eb-softmmu.mak | 3 ++- default-configs/sparc64-softmmu.mak | 3 ++- docs/devel/build-system.txt | 1 - hw/audio/Kconfig | 6 +++++ hw/block/Kconfig | 2 ++ hw/char/Kconfig | 2 ++ hw/display/Kconfig | 19 +++++++++++++ hw/ide/Kconfig | 3 +++ hw/ipack/Kconfig | 2 ++ hw/misc/Kconfig | 6 ++++- hw/net/Kconfig | 23 ++++++++++++++++ hw/pci-bridge/Kconfig | 8 ++++++ hw/pci-host/Kconfig | 10 +++++++ hw/pci/Kconfig | 3 +++ hw/scsi/Kconfig | 11 ++++++++ hw/sd/Kconfig | 3 +++ hw/usb/Kconfig | 10 +++++++ hw/virtio/Kconfig | 3 +++ hw/watchdog/Kconfig | 2 ++ 30 files changed, 141 insertions(+), 64 deletions(-) delete mode 100644 default-configs/pci.mak diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index 8000a9a..27936dd 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -1,7 +1,8 @@ # Default configuration for alpha-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_I82374=3Dy diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index b430be5..e9a972f 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,7 +1,8 @@ # Default configuration for arm-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_VGA=3Dy CONFIG_NAND=3Dy CONFIG_ECC=3Dy @@ -163,3 +164,7 @@ CONFIG_PCI_EXPRESS_DESIGNWARE=3Dy CONFIG_STRONGARM=3Dy CONFIG_HIGHBANK=3Dy CONFIG_MUSICPAL=3Dy + +# for realview and versatilepb +CONFIG_SCSI=3Dy +CONFIG_LSI_SCSI_PCI=3Dy diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmm= u.mak index e0a6cdc..85a2011 100644 --- a/default-configs/hppa-softmmu.mak +++ b/default-configs/hppa-softmmu.mak @@ -1,5 +1,6 @@ -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_ISA_BUS=3Dy @@ -7,6 +8,8 @@ CONFIG_I8259=3Dy CONFIG_E1000_PCI=3Dy CONFIG_IDE_CMD646=3Dy # CONFIG_IDE_MMIO=3Dy +CONFIG_SCSI=3Dy +CONFIG_LSI_SCSI_PCI=3Dy CONFIG_VIRTIO_VGA=3Dy CONFIG_MC146818RTC=3Dy CONFIG_DINO=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index c7e32ce..b4dc3a0 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,12 +1,12 @@ # Default configuration for i386-softmmu =20 -include pci.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy include sound.mak include usb.mak include hyperv.mak CONFIG_TEST_DEVICES=3Dy CONFIG_VGA_ISA=3Dy -CONFIG_VGA_CIRRUS=3Dy CONFIG_VMWARE_VGA=3Dy CONFIG_VMXNET3_PCI=3Dy CONFIG_VIRTIO_VGA=3Dy @@ -45,7 +45,6 @@ CONFIG_MEM_DEVICE=3Dy CONFIG_DIMM=3Dy CONFIG_NVDIMM=3Dy CONFIG_ACPI_NVDIMM=3Dy -CONFIG_PCIE_PORT=3Dy CONFIG_XIO3130=3Dy CONFIG_IOH3420=3Dy CONFIG_I82801B11=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index cba8582..9c2146e 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -1,8 +1,9 @@ # Common mips*-softmmu CONFIG defines =20 -include pci.mak include sound.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_ESP=3Dy CONFIG_SCSI=3Dy CONFIG_VGA_ISA=3Dy diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64e= l-softmmu.mak index c6ad4da..8b255ef 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -10,6 +10,7 @@ CONFIG_JAZZ=3Dy CONFIG_G364FB=3Dy CONFIG_JAZZ_LED=3Dy CONFIG_VT82C686=3Dy +CONFIG_AHCI=3Dy CONFIG_MIPS_BOSTON=3Dy CONFIG_FITLOADER=3Dy CONFIG_PCI_EXPRESS=3Dy diff --git a/default-configs/pci.mak b/default-configs/pci.mak deleted file mode 100644 index fc5edfc..0000000 --- a/default-configs/pci.mak +++ /dev/null @@ -1,47 +0,0 @@ -CONFIG_PCI=3Dy -# For now, CONFIG_IDE_CORE requires ISA, so we enable it here -CONFIG_ISA_BUS=3Dy -CONFIG_VIRTIO_PCI=3Dy -include virtio.mak -CONFIG_USB_UHCI=3Dy -CONFIG_USB_OHCI=3Dy -CONFIG_USB_EHCI=3Dy -CONFIG_USB_XHCI=3Dy -CONFIG_USB_XHCI_NEC=3Dy -CONFIG_NE2000_PCI=3Dy -CONFIG_EEPRO100_PCI=3Dy -CONFIG_PCNET_PCI=3Dy -CONFIG_PCNET_COMMON=3Dy -CONFIG_AC97=3Dy -CONFIG_HDA=3Dy -CONFIG_ES1370=3Dy -CONFIG_SCSI=3Dy -CONFIG_LSI_SCSI_PCI=3Dy -CONFIG_VMW_PVSCSI_SCSI_PCI=3Dy -CONFIG_MEGASAS_SCSI_PCI=3Dy -CONFIG_MPTSAS_SCSI_PCI=3Dy -CONFIG_RTL8139_PCI=3Dy -CONFIG_E1000_PCI=3Dy -CONFIG_E1000E_PCI_EXPRESS=3Dy -CONFIG_AHCI=3Dy -CONFIG_ESP=3Dy -CONFIG_ESP_PCI=3Dy -CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy -CONFIG_SERIAL_PCI=3Dy -CONFIG_CAN_BUS=3Dy -CONFIG_CAN_SJA1000=3Dy -CONFIG_CAN_PCI=3Dy -CONFIG_IPACK=3Dy -CONFIG_WDT_IB6300ESB=3Dy -CONFIG_PCI_TESTDEV=3Dy -CONFIG_NVME_PCI=3Dy -CONFIG_SD=3Dy -CONFIG_SDHCI=3Dy -CONFIG_EDU=3Dy -CONFIG_VGA=3Dy -CONFIG_VGA_PCI=3Dy -CONFIG_BOCHS_DISPLAY=3Dy -CONFIG_ROCKER=3Dy -CONFIG_VFIO_PCI=3Dy -CONFIG_EDID=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 5ccdcb6..74e31a6 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -1,8 +1,9 @@ # Default configuration for ppc-softmmu =20 -include pci.mak include sound.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_TEST_DEVICES=3Dy =20 # For embedded PPCs: diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index 8c3a91a..5501c1b 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -1,8 +1,8 @@ # Default configuration for riscv-softmmu =20 -include pci.mak include usb.mak - +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_VIRTIO_MMIO=3Dy =20 diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index 8c3a91a..5501c1b 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -1,8 +1,8 @@ # Default configuration for riscv-softmmu =20 -include pci.mak include usb.mak - +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_VIRTIO_MMIO=3Dy =20 diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index e406559..87da3a6 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -1,7 +1,8 @@ # Default configuration for sh4-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_PTIMER=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index 14dea69..ce9aae9 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -1,7 +1,8 @@ # Default configuration for sh4eb-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_PTIMER=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index 1e519b3..bf52d52 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -1,7 +1,8 @@ # Default configuration for sparc64-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_M48T59=3Dy CONFIG_PTIMER=3Dy CONFIG_SERIAL=3Dy diff --git a/docs/devel/build-system.txt b/docs/devel/build-system.txt index f9fd27f..addd274 100644 --- a/docs/devel/build-system.txt +++ b/docs/devel/build-system.txt @@ -417,7 +417,6 @@ into each QEMU system and userspace emulator targets. T= hey merely contain a long list of config variable definitions. For example, default-configs/x86_64-softmmu.mak has: =20 - include pci.mak include sound.mak include usb.mak CONFIG_QXL=3D$(CONFIG_SPICE) diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig index 45d3a6a..6517e90 100644 --- a/hw/audio/Kconfig +++ b/hw/audio/Kconfig @@ -3,9 +3,13 @@ config SB16 =20 config ES1370 bool + default y if PCI_DEVICES + depends on PCI =20 config AC97 bool + default y if PCI_DEVICES + depends on PCI =20 config ADLIB bool @@ -18,6 +22,8 @@ config CS4231A =20 config HDA bool + default y if PCI_DEVICES + depends on PCI =20 config PCSPK bool diff --git a/hw/block/Kconfig b/hw/block/Kconfig index aca8d11..0aa82ac 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -23,6 +23,8 @@ config ONENAND =20 config NVME_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config VIRTIO_BLK bool diff --git a/hw/char/Kconfig b/hw/char/Kconfig index fbb0a9b..fc18481 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -20,6 +20,8 @@ config SERIAL_ISA =20 config SERIAL_PCI bool + default y if PCI_DEVICES + depends on PCI select SERIAL =20 config VIRTIO_SERIAL diff --git a/hw/display/Kconfig b/hw/display/Kconfig index bbd6dd9..4941773 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -9,6 +9,9 @@ config ADS7846 =20 config VGA_CIRRUS bool + default y if PCI_DEVICES + depends on PCI + select VGA =20 config G364FB bool @@ -30,6 +33,9 @@ config SSD0323 =20 config VGA_PCI bool + default y if PCI_DEVICES + depends on PCI + select VGA =20 config VGA_ISA bool @@ -42,9 +48,15 @@ config VGA_ISA_MM =20 config VMWARE_VGA bool + default y if PCI_DEVICES + depends on PCI + select VGA =20 config BOCHS_DISPLAY bool + default y if PCI_DEVICES + depends on PCI + select VGA =20 config BLIZZARD bool @@ -72,12 +84,19 @@ config VGA config QXL bool depends on SPICE && PCI + select VGA =20 config VIRTIO_GPU bool + default y if PCI_DEVICES + depends on VIRTIO + select EDID =20 config VIRTIO_VGA bool + default y if PCI_DEVICES + depends on VIRTIO_PCI + select VGA =20 config DPCD bool diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig index 88076a7..ab47b6a 100644 --- a/hw/ide/Kconfig +++ b/hw/ide/Kconfig @@ -7,6 +7,7 @@ config IDE_QDEV =20 config IDE_PCI bool + depends on PCI select IDE_CORE =20 config IDE_ISA @@ -43,6 +44,8 @@ config MICRODRIVE =20 config AHCI bool + default y if PCI_DEVICES + depends on PCI select IDE_QDEV =20 config IDE_SII3112 diff --git a/hw/ipack/Kconfig b/hw/ipack/Kconfig index 481e0d2..f8da24a 100644 --- a/hw/ipack/Kconfig +++ b/hw/ipack/Kconfig @@ -1,2 +1,4 @@ config IPACK bool + default y if PCI_DEVICES + depends on PCI diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index a1e4bd8..41d8633 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -26,9 +26,13 @@ config ISA_TESTDEV =20 config PCI_TESTDEV bool + default y if TEST_DEVICES + depends on PCI =20 config EDU bool + default y if TEST_DEVICES + depends on PCI =20 config PCA9552 bool @@ -53,7 +57,7 @@ config MACIO =20 config IVSHMEM_DEVICE bool - default y + default y if PCI_DEVICES depends on PCI && LINUX && IVSHMEM =20 config ECCMEMCTL diff --git a/hw/net/Kconfig b/hw/net/Kconfig index f4b5ff2..a309831 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -3,27 +3,42 @@ config DP8393X =20 config NE2000_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config EEPRO100_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config PCNET_PCI bool + default y if PCI_DEVICES + depends on PCI + select PCNET_COMMON =20 config PCNET_COMMON bool =20 config E1000_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config E1000E_PCI_EXPRESS bool + default y if PCI_DEVICES + depends on PCI_EXPRESS =20 config RTL8139_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config VMXNET3_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config SMC91C111 bool @@ -85,12 +100,20 @@ config ETSEC =20 config ROCKER bool + default y if PCI_DEVICES + depends on PCI =20 config CAN_BUS bool =20 config CAN_PCI bool + default y if PCI_DEVICES + depends on PCI + select CAN_BUS =20 config CAN_SJA1000 bool + default y if PCI_DEVICES + depends on PCI + select CAN_BUS diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig index bb19b7a..0519eb1 100644 --- a/hw/pci-bridge/Kconfig +++ b/hw/pci-bridge/Kconfig @@ -1,17 +1,25 @@ config PCIE_PORT bool + default y if PCI_DEVICES + depends on PCI_EXPRESS =20 config PXB bool =20 config XIO3130 bool + default y if PCI_DEVICES + depends on PCI_EXPRESS =20 config IOH3420 bool + default y if PCI_DEVICES + depends on PCI_EXPRESS =20 config I82801B11 bool + default y if PCI_DEVICES + depends on PCI_EXPRESS =20 config DEC_PCI bool diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index 2edc5bb..c01812a 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -2,21 +2,27 @@ config PAM bool =20 config PREP_PCI + select PCI bool =20 config GRACKLE_PCI + select PCI bool =20 config UNIN_PCI + select PCI bool =20 config PPCE500_PCI + select PCI bool =20 config VERSATILE_PCI + select PCI bool =20 config PCI_SABRE + select PCI bool =20 config PCI_PIIX @@ -24,12 +30,16 @@ config PCI_PIIX =20 config PCI_EXPRESS_Q35 bool + select PCI_EXPRESS =20 config PCI_EXPRESS_GENERIC_BRIDGE bool + select PCI_EXPRESS =20 config PCI_EXPRESS_XILINX bool + select PCI_EXPRESS =20 config PCI_EXPRESS_DESIGNWARE bool + select PCI_EXPRESS diff --git a/hw/pci/Kconfig b/hw/pci/Kconfig index 4ca2537..3b8638b 100644 --- a/hw/pci/Kconfig +++ b/hw/pci/Kconfig @@ -4,3 +4,6 @@ config PCI config PCI_EXPRESS bool select PCI + +config PCI_DEVICES + bool diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig index 982537b..8144ccb 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -3,21 +3,32 @@ config SCSI =20 config LSI_SCSI_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config MPTSAS_SCSI_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config MEGASAS_SCSI_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config VMW_PVSCSI_SCSI_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config ESP bool =20 config ESP_PCI bool + default y if PCI_DEVICES + depends on PCI + select ESP =20 config SPAPR_VSCSI bool diff --git a/hw/sd/Kconfig b/hw/sd/Kconfig index 4f43bbb..c6c5dfb 100644 --- a/hw/sd/Kconfig +++ b/hw/sd/Kconfig @@ -9,3 +9,6 @@ config SD =20 config SDHCI bool + default y if PCI_DEVICES + depends on PCI + select SD diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index cbf5c5d..86ee615 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -3,21 +3,31 @@ config USB =20 config USB_UHCI bool + default y if PCI_DEVICES + depends on PCI =20 config USB_OHCI bool + default y if PCI_DEVICES + depends on PCI =20 config USB_EHCI bool + default y if PCI_DEVICES + depends on PCI =20 config USB_EHCI_SYSBUS bool =20 config USB_XHCI bool + default y if PCI_DEVICES + depends on PCI =20 config USB_XHCI_NEC bool + default y if PCI_DEVICES + depends on PCI =20 config USB_MUSB bool diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig index ebf1812..5dafbe3 100644 --- a/hw/virtio/Kconfig +++ b/hw/virtio/Kconfig @@ -6,6 +6,9 @@ config VIRTIO_RNG =20 config VIRTIO_PCI bool + default y if PCI_DEVICES + depends on PCI + select VIRTIO =20 config VIRTIO_MMIO bool diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig index 4bbd981..35ccb72 100644 --- a/hw/watchdog/Kconfig +++ b/hw/watchdog/Kconfig @@ -3,6 +3,8 @@ config CMSDK_APB_WATCHDOG =20 config WDT_IB6300ESB bool + default y if PCI_DEVICES + depends on PCI =20 config WDT_IB700 bool --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551727338115825.3354177531987; Mon, 4 Mar 2019 11:22:18 -0800 (PST) Received: from localhost ([127.0.0.1]:59533 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tAB-00031V-SC for importer@patchew.org; Mon, 04 Mar 2019 14:22:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCX-0001uM-Nc for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCW-00041s-UF for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:33 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:50510) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCW-0003z9-MP for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:32 -0500 Received: by mail-wm1-x344.google.com with SMTP id x7so147705wmj.0 for ; Mon, 04 Mar 2019 10:20:32 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:30 -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=q681eZ3/ZVDBq9HY/hNXQJbOyNHu/GFvFE9yEiWiSWs=; b=jHWT0QjpglYZ39fhV9pxYujxCoGFgcZ60HaHG18sMIlnRAuGF9iMYtF7ghe4Em7vFx ANEmDDTUpcvIk0qiK9mqTe/WjikI5aoOHfUoknOipT2fvJTLMdfqXWhseur4js4vZzBI +F/8YJKjs4aV8892ETOhB+vGwiwpc1FfspfeTy+7EhGV3B8rmcKt2jeQlokxrXl2OeYU humGVDAp81i3k2/y79B1hZQyagUXw7Uvtf4XbdCNfWMYIt6SYuRemxzH/sob4sMl4Vra f73IGUt6RXJMYKDnSwOaPW15li+zJO80C40+gXcMwr7h5iiF0JS1doruMM3yqFNDJDKn wUuQ== 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=q681eZ3/ZVDBq9HY/hNXQJbOyNHu/GFvFE9yEiWiSWs=; b=IBR1yAz0gqN0ncatHVlNBwTgR36gDk/Zt8kFWgpaDFJPP81moUOOdmgzjKSXUhUPcE ofHOcMclxwEsDTFHJBbtmnHWWWJkn3k3A8m+6/kcdnX8vcGTrHu1AiiOHgTrLjbZKahZ TQ1ChtuiOjq/GuCiP48UoBVOu1UkV7sCBFcsjsiNWFwKA7Lnay9ienjKzVKPnFYdWIsm 5lf9uJr7LqtD/JvrWmmECY8OisDrawyP8EZUQXvCbtvXVljsDZsTOZ6a+9oGcXiNx5G9 zU3W0BnZNTGKouELaVT2Ro+DN+6olgaeFmsGCSO+7g66uKnYzgB9xllAJTscTyrpbGD5 iqGQ== X-Gm-Message-State: APjAAAXd/Ui9zFg3+NfKlwJdJ5IfPQnqTKAe+RoFc1f5Xe4yUrwe5bxY OAM1FB3gDhR3iNqtMTnC6RG4ajL5 X-Google-Smtp-Source: APXvYqxldSqxnMXIfWY7Xin7MvFS0mj5qypeRbYaCjaOIEoRz7yzDnPRw+Z1KQPIHNyt8Kg0ceL74A== X-Received: by 2002:a1c:80d6:: with SMTP id b205mr268343wmd.109.1551723631311; Mon, 04 Mar 2019 10:20:31 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:36 +0100 Message-Id: <1551723614-1823-17-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::344 Subject: [Qemu-devel] [PULL 16/54] build: convert sound.mak to 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" There is really nothing special in these devices; they are just ISA devices. Instead of including them for each target, set CONFIG_ISA_BUS to true, and make the devices default to present whenever ISA is available. More conversion of ISA devices will follow. Done with the following script: while read i; do i=3D${i%=3Dy}; i=3D${i#CONFIG_} sed -i -e'/^config '$i'$/!b' -en \ -e'a\' -e' default y\' -e' depends on ISA_BUS' \ `grep -lw $i hw/*/Kconfig` done < default-configs/sound.mak Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-32-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/i386-softmmu.mak | 2 +- default-configs/mips-softmmu-common.mak | 2 +- default-configs/ppc-softmmu.mak | 2 +- default-configs/sound.mak | 4 ---- hw/audio/Kconfig | 8 ++++++++ 5 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 default-configs/sound.mak diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index b4dc3a0..075d501 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -2,7 +2,7 @@ =20 CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy -include sound.mak +CONFIG_ISA_BUS=3Dy include usb.mak include hyperv.mak CONFIG_TEST_DEVICES=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index 9c2146e..6d5882b 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -1,7 +1,7 @@ # Common mips*-softmmu CONFIG defines =20 -include sound.mak include usb.mak +CONFIG_ISA_BUS=3Dy CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_ESP=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 74e31a6..1871185 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -1,7 +1,7 @@ # Default configuration for ppc-softmmu =20 -include sound.mak include usb.mak +CONFIG_ISA_BUS=3Dy CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_TEST_DEVICES=3Dy diff --git a/default-configs/sound.mak b/default-configs/sound.mak deleted file mode 100644 index 4f22c34..0000000 --- a/default-configs/sound.mak +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_SB16=3Dy -CONFIG_ADLIB=3Dy -CONFIG_GUS=3Dy -CONFIG_CS4231A=3Dy diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig index 6517e90..01aea55 100644 --- a/hw/audio/Kconfig +++ b/hw/audio/Kconfig @@ -1,5 +1,7 @@ config SB16 bool + default y + depends on ISA_BUS =20 config ES1370 bool @@ -13,12 +15,18 @@ config AC97 =20 config ADLIB bool + default y + depends on ISA_BUS =20 config GUS bool + default y + depends on ISA_BUS =20 config CS4231A bool + default y + depends on ISA_BUS =20 config HDA bool --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551727004760543.1614516071002; Mon, 4 Mar 2019 11:16:44 -0800 (PST) Received: from localhost ([127.0.0.1]:59456 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0t4o-00076P-Mf for importer@patchew.org; Mon, 04 Mar 2019 14:16:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCY-0001vI-P0 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCX-00043A-NS for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:34 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:53710) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCX-00041w-FU for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:33 -0500 Received: by mail-wm1-x331.google.com with SMTP id e74so128151wmg.3 for ; Mon, 04 Mar 2019 10:20:33 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:31 -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=lQL/WRYyKDvlCzl/yZrwMJpoLii/Q0sHCHlYx97lY8g=; b=dpibq+S/gjJBNzEdDA4NafRBCKwIR3zj3yDiemnyyjUtYoeEh/UhWKc9MUJ7ygzCEh aFm4BJEw/wWaJg904pNajB4iwYZd37jcMhD5p1eo/gIgfwxVJxsfIMvyr6FnF2+ZdCNv 3stb7qSfSo3JeNd2xbYEzPzMsX7GVZ7LEhA3VeowTtv5mLnu9aj665xrqyuvZVHVHw2H CZtN3fdB1AGlAdVhfCxVZxf5gL45Mm5i+QOYJtsh5hde5jrM5AE6wQTknlVX+18fZsGC X3IXULgUaETRm72rfA+n5eXu4xcHi3WnhzKjPj+fhF47hCMARW/2QahTH4hBTm/9pbsv Ekcw== 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=lQL/WRYyKDvlCzl/yZrwMJpoLii/Q0sHCHlYx97lY8g=; b=bzdIMMHgZ4+pry4a52j+xmbPeUUbzslvC8/9bQNGC0FEYzUtsQd96J2LAhzai/VECX QkpXzykLKhOgGpNVb/ZCelz233jPSDK07zmd0WUVV8vxl559TDmV7mdQqbBvAevdcPcm O6Ap/osnCWH8wbUZ6uPBSDHBdZHXOBotAdWeWVUf5fSxEZRA8d4GFKpSfaGdX9hEHwe8 B+lsoAA5Bh27Cd4Mz7D9UYS3yUmFZLNfQ7nI7dV+lz4Qly0Xc5mxoDwklT6z82Mt99YD 6024MaHV8G6IPiiBCNQrWYJreuRyuor2M+ky+QU6v6bUi1IGLOR2DuPdrZtGaxDXF6rZ Tcbw== X-Gm-Message-State: APjAAAUgt9FoxoFNUHPpuQz9eB4R8FwALZN3J3uFeHcYJ2Ok/Gafguu4 iXj00Kv9H+zMH3cFyKPS3swnMORT X-Google-Smtp-Source: APXvYqwd5AORupugdySrt5SDB5EZkyXQkQ+q/1wp6C+R9oKCql4n15tUEs0iTyV4wwnXzoxknMisnA== X-Received: by 2002:a1c:a9d0:: with SMTP id s199mr274919wme.142.1551723632219; Mon, 04 Mar 2019 10:20:32 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:37 +0100 Message-Id: <1551723614-1823-18-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::331 Subject: [Qemu-devel] [PULL 17/54] scsi: express 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" This automatically removes the SCSI subsystem from the binary altogether if no controllers are selected. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-34-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 1 - default-configs/hppa-softmmu.mak | 1 - default-configs/mips-softmmu-common.mak | 1 - default-configs/sparc-softmmu.mak | 1 - default-configs/virtio.mak | 1 - hw/scsi/Kconfig | 7 +++++++ hw/scsi/Makefile.objs | 2 +- hw/usb/Kconfig | 2 ++ 8 files changed, 10 insertions(+), 6 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index e9a972f..7b7c040 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -166,5 +166,4 @@ CONFIG_HIGHBANK=3Dy CONFIG_MUSICPAL=3Dy =20 # for realview and versatilepb -CONFIG_SCSI=3Dy CONFIG_LSI_SCSI_PCI=3Dy diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmm= u.mak index 85a2011..221c609 100644 --- a/default-configs/hppa-softmmu.mak +++ b/default-configs/hppa-softmmu.mak @@ -8,7 +8,6 @@ CONFIG_I8259=3Dy CONFIG_E1000_PCI=3Dy CONFIG_IDE_CMD646=3Dy # CONFIG_IDE_MMIO=3Dy -CONFIG_SCSI=3Dy CONFIG_LSI_SCSI_PCI=3Dy CONFIG_VIRTIO_VGA=3Dy CONFIG_MC146818RTC=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index 6d5882b..556cd5c 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -5,7 +5,6 @@ CONFIG_ISA_BUS=3Dy CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_ESP=3Dy -CONFIG_SCSI=3Dy CONFIG_VGA_ISA=3Dy CONFIG_VGA_ISA_MM=3Dy CONFIG_VGA_CIRRUS=3Dy diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-soft= mmu.mak index 59a4a3d..805c400 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -2,7 +2,6 @@ =20 CONFIG_ISA_BUS=3Dy CONFIG_ECC=3Dy -CONFIG_SCSI=3Dy CONFIG_ESP=3Dy CONFIG_ESCC=3Dy CONFIG_M48T59=3Dy diff --git a/default-configs/virtio.mak b/default-configs/virtio.mak index 5a2930c..7e6d467 100644 --- a/default-configs/virtio.mak +++ b/default-configs/virtio.mak @@ -7,6 +7,5 @@ CONFIG_EDID=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/scsi/Kconfig b/hw/scsi/Kconfig index 8144ccb..a696ff0 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -5,24 +5,29 @@ config LSI_SCSI_PCI bool default y if PCI_DEVICES depends on PCI + select SCSI =20 config MPTSAS_SCSI_PCI bool default y if PCI_DEVICES depends on PCI + select SCSI =20 config MEGASAS_SCSI_PCI bool default y if PCI_DEVICES depends on PCI + select SCSI =20 config VMW_PVSCSI_SCSI_PCI bool default y if PCI_DEVICES depends on PCI + select SCSI =20 config ESP bool + select SCSI =20 config ESP_PCI bool @@ -34,9 +39,11 @@ config SPAPR_VSCSI bool default y depends on PSERIES + select SCSI =20 config VIRTIO_SCSI bool + select SCSI =20 config VHOST_USER_SCSI bool diff --git a/hw/scsi/Makefile.objs b/hw/scsi/Makefile.objs index 45167ba..54b36ed 100644 --- a/hw/scsi/Makefile.objs +++ b/hw/scsi/Makefile.objs @@ -6,7 +6,7 @@ common-obj-$(CONFIG_MEGASAS_SCSI_PCI) +=3D megasas.o common-obj-$(CONFIG_VMW_PVSCSI_SCSI_PCI) +=3D vmw_pvscsi.o common-obj-$(CONFIG_ESP) +=3D esp.o common-obj-$(CONFIG_ESP_PCI) +=3D esp-pci.o -obj-$(CONFIG_PSERIES) +=3D spapr_vscsi.o +obj-$(CONFIG_SPAPR_VSCSI) +=3D spapr_vscsi.o =20 ifeq ($(CONFIG_VIRTIO_SCSI),y) obj-y +=3D virtio-scsi.o virtio-scsi-dataplane.o diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index 86ee615..071e749 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -40,9 +40,11 @@ config USB_TABLET_WACOM =20 config USB_STORAGE_BOT bool + select SCSI =20 config USB_STORAGE_UAS bool + select SCSI =20 config USB_AUDIO bool --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551728650582661.1395337095566; Mon, 4 Mar 2019 11:44:10 -0800 (PST) Received: from localhost ([127.0.0.1]:59850 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tVP-0005Cv-CG for importer@patchew.org; Mon, 04 Mar 2019 14:44:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45893) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCa-0001ws-3O for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCY-00045J-RX for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:36 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:36246) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCY-00043k-IS for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:34 -0500 Received: by mail-wm1-x32d.google.com with SMTP id j125so135317wmj.1 for ; Mon, 04 Mar 2019 10:20:34 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:32 -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=XY/PWTOlHqa8wTuDY6vI9w2aH1074B40DdDjODlcalI=; b=t6XUlns2UyuHOaD5R8hZf6IMwd77D5n9cTfud0wVPmdN+HHaZemOkSOsKKkLBBL8R8 LbXCZtprF9KmuDkEHVEy2LV6BnT2D9aOxWGYLgybVZ5QzG4OE1WN4A7HJK04Q6RfOZ3p aB7QqiDRu9DdhgNydoMseg+DU7FhnCjIkkAY4FGz0G5u6b+hg5D/Qqe/db2pDA37Zqqx w4TZJsgMoCpSbN4UtDv6/Kq+J0hJZzHl/yMYMoLTs29Ar9X5G18O6ktkM8FgKQS0+ul2 pZZTVBe8X5Z7J3aOVxePiNMFxPIs4WsRQUWbYd8eGuKMT2fyupmX8d4qemB8kSXl8v9z 15Cw== 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=XY/PWTOlHqa8wTuDY6vI9w2aH1074B40DdDjODlcalI=; b=rPb6YF9IsmCaeqUdzYqNadbHqzmdqWXsxNGRaigzK31EwnxLDFFLBel21nBI8+hLHm 4KsYXqOrUjP4sCBSprdTEDGJbWEFVaL9X3xquHD/eoh2KBQKQqYPlSrJkDvKtyDTPEts Ki4lhzG30RWcnpul03GcgeDOOzqcXHz8sv+wn1wetrKGX/C4FcpcLt9s+ms80Kha2Ocs kg/FxQI8BOcnorpuMyiUqrxL9nltm3EUe8B4ZCGpPA1Q5Hg7w6Y2dLSXpIIcHSe8P9yo P1NE6wAx0hlF7suMYSUzAl2KVs1NYGOO/docxYNPtXcmkXMwvh+CdSe3i/+y3WqjTghO a4BA== X-Gm-Message-State: APjAAAUnhVkKmJzXqq8crkWoLhpWrQZOgqNr1IPEe2C2Ip8UQ3i6cUt7 Av6EJ6PuhJ5ewNhlQ0XfCzKB7iQO X-Google-Smtp-Source: APXvYqweghuBCrDxyZZsaFYiwtq9RTVdIyQcSworKXKgwewiFUO28u4QSEl12gSzYuerPelMw9asPA== X-Received: by 2002:a1c:4844:: with SMTP id v65mr303800wma.66.1551723633268; Mon, 04 Mar 2019 10:20:33 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:38 +0100 Message-Id: <1551723614-1823-19-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::32d Subject: [Qemu-devel] [PULL 18/54] build: convert usb.mak to 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" Instead of including the same list of devices for each target, let the host controllers select CONFIG_USB and make the devices default to present whenever USB is available. Done with the following script: while read i; do i=3D${i%=3Dy}; i=3D${i#CONFIG_} sed -i -e'/^config '$i'$/!b' -en \ -e'a\' -e' default y\' -e' depends on USB' \ `grep -lw $i hw/*/Kconfig` done < default-configs/usb.mak followed by adding "select USB" on the host controllers. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-33-yang.zhong@intel.com> Acked-by: Richard Henderson Signed-off-by: Paolo Bonzini --- default-configs/alpha-softmmu.mak | 1 - default-configs/arm-softmmu.mak | 2 -- default-configs/hppa-softmmu.mak | 1 - default-configs/i386-softmmu.mak | 1 - default-configs/mips-softmmu-common.mak | 1 - default-configs/ppc-softmmu.mak | 1 - default-configs/riscv32-softmmu.mak | 1 - default-configs/riscv64-softmmu.mak | 1 - default-configs/sh4-softmmu.mak | 1 - default-configs/sh4eb-softmmu.mak | 1 - default-configs/sparc64-softmmu.mak | 1 - default-configs/usb.mak | 11 ----------- hw/usb/Kconfig | 26 ++++++++++++++++++++++++++ hw/usb/Makefile.objs | 2 +- 14 files changed, 27 insertions(+), 24 deletions(-) delete mode 100644 default-configs/usb.mak diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index 27936dd..f0c1928 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for alpha-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 7b7c040..917b18d 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for arm-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_VGA=3Dy @@ -38,7 +37,6 @@ CONFIG_DS1338=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_MICRODRIVE=3Dy -CONFIG_USB=3Dy CONFIG_USB_MUSB=3Dy CONFIG_USB_EHCI_SYSBUS=3Dy CONFIG_PLATFORM_BUS=3Dy diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmm= u.mak index 221c609..b7f2b43 100644 --- a/default-configs/hppa-softmmu.mak +++ b/default-configs/hppa-softmmu.mak @@ -1,4 +1,3 @@ -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 075d501..54b571f 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -3,7 +3,6 @@ CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_ISA_BUS=3Dy -include usb.mak include hyperv.mak CONFIG_TEST_DEVICES=3Dy CONFIG_VGA_ISA=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index 556cd5c..45c599b 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -1,6 +1,5 @@ # Common mips*-softmmu CONFIG defines =20 -include usb.mak CONFIG_ISA_BUS=3Dy CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 1871185..d4807b3 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for ppc-softmmu =20 -include usb.mak CONFIG_ISA_BUS=3Dy CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index 5501c1b..fd91efb 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for riscv-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index 5501c1b..fd91efb 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for riscv-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 87da3a6..3f7fbe2 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for sh4-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index ce9aae9..17f07a4 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for sh4eb-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index bf52d52..2d23b0c 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for sparc64-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_M48T59=3Dy diff --git a/default-configs/usb.mak b/default-configs/usb.mak deleted file mode 100644 index e42cfea..0000000 --- a/default-configs/usb.mak +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG_USB=3Dy -CONFIG_USB_TABLET_WACOM=3Dy -CONFIG_USB_STORAGE_BOT=3Dy -CONFIG_USB_STORAGE_UAS=3Dy -CONFIG_USB_STORAGE_MTP=3Dy -CONFIG_SCSI=3Dy -CONFIG_USB_SMARTCARD=3Dy -CONFIG_USB_AUDIO=3Dy -CONFIG_USB_SERIAL=3Dy -CONFIG_USB_NETWORK=3Dy -CONFIG_USB_BLUETOOTH=3Dy diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index 071e749..a1b7acb 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -5,61 +5,87 @@ config USB_UHCI bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_OHCI bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_EHCI bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_EHCI_SYSBUS bool + select USB =20 config USB_XHCI bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_XHCI_NEC bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_MUSB bool + select USB =20 config TUSB6010 bool + select USB_MUSB =20 config USB_TABLET_WACOM bool + default y + depends on USB =20 config USB_STORAGE_BOT bool + default y + depends on USB select SCSI =20 config USB_STORAGE_UAS bool + default y + depends on USB select SCSI =20 config USB_AUDIO bool + default y + depends on USB =20 config USB_SERIAL bool + default y + depends on USB =20 config USB_NETWORK bool + default y + depends on USB =20 config USB_BLUETOOTH bool + default y + depends on USB =20 config USB_SMARTCARD bool + default y + depends on USB =20 config USB_STORAGE_MTP bool + default y + depends on USB diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 41be700..2b92964 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -6,7 +6,7 @@ common-obj-$(CONFIG_USB) +=3D desc.o desc-msos.o common-obj-$(CONFIG_USB_UHCI) +=3D hcd-uhci.o common-obj-$(CONFIG_USB_OHCI) +=3D hcd-ohci.o common-obj-$(CONFIG_USB_EHCI) +=3D hcd-ehci.o hcd-ehci-pci.o -common-obj-$(CONFIG_USB_EHCI_SYSBUS) +=3D hcd-ehci-sysbus.o +common-obj-$(CONFIG_USB_EHCI_SYSBUS) +=3D hcd-ehci.o hcd-ehci-sysbus.o common-obj-$(CONFIG_USB_XHCI) +=3D hcd-xhci.o common-obj-$(CONFIG_USB_XHCI_NEC) +=3D hcd-xhci-nec.o common-obj-$(CONFIG_USB_MUSB) +=3D hcd-musb.o --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551727687963480.73917869433865; Mon, 4 Mar 2019 11:28:07 -0800 (PST) Received: from localhost ([127.0.0.1]:59614 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tFs-00083C-Mf for importer@patchew.org; Mon, 04 Mar 2019 14:28:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCb-0001xl-OH for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCa-00049z-KR for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:37 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:50738) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCa-00047L-4s for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:36 -0500 Received: by mail-wm1-x32a.google.com with SMTP id x7so147855wmj.0 for ; Mon, 04 Mar 2019 10:20:36 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:33 -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=izgnDyQVAdFJ8UW1fbFJt/NwB6XYiPr1oxKLm0a53Do=; b=OvEMy0GwT4i+ZJu52Dc0qROjVLIB6xRJvyYT89UbQr/T1dQk7aWokDi1eTpP2cFkm2 aStoic1XFmbDi6ZKLf1KQ3zy6eK4zdEgpnkcP90dLhVJ8JiB7b5kz+t4tPNouDulTKPC tbMwq5mSoYdNYeHc3AtcnIeequjdgvq6RSi8Jv2KLY6+it+WyiUTcx6oezuCR9b7iuAi pDXTXsPvu05at7nj/9Z17zosHICGsttqZnOB12Cc9yyI2m/HbTMr+PXsFdbGU0d8Oxg5 Eq9yFNKp/TRADU7qSnLujYwdQNuPDn0sVNqetCr//RPdqf5ms9yRs4iprGDoRWu5X+ln 2oaQ== 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=izgnDyQVAdFJ8UW1fbFJt/NwB6XYiPr1oxKLm0a53Do=; b=ncw4A0ax8h8MZkEy3/FYkGm1jVElrOi0ji+bDnk+VNZSh28sFUZN2Iaq2uwX5GjLtF 4IU2gTNoDV3yq241hd/G4GEcKvqGmQ0HZ/DemwxiBRkQd932hxI/dcwgOZT/rYwTOAMy 53YSmQBDq0xy4Nblz7XiNfi7xsrGKao+l8SK0t9Vjw07L7pnikBPKd0Yl+d4nmTm8Q58 0ihjzJ6nNFs1t64Jb6pzybE7i4j+504myicPgNodGSzF1MMNT+Qin7xMN+Tv74Xjw6In S2X9KeNq8r3a051IuUl8AT6wHvOSdFxLg1Acz7amzoaALflduLGv/relkI71rqVl9AyM vFYA== X-Gm-Message-State: APjAAAV0gzZ+GtIcGTYxXYXojCszjcDDorB9Svt68psZwwObjiZ3RH6J L6Opv69cFEZLuTtJINWRW+o1oGMu X-Google-Smtp-Source: APXvYqzOjyGy6+CsxOFsP6oOPIvOxYLdFhfw3Q44IMitGW2ziCTldbckRtzDU2grgVs1A2iOF+jIxw== X-Received: by 2002:a1c:c404:: with SMTP id u4mr275203wmf.87.1551723634705; Mon, 04 Mar 2019 10:20:34 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:39 +0100 Message-Id: <1551723614-1823-20-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::32a Subject: [Qemu-devel] [PULL 19/54] i386: express 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" This way, the default-configs file only need to specify the boards and any optional devices. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-37-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/i386-softmmu.mak | 45 ++++++++---------------------------- hw/acpi/Kconfig | 3 +++ hw/i2c/Makefile.objs | 2 +- hw/i386/Kconfig | 50 ++++++++++++++++++++++++++++++++++++= ++++ hw/i386/Makefile.objs | 5 ++-- hw/isa/Kconfig | 1 + hw/pci-host/Kconfig | 4 ++++ hw/tpm/Kconfig | 2 ++ 8 files changed, 73 insertions(+), 39 deletions(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 54b571f..ed234c1 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,12 +1,6 @@ # Default configuration for i386-softmmu =20 -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_ISA_BUS=3Dy include hyperv.mak -CONFIG_TEST_DEVICES=3Dy -CONFIG_VGA_ISA=3Dy -CONFIG_VMWARE_VGA=3Dy CONFIG_VMXNET3_PCI=3Dy CONFIG_VIRTIO_VGA=3Dy CONFIG_IPMI=3Dy @@ -14,49 +8,28 @@ CONFIG_IPMI_LOCAL=3Dy CONFIG_IPMI_EXTERN=3Dy CONFIG_ISA_IPMI_KCS=3Dy CONFIG_ISA_IPMI_BT=3Dy -CONFIG_I8254=3Dy -CONFIG_ACPI=3Dy -CONFIG_ACPI_X86=3Dy -CONFIG_ACPI_X86_ICH=3Dy -CONFIG_ACPI_MEMORY_HOTPLUG=3Dy -CONFIG_ACPI_CPU_HOTPLUG=3Dy -CONFIG_APM=3Dy -CONFIG_I8257=3Dy -CONFIG_IDE_ISA=3Dy -CONFIG_IDE_PIIX=3Dy + +# Optional devices: +# CONFIG_HPET=3Dy CONFIG_APPLESMC=3Dy -CONFIG_I8259=3Dy CONFIG_PFLASH_CFI01=3Dy -CONFIG_MC146818RTC=3Dy -CONFIG_PCI_PIIX=3Dy CONFIG_ISA_DEBUG=3Dy CONFIG_ISA_TESTDEV=3Dy -CONFIG_VMPORT=3Dy +CONFIG_TEST_DEVICES=3Dy CONFIG_SGA=3Dy -CONFIG_LPC_ICH9=3Dy -CONFIG_PCI_EXPRESS=3Dy -CONFIG_PCI_EXPRESS_Q35=3Dy -CONFIG_APIC=3Dy -CONFIG_IOAPIC=3Dy CONFIG_PVPANIC=3Dy CONFIG_MEM_DEVICE=3Dy -CONFIG_DIMM=3Dy CONFIG_NVDIMM=3Dy CONFIG_ACPI_NVDIMM=3Dy -CONFIG_XIO3130=3Dy -CONFIG_IOH3420=3Dy -CONFIG_I82801B11=3Dy -CONFIG_SMBIOS=3Dy CONFIG_PXB=3Dy CONFIG_ACPI_VMGENID=3Dy -CONFIG_ACPI_SMBUS=3Dy CONFIG_SMBUS_EEPROM=3Dy -CONFIG_FW_CFG_DMA=3Dy CONFIG_I2C=3Dy -CONFIG_VTD=3Dy -CONFIG_AMD_IOMMU=3Dy -CONFIG_PAM=3Dy -CONFIG_PC=3Dy +CONFIG_PCI_DEVICES=3Dy + +# Boards: +# +CONFIG_ISAPC=3Dy CONFIG_I440FX=3Dy CONFIG_Q35=3Dy diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig index c485a34..035a28f 100644 --- a/hw/acpi/Kconfig +++ b/hw/acpi/Kconfig @@ -3,15 +3,18 @@ config ACPI =20 config ACPI_X86 bool + select ACPI =20 config ACPI_X86_ICH bool + select ACPI_X86 =20 config ACPI_CPU_HOTPLUG bool =20 config ACPI_MEMORY_HOTPLUG bool + select MEM_DEVICE =20 config ACPI_NVDIMM bool diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs index 9205cbe..2a3c106 100644 --- a/hw/i2c/Makefile.objs +++ b/hw/i2c/Makefile.objs @@ -2,7 +2,7 @@ common-obj-$(CONFIG_I2C) +=3D core.o smbus_slave.o smbus_ma= ster.o common-obj-$(CONFIG_SMBUS_EEPROM) +=3D smbus_eeprom.o common-obj-$(CONFIG_DDC) +=3D i2c-ddc.o common-obj-$(CONFIG_VERSATILE_I2C) +=3D versatile_i2c.o -common-obj-$(CONFIG_ACPI_X86) +=3D smbus_ich9.o +common-obj-$(CONFIG_ACPI_X86_ICH) +=3D smbus_ich9.o common-obj-$(CONFIG_ACPI_SMBUS) +=3D pm_smbus.o common-obj-$(CONFIG_BITBANG_I2C) +=3D bitbang_i2c.o common-obj-$(CONFIG_EXYNOS4) +=3D exynos4210_i2c.o diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 0b3c8d9..081855e 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -8,16 +8,65 @@ config PC imply QXL imply SEV imply TPM_TIS + select FDC + select I8259 + select I8254 + select PCSPK + select I82374 + select I8257 + select MC146818RTC + +config PC_PCI + bool + select APIC + select IOAPIC + select APM + select PC + +config PC_ACPI + bool + select ACPI_X86 + select ACPI_CPU_HOTPLUG + select ACPI_MEMORY_HOTPLUG + depends on ACPI_SMBUS =20 config I440FX bool + select PC_PCI + select PC_ACPI + select ACPI_SMBUS + select PCI_PIIX + select IDE_PIIX + select DIMM + select SMBIOS + select VMPORT + select VMMOUSE + select FW_CFG_DMA =20 config ISAPC bool select ISA_BUS + select PC + select IDE_ISA + select VGA_ISA + # FIXME: it is in the same file as i440fx, and does not compile + # if separated + depends on I440FX =20 config Q35 bool + imply VTD + imply AMD_IOMMU + select PC_PCI + select PC_ACPI + select PCI_EXPRESS_Q35 + select LPC_ICH9 + select AHCI + select DIMM + select SMBIOS + select VMPORT + select VMMOUSE + select FW_CFG_DMA =20 config VTD bool @@ -30,3 +79,4 @@ config VMPORT =20 config VMMOUSE bool + depends on VMPORT diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 3de7ca2..27248a0 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -4,8 +4,9 @@ obj-y +=3D pc.o obj-$(CONFIG_I440FX) +=3D pc_piix.o obj-$(CONFIG_Q35) +=3D pc_q35.o obj-y +=3D pc_sysfw.o -obj-$(CONFIG_VTD) +=3D x86-iommu.o intel_iommu.o -obj-$(CONFIG_AMD_IOMMU) +=3D x86-iommu.o amd_iommu.o +obj-y +=3D x86-iommu.o +obj-$(CONFIG_VTD) +=3D intel_iommu.o +obj-$(CONFIG_AMD_IOMMU) +=3D amd_iommu.o obj-$(CONFIG_XEN) +=3D ../xenpv/ xen/ obj-$(CONFIG_VMPORT) +=3D vmport.o obj-$(CONFIG_VMMOUSE) +=3D vmmouse.o diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index af68af9..6f0812d 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -27,4 +27,5 @@ config SMC37C669 config LPC_ICH9 bool select ISA_BUS + select ACPI_SMBUS select ACPI_X86_ICH diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index c01812a..ff4080c 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -27,10 +27,14 @@ config PCI_SABRE =20 config PCI_PIIX bool + select PCI + select PAM + select ISA_BUS =20 config PCI_EXPRESS_Q35 bool select PCI_EXPRESS + select PAM =20 config PCI_EXPRESS_GENERIC_BRIDGE bool diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig index e781995..5c1ffa7 100644 --- a/hw/tpm/Kconfig +++ b/hw/tpm/Kconfig @@ -4,6 +4,8 @@ config TPM_TIS =20 config TPM_CRB bool + default y + depends on TPM && PC =20 config TPM_PASSTHROUGH bool --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551728838429670.1723652686264; Mon, 4 Mar 2019 11:47:18 -0800 (PST) Received: from localhost ([127.0.0.1]:59907 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tYQ-00082t-Ab for importer@patchew.org; Mon, 04 Mar 2019 14:47:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45928) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCc-0001yE-TM for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCb-0004CD-IY for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:38 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:39621) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCb-00049w-86 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:37 -0500 Received: by mail-wr1-x42d.google.com with SMTP id l5so6631183wrw.6 for ; Mon, 04 Mar 2019 10:20:37 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:35 -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=towZouh3oIpJTuMLkTL9ZClqUXNOBRnWVcrjfLWlIyw=; b=bJPtbT6z4kqvR5LEZhOFt1GrCJpiVMqbEKkxGOv9XHauWQctOjG8m+7cuOzxig6504 TjJ/Xr8FSlKnKVB02wNNrtU56Uv9SAR61/fsRXG5lbXgDKkIb6jGNrAAY1Pv1dqllKwU N5nTo34OOBLDo3zF1YMb+Y2zrUpb0oPubyeFtykpJnoY6ljy5uCswMIcsQeTc56P4ifs qHa8fYY7eS2hagTyFX7u1T3h2x/JWQWSZNFs09CsCtOd5oNyXyyGlkQ6tId+IfDjUgHM mxZ8EwhvaVk8wEzwyMEYVlJ1ZqjocfJsYh67Ks4ii87tw1uGouHTGX/X/ib+tIiJleYe qqlw== 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=towZouh3oIpJTuMLkTL9ZClqUXNOBRnWVcrjfLWlIyw=; b=DYgu5un6mo/AiwN7DImNT1IKmRGHpssVc1vAXO4SXKXMoB1CQOuBaPQPz0jCchTwbF tnUjZHdTqe3P/ilUc4pHjIKgUTQKeBr2rgvUb4YQES0nAu0Ae74/0lY4bb+BGgIY9jSU dRrl3n1xBcHlCqE41kEpElKKO0UQAN2hFAzYPmdZeq/ZuprO/pnRaIkfiQF90JZiZacp TFPKHlRpHXm2FEEZXZa5E8E+74Pn8gv9Wn67CFMGtGjGSunz3mZHxoW4LRq5K2h/Lg26 nuwQstfFp2vhzyfe1HYZvvpyYw/EGMJg1F501QKW9cS+D6Yk/31+/+2G6M9S6kkVoTyy JxQA== X-Gm-Message-State: APjAAAWPEDpHG8MFYSCEBDQsTSiNKbppQhiAoQnvjutZxxH8mAs4v1U7 JGQc+lpc3ixffIOyxQf/tXUE/zAI X-Google-Smtp-Source: APXvYqwLp9zQeq56AJcvP8Lpg7w5YkJhRJGe3Hg44yU8HnAESsGDfTdeeCf6J+eGBXw59qeLK+s3XA== X-Received: by 2002:a5d:4e52:: with SMTP id r18mr12898210wrt.7.1551723635699; Mon, 04 Mar 2019 10:20:35 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:40 +0100 Message-Id: <1551723614-1823-21-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::42d Subject: [Qemu-devel] [PULL 20/54] i2c: express 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" Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Acked-by: Thomas Huth Message-Id: <20190123065618.3520-38-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 1 - default-configs/i386-softmmu.mak | 2 -- default-configs/mips-softmmu-common.mak | 1 - default-configs/ppc-softmmu.mak | 1 - default-configs/sh4-softmmu.mak | 1 - default-configs/sh4eb-softmmu.mak | 1 - hw/Makefile.objs | 2 +- hw/audio/Kconfig | 1 + hw/display/Kconfig | 3 +++ hw/gpio/Kconfig | 1 + hw/i2c/Kconfig | 6 ++++++ hw/i386/Kconfig | 1 + hw/input/Kconfig | 1 + hw/isa/Kconfig | 1 + hw/misc/Kconfig | 4 ++++ hw/nvram/Kconfig | 1 + hw/timer/Kconfig | 3 +++ 17 files changed, 23 insertions(+), 8 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 917b18d..8ced4e8 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -69,7 +69,6 @@ CONFIG_CADENCE=3Dy CONFIG_XGMAC=3Dy CONFIG_EXYNOS4=3Dy CONFIG_PXA2XX=3Dy -CONFIG_I2C=3Dy CONFIG_BITBANG_I2C=3Dy CONFIG_FRAMEBUFFER=3Dy CONFIG_XILINX_SPIPS=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index ed234c1..98552e1 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -24,8 +24,6 @@ CONFIG_NVDIMM=3Dy CONFIG_ACPI_NVDIMM=3Dy CONFIG_PXB=3Dy CONFIG_ACPI_VMGENID=3Dy -CONFIG_SMBUS_EEPROM=3Dy -CONFIG_I2C=3Dy CONFIG_PCI_DEVICES=3Dy =20 # Boards: diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index 45c599b..0795d52 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -33,7 +33,6 @@ CONFIG_MC146818RTC=3Dy CONFIG_EMPTY_SLOT=3Dy CONFIG_MIPS_CPS=3Dy CONFIG_MIPS_ITU=3Dy -CONFIG_I2C=3Dy CONFIG_R4K=3Dy CONFIG_MALTA=3Dy CONFIG_MIPSSIM=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index d4807b3..0e46d6a 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -32,7 +32,6 @@ CONFIG_USB_EHCI_SYSBUS=3Dy CONFIG_SM501=3Dy CONFIG_DDC=3Dy CONFIG_IDE_SII3112=3Dy -CONFIG_I2C=3Dy CONFIG_AT24C=3Dy CONFIG_BITBANG_I2C=3Dy CONFIG_M41T80=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 3f7fbe2..8b003e1 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -9,7 +9,6 @@ CONFIG_PFLASH_CFI02=3Dy CONFIG_SH4=3Dy CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy -CONFIG_I2C=3Dy CONFIG_DDC=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index 17f07a4..6f58242 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -9,7 +9,6 @@ CONFIG_PFLASH_CFI02=3Dy CONFIG_SH4=3Dy CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy -CONFIG_I2C=3Dy CONFIG_DDC=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 2d9b42d..82aa7fa 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -10,7 +10,7 @@ devices-dirs-$(CONFIG_SOFTMMU) +=3D display/ devices-dirs-$(CONFIG_SOFTMMU) +=3D dma/ devices-dirs-$(CONFIG_SOFTMMU) +=3D gpio/ devices-dirs-$(CONFIG_HYPERV) +=3D hyperv/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D i2c/ +devices-dirs-$(CONFIG_I2C) +=3D i2c/ devices-dirs-$(CONFIG_SOFTMMU) +=3D ide/ devices-dirs-$(CONFIG_SOFTMMU) +=3D input/ devices-dirs-$(CONFIG_SOFTMMU) +=3D intc/ diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig index 01aea55..e9c6fed 100644 --- a/hw/audio/Kconfig +++ b/hw/audio/Kconfig @@ -40,6 +40,7 @@ config PCSPK =20 config WM8750 bool + depends on I2C =20 config PL041 bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 4941773..fc129f6 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -24,9 +24,11 @@ config PL110 =20 config SII9022 bool + depends on I2C =20 config SSD0303 bool + depends on I2C =20 config SSD0323 bool @@ -71,6 +73,7 @@ config MILKYMIST_TMU2 =20 config SM501 bool + select I2C =20 config TCX bool diff --git a/hw/gpio/Kconfig b/hw/gpio/Kconfig index d0a4abf..9227cb5 100644 --- a/hw/gpio/Kconfig +++ b/hw/gpio/Kconfig @@ -1,5 +1,6 @@ config MAX7310 bool + depends on I2C =20 config PL061 bool diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig index d6d4402..74c9328 100644 --- a/hw/i2c/Kconfig +++ b/hw/i2c/Kconfig @@ -3,18 +3,24 @@ config I2C =20 config SMBUS_EEPROM bool + depends on I2C =20 config DDC bool + depends on I2C =20 config VERSATILE_I2C bool + select I2C =20 config ACPI_SMBUS bool + select I2C =20 config BITBANG_I2C bool + select I2C =20 config IMX_I2C bool + select I2C diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 081855e..9cd24d7 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -28,6 +28,7 @@ config PC_ACPI select ACPI_X86 select ACPI_CPU_HOTPLUG select ACPI_MEMORY_HOTPLUG + select SMBUS_EEPROM depends on ACPI_SMBUS =20 config I440FX diff --git a/hw/input/Kconfig b/hw/input/Kconfig index 814f87f..e05b7be 100644 --- a/hw/input/Kconfig +++ b/hw/input/Kconfig @@ -3,6 +3,7 @@ config ADB =20 config LM832X bool + depends on I2C =20 config PCKBD bool diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index 6f0812d..fcd87b4 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -19,6 +19,7 @@ config PIIX4 config VT82C686 bool select ISA_BUS + select ACPI_SMBUS =20 config SMC37C669 bool diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 41d8633..5f63701 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -7,9 +7,11 @@ config MAX111X =20 config TMP105 bool + depends on I2C =20 config TMP421 bool + depends on I2C =20 config ISA_DEBUG bool @@ -36,6 +38,7 @@ config EDU =20 config PCA9552 bool + depends on I2C =20 config PL310 bool @@ -102,5 +105,6 @@ config PVPANIC =20 config AUX bool + select I2C =20 source macio/Kconfig diff --git a/hw/nvram/Kconfig b/hw/nvram/Kconfig index 1f5ec95..ebaa749 100644 --- a/hw/nvram/Kconfig +++ b/hw/nvram/Kconfig @@ -3,6 +3,7 @@ config DS1225Y =20 config AT24C bool + depends on I2C =20 config MAC_NVRAM bool diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index 7dbc121..e1a6e74 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -9,6 +9,7 @@ config A9_GTIMER =20 config DS1338 bool + depends on I2C =20 config HPET bool @@ -18,6 +19,7 @@ config I8254 =20 config M41T80 bool + depends on I2C =20 config M48T59 bool @@ -27,6 +29,7 @@ config PL031 =20 config TWL92230 bool + depends on I2C =20 config XLNX_ZYNQMP bool --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551727852656414.3321147285743; Mon, 4 Mar 2019 11:30:52 -0800 (PST) Received: from localhost ([127.0.0.1]:59669 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tIV-0002EE-3T for importer@patchew.org; Mon, 04 Mar 2019 14:30:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCe-00020E-BH for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCc-0004EV-VJ for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:40 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:38430) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCc-0004Cv-Hk for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:38 -0500 Received: by mail-wr1-x435.google.com with SMTP id g12so6639441wrm.5 for ; Mon, 04 Mar 2019 10:20:38 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:36 -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=uSL6hbhpji0QFU4wHrMafpVQwBl0xAyDQ8WV2GL7wDM=; b=RUa8pi/ltW/FQHEyrBmbx26wIWV8gh2UfBcPKYI+G7l2FBdkNsWQOXJnX8PxGMlfgE RNCLR4ZHHrwR6P07BN8Gerri8hOTioG2eLuiUagGWjYy8AjDAtemZYXNsIaZqn9GNxOM /Z2TCdprXBh2m1Q02laqykzkZvWaiX1LextaFbfxYL1+oy28vsQqis7tx2ix6KR+3WkZ r74aPwYOBtbeHu4wQU+RHAxWxQGhga5prbt7GzspJv0n59bWmy/GGhh5JcgvQolJetuX VdwFcsQEBOZo4LBaXIwpEwkCfNVP5scet9z9cPDdf4u3pYTUUUF4yAtOXS7MZe6e9D6H Irfg== 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=uSL6hbhpji0QFU4wHrMafpVQwBl0xAyDQ8WV2GL7wDM=; b=sv80WElfTc78285tktblBbEDBqycOikD3UzEClsRG3jIsp/h+/A0TN5ZKCssE3ZzOJ vCh1/Kdkh1Wx3TJDd214VcDei81LR9//GHq3imm/j9fu6gg3B3l+9hnm+U3ARAjgwDMw bUcRhPogSxIA2k4z9Hn5+T5N1aH6Oqh9Pmw00vUe+3MosEVzUQnmYFaxGAB05cLL0snj 2ktQHvJik4eiUrrkMHtI/Hj1fFwE/94uf0FvYC/3FJGiy65+tu7BTmLdnpjtk263fLeT oqsfY2a5kpRlDginZ2GgpW5ttw5nOv4GzXPHmJZ+DgF2rsy1Z6i+A9JY9Emrq0FZgiaJ CkfQ== X-Gm-Message-State: APjAAAXff1T5JZmpVOKOlO0ClbZUtPJghhlMnPx2wNjSryoZFMmwkeTM qeKzNVGJY5ckHeb8YKxpVLYmJYDC X-Google-Smtp-Source: APXvYqyLq3iAq/iwyuPlgM4mcm4DutmnIvBoD6hECrUbA+ieSLFkSPLNxMGuRKrUoW9IOC/rh9CUAA== X-Received: by 2002:a5d:4a05:: with SMTP id m5mr14240407wrq.46.1551723636798; Mon, 04 Mar 2019 10:20:36 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:41 +0100 Message-Id: <1551723614-1823-22-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::435 Subject: [Qemu-devel] [PULL 21/54] ptimer: express 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" Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-39-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 1 - default-configs/cris-softmmu.mak | 1 - default-configs/lm32-softmmu.mak | 1 - default-configs/m68k-softmmu.mak | 1 - default-configs/microblaze-softmmu.mak | 1 - default-configs/nios2-softmmu.mak | 1 - default-configs/ppc-softmmu.mak | 1 - default-configs/sh4-softmmu.mak | 1 - default-configs/sh4eb-softmmu.mak | 1 - default-configs/sparc-softmmu.mak | 1 - default-configs/sparc64-softmmu.mak | 1 - default-configs/unicore32-softmmu.mak | 1 - hw/Kconfig | 2 ++ hw/arm/Kconfig | 4 ++++ hw/cris/Kconfig | 1 + hw/lm32/Kconfig | 2 ++ hw/m68k/Kconfig | 2 ++ hw/mips/Kconfig | 1 + hw/misc/Kconfig | 1 + hw/net/Kconfig | 2 ++ hw/sh4/Kconfig | 1 + hw/sparc/Kconfig | 2 ++ hw/timer/Kconfig | 6 ++++++ hw/unicore32/Kconfig | 1 + hw/watchdog/Kconfig | 1 + 25 files changed, 26 insertions(+), 12 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 8ced4e8..b7b0542 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -6,7 +6,6 @@ CONFIG_VGA=3Dy CONFIG_NAND=3Dy CONFIG_ECC=3Dy CONFIG_SERIAL=3Dy -CONFIG_PTIMER=3Dy CONFIG_SD=3Dy CONFIG_MAX7310=3Dy CONFIG_WM8750=3Dy diff --git a/default-configs/cris-softmmu.mak b/default-configs/cris-softmm= u.mak index a637c4b..b3cae59 100644 --- a/default-configs/cris-softmmu.mak +++ b/default-configs/cris-softmmu.mak @@ -2,6 +2,5 @@ =20 CONFIG_ETRAXFS=3Dy CONFIG_NAND=3Dy -CONFIG_PTIMER=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_AXIS=3Dy diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmm= u.mak index ef0f4ba..f489838 100644 --- a/default-configs/lm32-softmmu.mak +++ b/default-configs/lm32-softmmu.mak @@ -3,7 +3,6 @@ CONFIG_LM32=3Dy CONFIG_MILKYMIST=3Dy CONFIG_FRAMEBUFFER=3Dy -CONFIG_PTIMER=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_SD=3Dy diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmm= u.mak index 27f5274..a12eece 100644 --- a/default-configs/m68k-softmmu.mak +++ b/default-configs/m68k-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for m68k-softmmu =20 CONFIG_COLDFIRE=3Dy -CONFIG_PTIMER=3Dy CONFIG_AN5206=3Dy CONFIG_MCF5208=3Dy diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/micro= blaze-softmmu.mak index 14837cf..a4a6770 100644 --- a/default-configs/microblaze-softmmu.mak +++ b/default-configs/microblaze-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for microblaze-softmmu =20 -CONFIG_PTIMER=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_SERIAL=3Dy CONFIG_XILINX=3Dy diff --git a/default-configs/nios2-softmmu.mak b/default-configs/nios2-soft= mmu.mak index ab42d0f..b3c507e 100644 --- a/default-configs/nios2-softmmu.mak +++ b/default-configs/nios2-softmmu.mak @@ -2,6 +2,5 @@ =20 CONFIG_NIOS2=3Dy CONFIG_SERIAL=3Dy -CONFIG_PTIMER=3Dy CONFIG_ALTERA_TIMER=3Dy CONFIG_NIOS2_10M50=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 0e46d6a..0dcd863 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -14,7 +14,6 @@ CONFIG_OPENPIC=3Dy CONFIG_PPCE500_PCI=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_PFLASH_CFI02=3Dy -CONFIG_PTIMER=3Dy CONFIG_I8259=3Dy CONFIG_XILINX=3Dy CONFIG_XILINX_ETHLITE=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 8b003e1..7172c8b 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -4,7 +4,6 @@ CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy -CONFIG_PTIMER=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_SH4=3Dy CONFIG_IDE_MMIO=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index 6f58242..3622afc 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -4,7 +4,6 @@ CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy -CONFIG_PTIMER=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_SH4=3Dy CONFIG_IDE_MMIO=3Dy diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-soft= mmu.mak index 805c400..b31a9f2 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -5,7 +5,6 @@ CONFIG_ECC=3Dy CONFIG_ESP=3Dy CONFIG_ESCC=3Dy CONFIG_M48T59=3Dy -CONFIG_PTIMER=3Dy CONFIG_FDC=3Dy CONFIG_EMPTY_SLOT=3Dy CONFIG_PCNET_COMMON=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index 2d23b0c..528af8f 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -3,7 +3,6 @@ CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_M48T59=3Dy -CONFIG_PTIMER=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_PARALLEL=3Dy diff --git a/default-configs/unicore32-softmmu.mak b/default-configs/unicor= e32-softmmu.mak index 5f6c4a8..17a7915 100644 --- a/default-configs/unicore32-softmmu.mak +++ b/default-configs/unicore32-softmmu.mak @@ -1,5 +1,4 @@ # Default configuration for unicore32-softmmu CONFIG_ISA_BUS=3Dy CONFIG_PUV3=3Dy -CONFIG_PTIMER=3Dy CONFIG_PCKBD=3Dy diff --git a/hw/Kconfig b/hw/Kconfig index f902c8f..d5ecd02 100644 --- a/hw/Kconfig +++ b/hw/Kconfig @@ -66,6 +66,8 @@ config TEST_DEVICES =20 config XILINX bool + select PTIMER # for hw/timer/xilinx_timer.c =20 config XILINX_AXI bool + select PTIMER # for hw/dma/xilinx_axidma.c diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 9eab67b..d298fbd 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -4,9 +4,11 @@ config ARM_VIRT =20 config DIGIC bool + select PTIMER =20 config EXYNOS4 bool + select PTIMER =20 config HIGHBANK bool @@ -19,6 +21,7 @@ config MAINSTONE =20 config MUSICPAL bool + select PTIMER =20 config NETDUINO2 bool @@ -94,6 +97,7 @@ config NRF51_SOC =20 config MSF2 bool + select PTIMER =20 config ZAURUS bool diff --git a/hw/cris/Kconfig b/hw/cris/Kconfig index 86954ab..b7738ab 100644 --- a/hw/cris/Kconfig +++ b/hw/cris/Kconfig @@ -3,3 +3,4 @@ config AXIS =20 config ETRAXFS bool + select PTIMER diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig index 84c530e..4f45840 100644 --- a/hw/lm32/Kconfig +++ b/hw/lm32/Kconfig @@ -1,5 +1,7 @@ config LM32 bool + select PTIMER =20 config MILKYMIST bool + select PTIMER diff --git a/hw/m68k/Kconfig b/hw/m68k/Kconfig index cd66ada..8e91eda 100644 --- a/hw/m68k/Kconfig +++ b/hw/m68k/Kconfig @@ -3,6 +3,8 @@ config AN5206 =20 config MCF5206 bool + select PTIMER =20 config MCF5208 bool + select PTIMER diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index 348c9bf..cdc07e5 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -15,6 +15,7 @@ config FULONG =20 config MIPS_CPS bool + select PTIMER =20 config MIPS_BOSTON bool diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 5f63701..2433d1b 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -68,6 +68,7 @@ config ECCMEMCTL =20 config IMX bool + select PTIMER =20 config STM32F2XX_SYSCFG bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index a309831..86b880b 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -45,6 +45,7 @@ config SMC91C111 =20 config LAN9118 bool + select PTIMER =20 config NE2000_ISA bool @@ -97,6 +98,7 @@ config VIRTIO_NET =20 config ETSEC bool + select PTIMER =20 config ROCKER bool diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 417a72f..1ea2bc3 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -9,3 +9,4 @@ config SH7750 =20 config SH4 bool + select PTIMER diff --git a/hw/sparc/Kconfig b/hw/sparc/Kconfig index 3795754..c9c2142 100644 --- a/hw/sparc/Kconfig +++ b/hw/sparc/Kconfig @@ -6,6 +6,8 @@ config LEON3 =20 config GRLIB bool + select PTIMER =20 config SLAVIO bool + select PTIMER diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index e1a6e74..a021c74 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -1,8 +1,10 @@ config ARM_TIMER bool + select PTIMER =20 config ARM_MPTIMER bool + select PTIMER =20 config A9_GTIMER bool @@ -36,12 +38,14 @@ config XLNX_ZYNQMP =20 config ALTERA_TIMER bool + select PTIMER =20 config MC146818RTC bool =20 config ALLWINNER_A10_PIT bool + select PTIMER =20 config STM32F2XX_TIMER bool @@ -51,6 +55,8 @@ config SUN4V_RTC =20 config CMSDK_APB_TIMER bool + select PTIMER =20 config CMSDK_APB_DUALTIMER bool + select PTIMER diff --git a/hw/unicore32/Kconfig b/hw/unicore32/Kconfig index b3cf294..a03a996 100644 --- a/hw/unicore32/Kconfig +++ b/hw/unicore32/Kconfig @@ -1,2 +1,3 @@ config PUV3 bool + select PTIMER diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig index 35ccb72..2118d89 100644 --- a/hw/watchdog/Kconfig +++ b/hw/watchdog/Kconfig @@ -1,5 +1,6 @@ config CMSDK_APB_WATCHDOG bool + select PTIMER =20 config WDT_IB6300ESB bool --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551727215214329.05040591712293; Mon, 4 Mar 2019 11:20:15 -0800 (PST) Received: from localhost ([127.0.0.1]:59484 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0t8C-0001I5-5l for importer@patchew.org; Mon, 04 Mar 2019 14:20:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45949) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCd-0001zO-S3 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCd-0004Ei-5C for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:39 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:51343) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCc-0004DF-Tl for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:39 -0500 Received: by mail-wm1-x344.google.com with SMTP id n19so140826wmi.1 for ; Mon, 04 Mar 2019 10:20:38 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:37 -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=3cxC0cF9uO3QqXzabxeIJmGIPf7DF+3f4XOfrQ2OsY0=; b=X7PrNQnhUAS5xr4xW2IoPK4h/qls40c4bpizR1Mm+pImxj8yp1y4DgukJsg+71jCbz rtfwjiAuvfGu82DVEiyZlA5bAVDoMfSkwMaKqvrMekc0yq/sPS1s2cWro39ttBkyn0eP bQn8rD9hOgXvlgPhgkN1OWMxN8Hkx2BwGrxzZE0cYTZnh9tgpJfQ0I1rQfg7twonX1Or xZ30u7bvjpcubeTmktY8j5zBMqhjIXWACltDMuh/fT9pfOILTRXqtTTFbDhjieRsuDxr e7oj81fA9lDjSPNAaMATGnTCtDz6nUcf3jHKLNfmoL5UwgiFEAswXKr5hVDQjLN2NpN+ Gpxw== 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=3cxC0cF9uO3QqXzabxeIJmGIPf7DF+3f4XOfrQ2OsY0=; b=k4c1r8YvuDfRxQeguEyS7f/7EtbtTUgZF1NXO+Cj/j++3dadwBs13CrizfSd3C+LIf sJ4rjslctO+7cufzj8VjSTTlEvez4CmSI8nYWOJLFZ5p/FsI8EM9j3keQD2p8aNPtM6r II8UjS9TmZ4p97HZU5YUyFKifQ3pSApHSS0E6oQIOtY5u11BmerjgWKiXLAuDLrKHiOC C8z/1tJv8+zr8z/e8CmDLwthjFnSWxsJ3KjYUCPtlF9xIpW5ruTEjV1YbcMUzpvyELzb G2dEM4h8SFbsl348lnUP1RdaU3VaBiFjwYrwBji+UOdTfEw4FN/df872bwcLa8eZvbSm qpFg== X-Gm-Message-State: APjAAAWfkO2S5s4s40kFeBM2+QL6f3qCuwIaEe6DZzQYcGrl3YQot59Q X+VG9Lx2u8y6ElWLnQa6SFv5bho3 X-Google-Smtp-Source: APXvYqw47oejWtOlwF4kzBpJYEcyQRCWn10YcLWOh6ubTjGKELxYG+J0N8UFxgPwXx0/rb7vy0uyvg== X-Received: by 2002:a7b:c017:: with SMTP id c23mr284575wmb.50.1551723637603; Mon, 04 Mar 2019 10:20:37 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:42 +0100 Message-Id: <1551723614-1823-23-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::344 Subject: [Qemu-devel] [PULL 22/54] display: express 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-40-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/ppc-softmmu.mak | 1 - default-configs/sh4-softmmu.mak | 1 - default-configs/sh4eb-softmmu.mak | 1 - hw/display/Kconfig | 6 +++++- hw/i2c/Kconfig | 1 + 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 0dcd863..d1ee6f7 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -29,7 +29,6 @@ CONFIG_PCI_EXPRESS=3Dy CONFIG_SAM460EX=3Dy CONFIG_USB_EHCI_SYSBUS=3Dy CONFIG_SM501=3Dy -CONFIG_DDC=3Dy CONFIG_IDE_SII3112=3Dy CONFIG_AT24C=3Dy CONFIG_BITBANG_I2C=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 7172c8b..ccefc10 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -8,7 +8,6 @@ CONFIG_PFLASH_CFI02=3Dy CONFIG_SH4=3Dy CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy -CONFIG_DDC=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy CONFIG_I8259=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index 3622afc..c8edeb7 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -8,7 +8,6 @@ CONFIG_PFLASH_CFI02=3Dy CONFIG_SH4=3Dy CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy -CONFIG_DDC=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy CONFIG_I8259=3Dy diff --git a/hw/display/Kconfig b/hw/display/Kconfig index fc129f6..5529d0f 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -38,6 +38,7 @@ config VGA_PCI default y if PCI_DEVICES depends on PCI select VGA + select EDID =20 config VGA_ISA bool @@ -59,6 +60,7 @@ config BOCHS_DISPLAY default y if PCI_DEVICES depends on PCI select VGA + select EDID =20 config BLIZZARD bool @@ -69,11 +71,13 @@ config FRAMEBUFFER config MILKYMIST_TMU2 bool default y - depends on OPENGL && X11 + depends on OPENGL && X11 && MILKYMIST =20 config SM501 bool select I2C + select DDC + select SERIAL =20 config TCX bool diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig index 74c9328..ef1caa6 100644 --- a/hw/i2c/Kconfig +++ b/hw/i2c/Kconfig @@ -8,6 +8,7 @@ config SMBUS_EEPROM config DDC bool depends on I2C + select EDID =20 config VERSATILE_I2C bool --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551727394073896.5008919360586; Mon, 4 Mar 2019 11:23:14 -0800 (PST) Received: from localhost ([127.0.0.1]:59539 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tB9-0003qG-2j for importer@patchew.org; Mon, 04 Mar 2019 14:23:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCg-00022L-Ar for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCe-0004HU-6G for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:42 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:41391) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCd-0004F1-TP for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:40 -0500 Received: by mail-wr1-x441.google.com with SMTP id n2so6633538wrw.8 for ; Mon, 04 Mar 2019 10:20:39 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:37 -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=9+taIAs5qS6lXBtWeRZlgtk31S3Ux4tUyoP9Z9Eboc8=; b=ddHu7m8ATmZnS4fqxp2JJBvAeSRc/yLJbrAJGWMeaJXORg+O5KifHfM0uoO5jdzb03 Ih3NcZthy2qmSGxbUloARCxDjBFBekWgaHKUNK4d3XmaLe5cuK3BFyVDD37oiAot4Qd3 FvDiAwmsX/iwYtwKkaKTcfrvqnTtCUe8fcvijvn0MxYf+8ayOmFN2LiNqHn+jb0rZOrM kuTku7C06RvWIqaTZ521/4fE1EAhsR5xwGVZ3LKZaJrtMH6ElLADdYrs02B7kdVcMQrk OwTFlfb/TrFS75MLFLF22iGBdiE/jGZ2+Hb/kC3XD31kfkYRm2vdSWkRvsuHDLvnBPfA W2qA== 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=9+taIAs5qS6lXBtWeRZlgtk31S3Ux4tUyoP9Z9Eboc8=; b=dgSdMdxwhfYaSPzB6V+xEeSXszw9hUhgz68lgMxSuY53NCsJXV7gRBoRzdyJQgwu0V K64CUz2iKNC2b84hIj/tO3bxEmVdAOAx8nOJpifNIBAny8Tpqxn5WtixlJkjuDNWKIEL nxkZhg5SjlZV11Q8Z4ORYk3C8GRkJrj/m3wubW2yti/A1zOkORxIXjOui8G7lrJJ7m1b yrMMrXmjN70yB0gBiXGf/lF9XyY4O3gcC76Mnu92ADM26WG8G6vHQB8XLLOEB4KCJnzf Wt5dLf7e/duDaU594U+PAjBXCc2ELxTIA8oLsHO/hoQLvbtMWihJ7Z8kv9Aimtg3C2Bl 5mpg== X-Gm-Message-State: APjAAAUKl4H6DALgrqMiLg1Otp3FrjLCE/5h9zuk3qUlPKnes8TJgNvu H5/fk9L/qlKYUd3Ej2Ny5BEwQlDK X-Google-Smtp-Source: APXvYqzMJkupTIF++K/kksEDNJ2u6e6nn7Lkaf7VOzC1XHcN3dwe+2+ekLI6rL0qrmCNjL1YH7ES5A== X-Received: by 2002:adf:fcc2:: with SMTP id f2mr14968172wrs.154.1551723638512; Mon, 04 Mar 2019 10:20:38 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:43 +0100 Message-Id: <1551723614-1823-24-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::441 Subject: [Qemu-devel] [PULL 23/54] hyperv: express 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 remove default-configs/hyperv.mak and make dependencies with Kconfig. Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-41-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/hyperv.mak | 1 - default-configs/i386-softmmu.mak | 1 - hw/hyperv/Kconfig | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 default-configs/hyperv.mak diff --git a/default-configs/hyperv.mak b/default-configs/hyperv.mak deleted file mode 100644 index bc38061..0000000 --- a/default-configs/hyperv.mak +++ /dev/null @@ -1 +0,0 @@ -CONFIG_HYPERV_TESTDEV=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 98552e1..c0826f5 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for i386-softmmu =20 -include hyperv.mak CONFIG_VMXNET3_PCI=3Dy CONFIG_VIRTIO_VGA=3Dy CONFIG_IPMI=3Dy diff --git a/hw/hyperv/Kconfig b/hw/hyperv/Kconfig index 632c3a6..a1fa8ff 100644 --- a/hw/hyperv/Kconfig +++ b/hw/hyperv/Kconfig @@ -4,3 +4,5 @@ config HYPERV =20 config HYPERV_TESTDEV bool + default y if TEST_DEVICES + depends on HYPERV --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551728428118836.4572403420269; Mon, 4 Mar 2019 11:40:28 -0800 (PST) Received: from localhost ([127.0.0.1]:59786 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tRo-0001ec-03 for importer@patchew.org; Mon, 04 Mar 2019 14:40:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45988) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCi-00024f-7i for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCg-0004M3-C0 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:44 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:40562) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCe-0004HP-MM for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:41 -0500 Received: by mail-wr1-x42d.google.com with SMTP id q1so6646752wrp.7 for ; Mon, 04 Mar 2019 10:20:40 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:38 -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=5QHWgYecbFtNru851NMz5keNL2Vhe899X7hOcVnXWlo=; b=aZ13ge78uGValygUVU4NNEkWwpVcyHK0HO+wCbj8vY/DLplWWDEQO9xAtRHX1/4sQ3 sqxOGPh1kxw/v0BraJhhgOGLYIz/OpY2oG3ie2R79cn3jwJ7OpxmojHlM4QhooiY/DH8 I5BRo56tDbnCxmJWpWYVHwWkz8MzVlFaWM4SnwtcAJDUYg92TxAEzBDQddvJnpdR5G7f dKze5cvZi6EyaWtpLuyDglNHZssH4ORH/C70YQR+6UgiEiH+2hjlYmZuu95Dd9y8mLs3 3sY7H9/43UpmbEB2Myyo5JjtIGD3l/vdKuhy3qGpKfTcTqkWTxusGKe0QtkDqcOqntGG 6GHw== 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=5QHWgYecbFtNru851NMz5keNL2Vhe899X7hOcVnXWlo=; b=TGtKvPVVwP1al+VTbt7gPwD1C6N9yYt/QyQhZm3NZ/JA3q8Og+bTRkAIJUcj86Wb+6 PMMUEo4WtS2zvfE6LBi1DSvQqNWlCKfJy+vP9nIoxLI13DaJ+4w0j0PMs4PT3nCRncbd 0gezyC8FwMxAWkevm4GDg3cUEzl0TGZHr9spmrmro+Be29LLI3J3S0fTA87vG7gLgH/T duocklM5WpN+0cdL3tEl6YAZ78wRsuBd3yG2v3jHH+Vt3XyuZyTzsebONJPXpjjf89ai fRwodlR4B4IPtN6/XHrRJg8vz2OqWT1Q4RuakANTzCBP34Uyfvr89OqP4weldDZJ4yGg rKhw== X-Gm-Message-State: APjAAAXEWFYnxlWebzAppXcNZo1Ul9vzUDbMKtokm0V4kOgGEf1tZBAc K5zZMGtX2Kjlol3u3IF5ex7yxhL0 X-Google-Smtp-Source: APXvYqy7aUADAbBCF1P2oxxoF7kOp69n1ClEyuQ4fotTm4Y0iu4UUG04IYZyKZ+N2Lw68a1Bp/IXRA== X-Received: by 2002:adf:8061:: with SMTP id 88mr12987470wrk.77.1551723639601; Mon, 04 Mar 2019 10:20:39 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:44 +0100 Message-Id: <1551723614-1823-25-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::42d Subject: [Qemu-devel] [PULL 24/54] vfio: express vfio 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" Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 2 -- hw/vfio/Kconfig | 13 ++++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index b7b0542..40e1a1a 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -123,8 +123,6 @@ CONFIG_VERSATILE_I2C=3Dy =20 CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy -CONFIG_VFIO_XGMAC=3Dy -CONFIG_VFIO_AMD_XGBE=3Dy =20 CONFIG_SDHCI=3Dy CONFIG_INTEGRATOR=3Dy diff --git a/hw/vfio/Kconfig b/hw/vfio/Kconfig index 0fdff10..ebda9fd 100644 --- a/hw/vfio/Kconfig +++ b/hw/vfio/Kconfig @@ -9,21 +9,28 @@ config VFIO_PCI =20 config VFIO_CCW bool + default y select VFIO - depends on LINUX + depends on LINUX && S390_CCW_VIRTIO =20 config VFIO_PLATFORM bool + default y select VFIO - depends on LINUX + depends on LINUX && PLATFORM_BUS =20 config VFIO_XGMAC bool + default y + depends on VFIO_PLATFORM =20 config VFIO_AMD_XGBE bool + default y + depends on VFIO_PLATFORM =20 config VFIO_AP bool + default y select VFIO - depends on LINUX + depends on LINUX && S390_CCW_VIRTIO --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 From nobody Sun Oct 5 00:06:42 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 1551727572913143.14153465919674; Mon, 4 Mar 2019 11:26:12 -0800 (PST) Received: from localhost ([127.0.0.1]:59595 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tE0-0006Ol-UK for importer@patchew.org; Mon, 04 Mar 2019 14:26:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46017) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCm-00028u-2o for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCl-0004Te-6t for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:47 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:40798) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCi-0004LX-9R for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:46 -0500 Received: by mail-wr1-x442.google.com with SMTP id q1so6646860wrp.7 for ; Mon, 04 Mar 2019 10:20:42 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:40 -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=WSGm6UTTHC7SJyM0dNrOunBwk+YIEY03ISRL6Mibrvk=; b=Q9jgf716/4zHJr/Zn8ODMzWJ/RKwxRqRawdZXRVAuumG8qV09YVpf/ot2o/jsCR+c3 ow+QaV4oNDRQAxze13RQXQkzlAHlI2edODoB5Tea+s6ZzMox+0+8KZUNHmqgkr7+7GGs VaG208anxxNzbyfJ+5tNSRaOH1K1PwLaMaVNLm+7iH904eiEoXgIK79W6PO+OPRQe+Bx tvAqcO3XD2MMNlVVnUbDKgwG71jSfOyPKnfLsHc//rKpZCyxmzhNaZQ/jelIPFwRQvqY ai7Dncw0TS+jHyhm0g3ITebgNepO6rq0zpXAABJpm/md27cF+uBI4Xr1F1XhqvQGvWyw F22A== 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=WSGm6UTTHC7SJyM0dNrOunBwk+YIEY03ISRL6Mibrvk=; b=L2XG8uHDsH1L+i/8Wv2WghMYqQBaJHKvL6ceTM4+dQ2oRRRv3IsaGmbl3JbVOlZVKQ EKCvMz6eunmayXo4Mhl/vCv4ue+qt2aWhcGHJgilT5w1fEF0a1lgTt4yGI3mPYvrwDnq 0Pc5hE06I24/mWglSbtKYSpcQLXQlCfWDGkKPMu1t6Nknpr959uHLtD1KH30z7+vHCsV vP1Ei9H5hQ+qcoSfutAIucxtquB7NVAd/T05yHUqagQv8p7+kxs3FrCioN4fCZrr67g/ lWpdt1s/uF+76hKWLDVdecXoIir7xRMIh27CC10BTgtq5oCkTGUNqGQC5LgxVfZa/gaq fGsw== X-Gm-Message-State: APjAAAXXl+/NDw93ojP6zeLWWZ3luURTIT0OdAizbwSvaBdqlNjrOrG6 j35udJIn0QJcTSV4TxYcQ3xGEkbl X-Google-Smtp-Source: APXvYqw7/GO+s3jTDlOWgpLxxysfreuFdpyiMGaNIg8VHk45JaXPwkrxEdmQPBQMyIJneZp6TM6GuA== X-Received: by 2002:a5d:650d:: with SMTP id x13mr13729098wru.119.1551723641487; Mon, 04 Mar 2019 10:20:41 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:46 +0100 Message-Id: <1551723614-1823-27-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::442 Subject: [Qemu-devel] [PULL 26/54] tpm: express 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" This automatically removes the SCSI subsystem from the binary altogether if no controllers are selected. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-34-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- hw/i386/Kconfig | 1 + hw/tpm/Kconfig | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 9cd24d7..ea72f48 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -7,6 +7,7 @@ config PC imply HYPERV imply QXL imply SEV + imply TPM_CRB imply TPM_TIS select FDC select I8259 diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig index 5c1ffa7..09adf32 100644 --- a/hw/tpm/Kconfig +++ b/hw/tpm/Kconfig @@ -1,14 +1,23 @@ +config TPMDEV + bool + depends on TPM + config TPM_TIS bool depends on TPM && ISA_BUS + select TPMDEV =20 config TPM_CRB bool - default y - depends on TPM && PC + depends on TPM + select TPMDEV =20 config TPM_PASSTHROUGH bool + default y + depends on TPMDEV && LINUX =20 config TPM_EMULATOR bool + default y + depends on TPMDEV --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551729219656152.21384036322922; Mon, 4 Mar 2019 11:53:39 -0800 (PST) Received: from localhost ([127.0.0.1]:59993 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0teX-0004hq-Da for importer@patchew.org; Mon, 04 Mar 2019 14:53:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCn-0002Af-Pa for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCl-0004TZ-6n for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:48 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:43861) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCi-0004NC-9k for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:46 -0500 Received: by mail-wr1-x42d.google.com with SMTP id d17so6637515wre.10 for ; Mon, 04 Mar 2019 10:20:43 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:41 -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=+3VzXtjhEDlHF1KqE0GGRgSgdOL3/2eWelfK1vTqWlo=; b=BwsOTMu6xXTr5ouFkfaFyb+d23RxrzMXQXSRiQ8XJQ+G74gh1r4cnW5G0PsgkLT15w gd/7ksY50PXcWeGRilgVGZBex8P9hz3wAdtDhC+zgDRaQ1eoURwuUzpGxkvE8oJjDjiF y18SkGdENeuQumYG9eO3stWRUJ89xzIpSzfJWHcc8NheNp7tR4U0lhfgY0YydyxTpIm0 QRLJBtocpbtffkPH5LeTJQ3OGzyGOZ3BRJomo8Yj2JLJX3sFOz73Y+yRrUKXJS0vvUPM 3gmHQZJ7izBsv1khBwQtnYgjv7usmpPrB31reACHfQgsCVDjmLhCoQJOA2qoYs1PgHwT mbTA== 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=+3VzXtjhEDlHF1KqE0GGRgSgdOL3/2eWelfK1vTqWlo=; b=oBkjHICqz+lhsNOubaeQOB1RM2Ms2o16taGYRy2bsx/Qc+1elYMqvnD0WpfjTmxYyr qMqNaSCw3qxnUDzVAa9rPjIcf2FCbBU2FgB+1/h8PB7GHBpdHJWbUsrA1sxYQXHVNIuR Rvrd4MearglPqyi8Lwn5a0Yd0xRUupp5gW5rjy72dwc9udXEByWmqNJoqqGNppJ3lEQt f33nprQoYRWmp3QghAEV6Uupae+ztcW2a+cuSH5GUH6UtIJgiYfXpMR05o4XlysG61YG UfK4Z3p0W4rtN/cHauKX723trBlutzFDvqFtZn88STkItVnK13h/Rj0UoQPNQwOpx79C Juyg== X-Gm-Message-State: APjAAAUOw2OEAdqq59+zdgiTuwlhyWl2p+hJdpK195L7HB93S+wTKIqR inhIwDrGMwf633dJ3Ttk15vUgiCa X-Google-Smtp-Source: APXvYqwyv2DarkrdBTK2Z7YBMemwbvOzHMjbZJ2cI1Ey2BJNlkP2EAPh7Z32OOl03D1KYoWCjgtAeQ== X-Received: by 2002:a05:6000:1142:: with SMTP id d2mr13266791wrx.43.1551723642437; Mon, 04 Mar 2019 10:20:42 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:47 +0100 Message-Id: <1551723614-1823-28-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::42d Subject: [Qemu-devel] [PULL 27/54] isa: express SuperIO 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" Signed-off-by: Paolo Bonzini --- default-configs/alpha-softmmu.mak | 5 ----- default-configs/ppc-softmmu.mak | 9 --------- default-configs/sh4-softmmu.mak | 9 ++------- default-configs/sh4eb-softmmu.mak | 6 ------ hw/block/Kconfig | 5 +++-- hw/isa/Kconfig | 21 +++++++++++++++++++++ 6 files changed, 26 insertions(+), 29 deletions(-) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index f0c1928..762e3a2 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -2,13 +2,8 @@ =20 CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy -CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy CONFIG_I82374=3Dy CONFIG_I8254=3Dy -CONFIG_I8257=3Dy -CONFIG_PARALLEL=3Dy -CONFIG_FDC=3Dy CONFIG_PCKBD=3Dy CONFIG_VGA_CIRRUS=3Dy CONFIG_VMWARE_VGA=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index d1ee6f7..9ad307a 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -9,12 +9,10 @@ CONFIG_TEST_DEVICES=3Dy CONFIG_PPC4XX=3Dy CONFIG_M48T59=3Dy CONFIG_SERIAL=3Dy -CONFIG_I8257=3Dy CONFIG_OPENPIC=3Dy CONFIG_PPCE500_PCI=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_PFLASH_CFI02=3Dy -CONFIG_I8259=3Dy CONFIG_XILINX=3Dy CONFIG_XILINX_ETHLITE=3Dy CONFIG_E500=3Dy @@ -58,17 +56,10 @@ CONFIG_MAC_NEWWORLD=3Dy # For PReP CONFIG_PREP=3Dy CONFIG_PREP_PCI=3Dy -CONFIG_SERIAL_ISA=3Dy -CONFIG_MC146818RTC=3Dy CONFIG_RS6000_MC=3Dy -CONFIG_PARALLEL=3Dy CONFIG_I82374=3Dy CONFIG_I82378=3Dy -CONFIG_I8254=3Dy CONFIG_PCKBD=3Dy -CONFIG_FDC=3Dy CONFIG_NE2000_ISA=3Dy CONFIG_PC87312=3Dy -CONFIG_PCSPK=3Dy -CONFIG_IDE_ISA=3Dy CONFIG_CS4231A=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index ccefc10..4ba5584 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -1,20 +1,15 @@ -# Default configuration for sh4-softmmu +# Default configuration for sh4eb-softmmu =20 CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_SH4=3Dy CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy -CONFIG_I8259=3Dy -CONFIG_I8254=3Dy -CONFIG_PCSPK=3Dy CONFIG_I82374=3Dy -CONFIG_I8257=3Dy -CONFIG_MC146818RTC=3Dy CONFIG_R2D=3Dy CONFIG_SHIX=3Dy +CONFIG_TEST_DEVICES=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index c8edeb7..9717673 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -3,18 +3,12 @@ CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_SH4=3Dy CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy -CONFIG_I8259=3Dy -CONFIG_I8254=3Dy -CONFIG_PCSPK=3Dy CONFIG_I82374=3Dy -CONFIG_I8257=3Dy -CONFIG_MC146818RTC=3Dy CONFIG_R2D=3Dy CONFIG_SHIX=3Dy diff --git a/hw/block/Kconfig b/hw/block/Kconfig index f89e4eb..55e1a1e 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -1,7 +1,8 @@ config FDC bool - default y - depends on ISA_BUS + # FIXME: there is no separate file for the MMIO floppy disk controller= , so + # select ISA_BUS here instead of polluting each board that requires one + select ISA_BUS =20 config SSI_M25P80 bool diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index fcd87b4..57e09a0 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -7,26 +7,47 @@ config APM config I82378 bool select ISA_BUS + select I8259 + select I8254 + select I82374 + select MC146818RTC =20 config PC87312 bool select ISA_BUS + select I8259 + select I8254 + select I8257 + select MC146818RTC + select SERIAL_ISA + select PARALLEL + select FDC + select IDE_ISA =20 config PIIX4 bool + # For historical reasons, SuperIO devices are created in the board + # for PIIX4. select ISA_BUS =20 config VT82C686 bool select ISA_BUS select ACPI_SMBUS + select SERIAL_ISA + select FDC =20 config SMC37C669 bool select ISA_BUS + select SERIAL_ISA + select PARALLEL + select FDC =20 config LPC_ICH9 bool + # For historical reasons, SuperIO devices are created in the board + # for ICH9. select ISA_BUS select ACPI_SMBUS select ACPI_X86_ICH --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551729383769630.7142697053773; Mon, 4 Mar 2019 11:56:23 -0800 (PST) Received: from localhost ([127.0.0.1]:60054 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0thD-0007D8-Le for importer@patchew.org; Mon, 04 Mar 2019 14:56:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46109) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCv-0002Hz-7B for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCq-0004cm-Rj for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:53 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:37625) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCo-0004Om-0f for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:50 -0500 Received: by mail-wr1-x42f.google.com with SMTP id w6so6634077wrs.4 for ; Mon, 04 Mar 2019 10:20:44 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:42 -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=zQ2Wt+W2moQ/Nqksl8iIs95PafdohAYpRoG77NYYakQ=; b=CdBMH+0ew8bv8WumUC2fU7WjQh34FvRv9zBEY2enG63atqxy6kFoD0kkQf+Gr7ZguC U1qe35yZ00FURBqLsPCyIC+1fT1pUIwY0QMx3G03u7XVC16Clc6H9OywdzC9LOTNXzpz lt+W2E4ntJ4sVKbSHrp4vx0IjvPLsPZdPTt0pGFTQsgW+vpwPxMqfQHW5A263SyimdUY IBPgYCPI6Devds8uFEq+1NQ/cOYAGtCTJZFLEHLkZp5IDhKdeMFAU6b2kqy1hjQP/QBK TfsOXm35Y9WRngCkj5UnEvWtJ9wjvG9hk2ufdyur0X/cAevXp3h6R61G/g6CZmyaruFR o3xA== 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=zQ2Wt+W2moQ/Nqksl8iIs95PafdohAYpRoG77NYYakQ=; b=YHXlaYgtOsTYwhe3+eK3rvdfAbDQ779EfwrqPlm1ZJTN/L6dOS4Q4ofhsG9zqOmz58 UDe4gAJaqDlA2p5EfHVbxWWU2eXbi7v//hax4C7enPtrdsTvO19T/O194YA9y+2oilzB jEAh1oxWBNSvUvevzRYjQeJ/rBFVcorHUXhxnC1ugtYjBkVzdssHJzUS5OgIQXr0UG+Y Sa4e84NvLozi+uNVikukKE+gHon+tFDifDPYF4G89Je2OnJJMCWxomi/ihblObRvOq1M FgvPzKebyjsTX88IS7E63Ur4b5IAi7sdz67f0CjTnKrh3opGwxgDOpPynU3XmVK6sezq 8Z5g== X-Gm-Message-State: APjAAAWIVUKF3b0014Qg5njwLN1S44dp3XXLsV05fKOYBGZRiA0f+E/Y DI00jAn7XpoiWVtwORuN/zRf9LNN X-Google-Smtp-Source: APXvYqwXKK04silZixCh8XtKRism5clWcKMWtvSxsKZBN7rsYajlSkGqCp994PSFV7xEKjIMnU/Mfg== X-Received: by 2002:a5d:4e43:: with SMTP id r3mr14230089wrt.162.1551723643398; Mon, 04 Mar 2019 10:20:43 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:48 +0100 Message-Id: <1551723614-1823-29-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::42f Subject: [Qemu-devel] [PULL 28/54] ssi: express 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" Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 1 - default-configs/microblaze-softmmu.mak | 1 - hw/sd/Kconfig | 1 + hw/ssi/Kconfig | 4 ++++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 40e1a1a..8bb4fd1 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -24,7 +24,6 @@ CONFIG_DDC=3Dy CONFIG_SII9022=3Dy CONFIG_ADS7846=3Dy CONFIG_MAX111X=3Dy -CONFIG_SSI=3Dy CONFIG_SSI_SD=3Dy CONFIG_SSI_M25P80=3Dy CONFIG_LAN9118=3Dy diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/micro= blaze-softmmu.mak index a4a6770..7140ef3 100644 --- a/default-configs/microblaze-softmmu.mak +++ b/default-configs/microblaze-softmmu.mak @@ -6,7 +6,6 @@ CONFIG_XILINX=3Dy CONFIG_XILINX_AXI=3Dy CONFIG_XILINX_SPI=3Dy CONFIG_XILINX_ETHLITE=3Dy -CONFIG_SSI=3Dy CONFIG_SSI_M25P80=3Dy CONFIG_XLNX_ZYNQMP=3Dy CONFIG_PETALOGIX_S3ADSP1800=3Dy diff --git a/hw/sd/Kconfig b/hw/sd/Kconfig index c6c5dfb..8f12d9c 100644 --- a/hw/sd/Kconfig +++ b/hw/sd/Kconfig @@ -3,6 +3,7 @@ config PL181 =20 config SSI_SD bool + depends on SSI =20 config SD bool diff --git a/hw/ssi/Kconfig b/hw/ssi/Kconfig index 5a03110..9e54a0c 100644 --- a/hw/ssi/Kconfig +++ b/hw/ssi/Kconfig @@ -1,14 +1,18 @@ config PL022 bool + select SSI =20 config SSI bool =20 config XILINX_SPI bool + select SSI =20 config XILINX_SPIPS bool + select SSI =20 config STM32F2XX_SPI bool + select SSI --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551727737844622.2879214036768; Mon, 4 Mar 2019 11:28:57 -0800 (PST) Received: from localhost ([127.0.0.1]:59620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tGg-0000NF-Rk for importer@patchew.org; Mon, 04 Mar 2019 14:28:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46076) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCr-0002Ec-Qj for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCn-0004Yo-Ra for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:51 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:43866) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCl-0004PD-TA for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:48 -0500 Received: by mail-wr1-x432.google.com with SMTP id d17so6637582wre.10 for ; Mon, 04 Mar 2019 10:20:45 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:43 -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=A63LARBcdpDp2odRJt736nhbkfopGjJPBPlPHN4WxtI=; b=NFLitHniBdZ589XwNo8R5dvoe/O8AgnAlCEu3CCMM0ijssE7elISLuzLitMW8uv9fw Da1QsCRiTG8/q7iv/uAjrjz3SPFv54DED0RYDlOWfBrkVkiSl+ECLb2wcB29jcu58gzR ZZeqtCnaPacZWUAHUAyJNt4kJ7c4QLjtZqj0pgF0mEaR7xc5Wldap5wWqfYKIw+cnIdf 6D+TskvidYbCBVUhBUQha1Iip5U9ZWE6BUWx+zgy0u1onPGHmGtBvU4kA7WUYwEvtvzA kCQgA95IC6oupMccs9BKaP31RUYMbSiow3bNKJLyupmJWUPffHNR1QP+tnfQ9PaF9b1k twpw== 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=A63LARBcdpDp2odRJt736nhbkfopGjJPBPlPHN4WxtI=; b=KrL/BB+kXgkTU2GrP+Zm6M6vXgaxanKwAPjfBaw4uHz0bL4y9Y8LS+iO6YlFeFE4O8 tT2yIcZq/lZJeBdXeRlfdI7tYfURYXhO04+tllOZ2h+Q0KnMpc5AdQ2GzYGytnHbnIFE fQ84Esw2hoXgDBLCZ3SjpwMIb9Ur6eLstbWXRWiAkTieOpuIPQwRAxgImhbFZQzP4uME zX0htpQsdbwTnn6Skj8NneR1PAkCjaRqMkU5PK8irM0Gd9hPDp6SJVMV13fZZpdjcMTh HOfZ9i/Ju5IvaBbal15GlstVBBOrDObUuydvlfToglnPBX+yKXOTXLsqZo7O8gWE/2NC IqqA== X-Gm-Message-State: APjAAAU71MepA7EzCL65wpEa4nenUxnOEPLeLU03fs32O9DToMarDien wuDm74EkeJ6+Ke3ZvNzJn4Jpnnv7 X-Google-Smtp-Source: APXvYqzV/AwcgHWr0w8w2IaDJdWniSZf7Spagpaeb+vuCkYf725qXswepeJy/vq6A+z0gBVCT29sPg== X-Received: by 2002:a5d:4711:: with SMTP id y17mr14351885wrq.141.1551723644166; Mon, 04 Mar 2019 10:20:44 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:49 +0100 Message-Id: <1551723614-1823-30-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::432 Subject: [Qemu-devel] [PULL 29/54] sd: express 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" Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 1 - hw/sd/Kconfig | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 8bb4fd1..2a7efc1 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -6,7 +6,6 @@ CONFIG_VGA=3Dy CONFIG_NAND=3Dy CONFIG_ECC=3Dy CONFIG_SERIAL=3Dy -CONFIG_SD=3Dy CONFIG_MAX7310=3Dy CONFIG_WM8750=3Dy CONFIG_TWL92230=3Dy diff --git a/hw/sd/Kconfig b/hw/sd/Kconfig index 8f12d9c..864f535 100644 --- a/hw/sd/Kconfig +++ b/hw/sd/Kconfig @@ -1,9 +1,11 @@ config PL181 bool + select SD =20 config SSI_SD bool depends on SSI + select SD =20 config SD bool --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551728591432902.7179901228783; Mon, 4 Mar 2019 11:43:11 -0800 (PST) Received: from localhost ([127.0.0.1]:59844 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tUN-000459-88 for importer@patchew.org; Mon, 04 Mar 2019 14:43:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCv-0002Hy-7A for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCq-0004cs-Rg for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:53 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:44394) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCo-0004Q3-0u for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:50 -0500 Received: by mail-wr1-x442.google.com with SMTP id w2so6625988wrt.11 for ; Mon, 04 Mar 2019 10:20:46 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:44 -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=tGweMoXy9qv2Bdf3Z64kx+UyIEIYy/u4fKfhLC4o2gI=; b=PoJh8pDnezy3B4t11ykmRaT/c+vzulravaHh1bzPGfoHmswJgcAzV1lR7HTMpUSkKM ze25nHFjw4bGxjNeJ2MszzPL0hxbHCwtTM5vdil+XIN6KAr744FlAYiftgp2E9j+9a5i hdKsE+DFRO3xmbOGFkPirPC9eBIOh5ZediyY8EOQF/ip2uymVTXwqmkcF8ukRRChbX/r I7dK3K1Zxm5/1am4tC3y6Eg+q9HmhSFv9IlMnr9bIz5MU8UequBiX7nyMaKAHr9QrEKO 4HiyZZErwElJXV4r9iwIRCW68HhuMhUGT6+kmRWWNUT5m7MdpkYkN2GASEXdeSOf+OPu e8QQ== 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=tGweMoXy9qv2Bdf3Z64kx+UyIEIYy/u4fKfhLC4o2gI=; b=jv0SVoAcu/UCniCs8ZMbjM1U3sOjLdvu9i5NJyCBRQy1qBA9Rhw4SZeq+yDamd04zi VTWHN5re9utLKNMeap1vYVm1dKtaOsvIxwjJNiRKBVlMsYn3H6waFwHfXL/N/ZbVN/84 BFhiBuK/VRyWDIULYSGeLKdcxNQJhMCtxGiIck7IcWWaFjzVkfJRJhDdDxSwZUxjeO6c QFGJ51vlS4nNg86fLS0RiMyBCTve7lJ18rpR5kYnZ3Zz3Vf1zRjsZnjsg2lcofomdw9g E/nlVb63oAIQl3g8ujHi5BL718nnZFMH1TpeaoCtoEZNZXD/PCmWRpCeecfOaJXpvLL/ zQcw== X-Gm-Message-State: APjAAAVcKI7Q7l6q4/YrZ/4d8uJcit+3d1IcW8KyvDwc37OJdt3G9SVr 1osqUkkiAl9mucBubYUB9OFR8Is6 X-Google-Smtp-Source: APXvYqw8JeY58kh0bkl9BOhn95LYeUQKyag3WX3xh0oCGLzx8zNikfdOYsXlvUCwcgcxW4v2U9FjLw== X-Received: by 2002:adf:f78e:: with SMTP id q14mr15086572wrp.227.1551723645034; Mon, 04 Mar 2019 10:20:45 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:50 +0100 Message-Id: <1551723614-1823-31-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::442 Subject: [Qemu-devel] [PULL 30/54] ipmi: express 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" Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-36-yang.zhong@intel.com> Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini --- default-configs/i386-softmmu.mak | 3 --- default-configs/ppc64-softmmu.mak | 3 --- hw/ipmi/Kconfig | 6 ++++++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 53e9d5e..e779ee1 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,9 +1,6 @@ # Default configuration for i386-softmmu =20 CONFIG_VMXNET3_PCI=3Dy -CONFIG_IPMI=3Dy -CONFIG_IPMI_LOCAL=3Dy -CONFIG_IPMI_EXTERN=3Dy CONFIG_ISA_IPMI_KCS=3Dy CONFIG_ISA_IPMI_BT=3Dy =20 diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-soft= mmu.mak index a0a9151..d642b67 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -5,9 +5,6 @@ include ppc-softmmu.mak =20 # For PowerNV CONFIG_POWERNV=3Dy -CONFIG_IPMI=3Dy -CONFIG_IPMI_LOCAL=3Dy -CONFIG_IPMI_EXTERN=3Dy CONFIG_ISA_IPMI_BT=3Dy =20 # For pSeries diff --git a/hw/ipmi/Kconfig b/hw/ipmi/Kconfig index 6a4f08f..b944fae 100644 --- a/hw/ipmi/Kconfig +++ b/hw/ipmi/Kconfig @@ -3,14 +3,20 @@ config IPMI =20 config IPMI_LOCAL bool + default y + depends on IPMI =20 config IPMI_EXTERN bool + default y + depends on IPMI =20 config ISA_IPMI_KCS bool depends on ISA_BUS + select IPMI =20 config ISA_IPMI_BT bool depends on ISA_BUS + select IPMI --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551728118783793.1412499620913; Mon, 4 Mar 2019 11:35:18 -0800 (PST) Received: from localhost ([127.0.0.1]:59702 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tMp-0005bM-NP for importer@patchew.org; Mon, 04 Mar 2019 14:35:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46081) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCs-0002Ek-0I for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCo-0004Zh-74 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:51 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:44919) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCn-0004SC-Sg for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:50 -0500 Received: by mail-wr1-x42c.google.com with SMTP id w2so6626058wrt.11 for ; Mon, 04 Mar 2019 10:20:47 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:45 -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=/MBMqj8DSW6I8JeeXskXUQrwcBwgCamQ4BeDh1MvYPo=; b=Tubb15fXQzwXYP9+WCTCRRHRJWzMaqsZHsbvRTaZ4E5K/WDJK4TbPJ9UFZSvgGR02W kAXQ3qsYJ1BZfxUBHRjy6jf9T/73wyDE4jgQQLc8VI/PdO9zNRSo15vbADpNpjDEhjm1 a5kv2o4YY2PaEabuk3Cn8PtBXp/+Z9hecmihrsRYG3Cpner8FW0YONJKTnpdJmdVlDRo 8yI5J19DtTJTdrcNiCJIC+b5T5hMwPcV3mqBLx/dfPuUvclon8AbQ+kcK8yFfT9r+Z2M HZ9TbzetA7aq1zkd+ZR3glCcFuJIAbHtw5qqqhVzQYbtELHKHUk+GFk4MVMl51L+d2g9 eP9w== 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=/MBMqj8DSW6I8JeeXskXUQrwcBwgCamQ4BeDh1MvYPo=; b=RNRWEGnUGEnRYESKCiYKBXsqh0KYS1w6OYz1yDBbnjuY1kHdy2wByepwqUT2VTvji7 N/dGEQPFftvbktwq2WN4jk8NPcPtEyp63pwsDvwQBPzE621RAwUCRLadZRBZ3DQ8oA71 huzw+ffmlEuX+0FCu2UYxVmlRuyV9fU2GINPfbw5ABX5SkEK/T6P1658YYt0nxuFuman 5peg8fnEiRPBK2S7jpZp9dKZ/1+2zNOv7Vjs/2iM+H54qIvQOrpOiPawKhYsKGK6GbDU qVGKMf0FVg0AOrA1OqhrkgPvGU4b6cPuHWFm+qG1AkRoGC3/E+N+tae807tGXCgvoTPA vamQ== X-Gm-Message-State: APjAAAVE9Oy77Q0jIqRjSxCTyiOk+vvDcmyHBFdrUN68i046ycUp3KCZ 1BGcQs7iDv6MxVLjaGIVDep5pcce X-Google-Smtp-Source: APXvYqxznx/4iBxEdsQv5+WFmW6YHpoevTee62IFWF5FXp0Ssey3j4cmgVIa68LjHdht+zMMvP80qg== X-Received: by 2002:adf:f391:: with SMTP id m17mr12802625wro.137.1551723646219; Mon, 04 Mar 2019 10:20:46 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:51 +0100 Message-Id: <1551723614-1823-32-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::42c Subject: [Qemu-devel] [PULL 31/54] i386-softmmu.mak: remove all CONFIG_* except boards definitions 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 %-softmmu.mak only keep boards definitions in Kconfig mode. Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-43-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/i386-softmmu.mak | 37 ++++++++++++++++++------------------- hw/acpi/Kconfig | 6 ++++++ hw/i386/Kconfig | 15 +++++++++++++++ hw/mem/Kconfig | 2 ++ hw/pci-bridge/Kconfig | 1 + hw/timer/Kconfig | 1 + 6 files changed, 43 insertions(+), 19 deletions(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index e779ee1..ba3fb3f 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,25 +1,24 @@ # Default configuration for i386-softmmu =20 -CONFIG_VMXNET3_PCI=3Dy -CONFIG_ISA_IPMI_KCS=3Dy -CONFIG_ISA_IPMI_BT=3Dy - -# Optional devices: +# Uncomment the following lines to disable these optional devices: # -CONFIG_HPET=3Dy -CONFIG_APPLESMC=3Dy -CONFIG_PFLASH_CFI01=3Dy -CONFIG_ISA_DEBUG=3Dy -CONFIG_ISA_TESTDEV=3Dy -CONFIG_TEST_DEVICES=3Dy -CONFIG_SGA=3Dy -CONFIG_PVPANIC=3Dy -CONFIG_MEM_DEVICE=3Dy -CONFIG_NVDIMM=3Dy -CONFIG_ACPI_NVDIMM=3Dy -CONFIG_PXB=3Dy -CONFIG_ACPI_VMGENID=3Dy -CONFIG_PCI_DEVICES=3Dy +#CONFIG_AMD_IOMMU=3Dn +#CONFIG_APPLESMC=3Dn +#CONFIG_FDC=3Dn +#CONFIG_HPET=3Dn +#CONFIG_HYPERV=3Dn +#CONFIG_ISA_DEBUG=3Dn +#CONFIG_ISA_IPMI_BT=3Dn +#CONFIG_ISA_IPMI_KCS=3Dn +#CONFIG_PCI_DEVICES=3Dn +#CONFIG_PVPANIC=3Dn +#CONFIG_QXL=3Dn +#CONFIG_SEV=3Dn +#CONFIG_SGA=3Dn +#CONFIG_TEST_DEVICES=3Dn +#CONFIG_TPM_CRB=3Dn +#CONFIG_TPM_TIS=3Dn +#CONFIG_VTD=3Dn =20 # Boards: # diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig index 035a28f..eca3bee 100644 --- a/hw/acpi/Kconfig +++ b/hw/acpi/Kconfig @@ -4,6 +4,9 @@ config ACPI config ACPI_X86 bool select ACPI + select ACPI_NVDIMM + select ACPI_CPU_HOTPLUG + select ACPI_MEMORY_HOTPLUG =20 config ACPI_X86_ICH bool @@ -18,6 +21,9 @@ config ACPI_MEMORY_HOTPLUG =20 config ACPI_NVDIMM bool + depends on ACPI =20 config ACPI_VMGENID bool + default y + depends on PC diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index ea72f48..78fd703 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -4,18 +4,32 @@ config SEV =20 config PC bool + imply APPLESMC imply HYPERV + imply ISA_IPMI_KCS + imply ISA_IPMI_BT + imply ISA_DEBUG + imply PCI_DEVICES + imply PVPANIC imply QXL imply SEV + imply SGA + imply TEST_DEVICES imply TPM_CRB imply TPM_TIS select FDC select I8259 select I8254 + select PCKBD select PCSPK select I82374 select I8257 select MC146818RTC + # Needed by the board code: + select PARALLEL + # For ACPI builder: + select SERIAL_ISA + select ACPI_VMGENID =20 config PC_PCI bool @@ -30,6 +44,7 @@ config PC_ACPI select ACPI_CPU_HOTPLUG select ACPI_MEMORY_HOTPLUG select SMBUS_EEPROM + select PFLASH_CFI01 depends on ACPI_SMBUS =20 config I440FX diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig index a3a4372..d1e635c 100644 --- a/hw/mem/Kconfig +++ b/hw/mem/Kconfig @@ -6,3 +6,5 @@ config MEM_DEVICE =20 config NVDIMM bool + default y + depends on PC diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig index 0519eb1..b167b98 100644 --- a/hw/pci-bridge/Kconfig +++ b/hw/pci-bridge/Kconfig @@ -5,6 +5,7 @@ config PCIE_PORT =20 config PXB bool + default y if Q35 =20 config XIO3130 bool diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index a021c74..51921eb 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -15,6 +15,7 @@ config DS1338 =20 config HPET bool + default y if PC =20 config I8254 bool --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551729541566590.0795475074543; Mon, 4 Mar 2019 11:59:01 -0800 (PST) Received: from localhost ([127.0.0.1]:60083 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tjl-0001F2-D5 for importer@patchew.org; Mon, 04 Mar 2019 14:58:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCv-0002Hx-7C for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCq-0004bw-1B for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:53 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:54968) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCn-0004UX-Uh for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:50 -0500 Received: by mail-wm1-x344.google.com with SMTP id f3so122947wmj.4 for ; Mon, 04 Mar 2019 10:20:48 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:46 -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=GcrRUiFZIM7HgqkI6pf6+H9FUc04ONoipAdVkbxOkgQ=; b=jpXsHiuP30x247IDNyfHl9f761WZlziqJTxJmbQMnq0PXhyMGD8G0XfzTBwHh5StrA W3kwNXcNFVL+mAXXR8wAM0J9xYrbAPz7ozB88Y+Q5n8jP+g49pvnMFFrz4GeCbs+U30c mX6/Dq3mRmwgYmNMkKTx979VVgvYgWz9w5ClZtA2B6syDHbyefb50/KeRSRm/O2XgTC9 MQ6njIB1eDY0nTD3tu4F6f8GM3lQm92zMOZfEIe5cw+HdkTzTHJraqBWfBbvuJFscUX/ yEfm95T1+n0aEl3Mi+nuEjUaETENJGFAoydf9hlCMQjTddE65Y2bTk+HbxKOonnPEVeF vfVQ== 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=GcrRUiFZIM7HgqkI6pf6+H9FUc04ONoipAdVkbxOkgQ=; b=b4s/LydryExWaV301ecmHRYCghOniN6/Vj4QD8kHcBNGWZIXuz42Sz0KJ+pJSpv4bC iZiDoCVE0O17MHaO5FAjocT6+xJJbYnkWksIE2bbUDQehWcyHmj6PLYvWVsVWHGSRKLy 00Je3632gSR/KMMX7gFU5pYfzmH2UK9SKbT5ILrlGjfg/gnZIou7Oq8sn/waab500XiJ Bgz9RHkMU6JiQc9L/zpBJMnd+Xu1wdl2WcOdbAfvpHQK1Kj7CpUG/c+afxKAanjiDqtF /hc32qEcqjadnVQrRIYHBYW130xKrdwGQSBC5cmqAqx/lf1+fGwt4BG2lJvRHtiFgmLG FoKA== X-Gm-Message-State: APjAAAU2mWZCj/6Qi9I2Y9cfQ/4ZMtnvOcHs4wGB4NPpmlhY5bSyN82U w3T72kI1SQy+GuHx2v59zc4q1FZQ X-Google-Smtp-Source: APXvYqyFsrYgJLpmPD9B3+TaQwpVs0wjB74iiALQjiyDomB46e9vQZgpty7wzgPVgMpFPLH7nDq8EQ== X-Received: by 2002:a1c:4884:: with SMTP id v126mr281366wma.118.1551723647186; Mon, 04 Mar 2019 10:20:47 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:52 +0100 Message-Id: <1551723614-1823-33-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::344 Subject: [Qemu-devel] [PULL 32/54] ppc64: Express dependencies of 'pseries' and 'powernv' machines 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: Thomas Huth The POWERNV switch should always select ISA_IPMI_BT, then the other IPMI options are turned on automatically now. CONFIG_DIMM should always be selected by the pseries machine, which in turn depends on CONFIG_MEM_DEVICE since DIMM implements this interface. CONFIG_VIRTIO_VGA can be dropped from default-configs/ppc64-softmmu.mak completely since this device is already automatically enabled via hw/display/Kconfig now. Signed-off-by: Thomas Huth Signed-off-by: Paolo Bonzini --- default-configs/ppc64-softmmu.mak | 5 ----- hw/intc/Kconfig | 6 ++---- hw/mem/Kconfig | 1 + hw/ppc/Kconfig | 21 +++++++++++++++++++-- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-soft= mmu.mak index d642b67..cca5266 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -5,11 +5,6 @@ include ppc-softmmu.mak =20 # For PowerNV CONFIG_POWERNV=3Dy -CONFIG_ISA_IPMI_BT=3Dy =20 # For pSeries CONFIG_PSERIES=3Dy -CONFIG_VIRTIO_VGA=3Dy -CONFIG_MEM_DEVICE=3Dy -CONFIG_DIMM=3Dy -CONFIG_SPAPR_RNG=3Dy diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index 6eea14e..de10a6b 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -31,13 +31,11 @@ config OPENPIC_KVM =20 config XICS bool - default y - depends on PSERIES + depends on POWERNV || PSERIES =20 config XICS_SPAPR bool - default y - depends on PSERIES + select XICS =20 config XICS_KVM bool diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig index d1e635c..620fd4c 100644 --- a/hw/mem/Kconfig +++ b/hw/mem/Kconfig @@ -1,5 +1,6 @@ config DIMM bool + select MEM_DEVICE =20 config MEM_DEVICE bool diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 1d5d72f..30e3e81 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -1,12 +1,29 @@ config PSERIES bool + imply PCI_DEVICES + imply TEST_DEVICES + select DIMM + select PCI + select SPAPR_VSCSI select VFIO if LINUX + select XICS_SPAPR + select XIVE_SPAPR =20 config SPAPR_RNG bool + default y + depends on PSERIES =20 config POWERNV bool + imply PCI_DEVICES + imply TEST_DEVICES + select ISA_IPMI_BT + select IPMI_LOCAL + select ISA_BUS + select MC146818RTC + select XICS + select XIVE =20 config PPC405 bool @@ -40,10 +57,10 @@ config VIRTEX =20 config XIVE bool - default y - depends on PSERIES + depends on POWERNV || PSERIES =20 config XIVE_SPAPR bool default y depends on PSERIES + select XIVE --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551728749899952.487629240331; Mon, 4 Mar 2019 11:45:49 -0800 (PST) Received: from localhost ([127.0.0.1]:59890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tX0-0006wO-Nh for importer@patchew.org; Mon, 04 Mar 2019 14:45:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCw-0002Iv-55 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCr-0004dx-R3 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:55 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:38343) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCo-0004Wm-1t for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:50 -0500 Received: by mail-wm1-x335.google.com with SMTP id a188so121729wmf.3 for ; Mon, 04 Mar 2019 10:20:49 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:47 -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 :mime-version:content-transfer-encoding; bh=qS3FqLyEx5s7xVm8vTRZB2QxmgAylmTKIaoVPHGCiGk=; b=djq71oZLXpSnHKE15b2SQFOK9dwVidTNt+uF/5nym05NllUAe8zj968PSowIU6VXHm aDwyVCW/2Yvq1NxnPxwktxvm8nXQa4TbU/mgxsXoNoqPVGR3cS6wCJ1jIHqUAj9m0z2+ s92xQLM+Gkysi/SjxXX4UucwhRTtVoWZ0firwlG0uIQ9gGXy0kH2mjkt86B5LDYBm4uj CS8wxSCR3b0oHPewLmc8X7F71bXcwfzPsTbNHPdIplZTBl+Ba9qjagc8eTNMJF8y2g+I qbfUS6eVpZYsArb005klnpUwuoesA5RMVBWe4x0yJMdfB3Xr2qocxxKiH67Bb689t8FL 8wig== 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:mime-version:content-transfer-encoding; bh=qS3FqLyEx5s7xVm8vTRZB2QxmgAylmTKIaoVPHGCiGk=; b=TW5MYecsaz826Om9r5vNeLL6+gpGPscRHy2IzoxgNw+iEAqe8EaP04U7HC8M0R4NN1 BNcdAUv1a2UgzBaQ6XuaSwGrr750uzCxlQ0E6dFHmwk7i2SYIi9a330PO3usc7AKOLNa gqvvblbwb+tuLvJPDmQGZtyFqanZKbUB16mZK7qFNcomqZibhMooSWNVsFT2imxmcwUb VfsK+ACYP4pdOsFZocv4Z0Sj6cBxTUIdgeQi5LdWToYCX/P9XOjsLd2sla398YfHv+DN qKQ6VJl/gkH7wY8Td+SRxVvbY4Nnb8U+LBy1uDupUvGCED4pOBbekV+GshNeB3wwWqk9 FWhQ== X-Gm-Message-State: APjAAAXjHH9TKHjIbkvwdb6nOcBwk8dH00Amn4xen2yMahMXBKQcFlOb 9XxdVNanQ76tohUsRMR65oSF6xHM X-Google-Smtp-Source: APXvYqx1QGKts9eoRUqeWOLK9iMufMCMvVcW8KfU39chpmA+eGc5X6cN2ULOpegWc1iekGTsEBxrBw== X-Received: by 2002:a1c:a74a:: with SMTP id q71mr21887wme.45.1551723648184; Mon, 04 Mar 2019 10:20:48 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:53 +0100 Message-Id: <1551723614-1823-34-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> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::335 Subject: [Qemu-devel] [PULL 33/54] ppc: Express dependencies of the 'prep' and '40p' machines 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, =?UTF-8?q?Herv=C3=83=C2=A9=20Poussineau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth Select the required devices in hw/ppc/Kconfig instead, so that ppc-softmmu.mak only contains the user-selectable PREP switch. Plug-in devices like NE2000_ISA are pulled in automatically by the Kconfig build system now. Cc: Herv=C3=83=C2=A9 Poussineau Signed-off-by: Thomas Huth Signed-off-by: Paolo Bonzini --- default-configs/ppc-softmmu.mak | 8 -------- hw/ppc/Kconfig | 10 ++++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 9ad307a..066cec9 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -55,11 +55,3 @@ CONFIG_MAC_NEWWORLD=3Dy =20 # For PReP CONFIG_PREP=3Dy -CONFIG_PREP_PCI=3Dy -CONFIG_RS6000_MC=3Dy -CONFIG_I82374=3Dy -CONFIG_I82378=3Dy -CONFIG_PCKBD=3Dy -CONFIG_NE2000_ISA=3Dy -CONFIG_PC87312=3Dy -CONFIG_CS4231A=3Dy diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 30e3e81..24e4ed9 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -39,6 +39,16 @@ config SAM460EX =20 config PREP bool + imply PCI_DEVICES + imply TEST_DEVICES + select CS4231A + select PREP_PCI + select I82374 + select I82378 + select LSI_SCSI_PCI + select M48T59 + select PC87312 + select RS6000_MC =20 config RS6000_MC bool --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 155172829240357.98343865150366; Mon, 4 Mar 2019 11:38:12 -0800 (PST) Received: from localhost ([127.0.0.1]:59764 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tPd-00089L-Ao for importer@patchew.org; Mon, 04 Mar 2019 14:38:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCz-0002OZ-GJ for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCx-0004r3-Fi for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:01 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:37620) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCt-0004Ye-Nb for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:57 -0500 Received: by mail-wr1-x429.google.com with SMTP id w6so6634316wrs.4 for ; Mon, 04 Mar 2019 10:20:50 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:48 -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=TrjQGIty3rn70lf0vsj7D9XSqovWhDEUzRssLDP4mIY=; b=r63FjID6V9UOWTJl+QbUHafmWbNDRtEC4e07gZQrR+DOO/mewRBWB0Lh95sn1b/p89 9UG754foi6O/PDGnu5VayAypbg7roBhyZ4R3G2Xw5DLvUDzTozIYMeO70yEnoVf8zA5Y SIv2arma53npzTlX/ns1Qknk8G7o+RvJy+d2NQotQ24PXKlgSAg2Md3c8ZPgwcZV8k9D RSmK289StxkcpRe0zqv1J2xWTtyeu+vsYdY0ECzY4B4G0n7ENSA8/JjA7UKiv55+TAkM c6txDLGyFKP0n114mSPZv053CWpPslS0pJvy5J22ZLUfoHOt3IZUwSMU0u9HDKMLZDBv zl+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=TrjQGIty3rn70lf0vsj7D9XSqovWhDEUzRssLDP4mIY=; b=jKn5BWwM05B63yPtqoVkUrp5UbtVG5FygT3pg/EgdVS2UhuNVwDjfvAj1fcqFdRStb 8eM1YWFriZspb+4y9otGu0R7etDBgnnI4hEHlOoxMjK+a6JL++FpOeC7f4LNEAdVW9lL p7ZInmhyDDxB20Q1qvHmgPaTBU1gTp9au2go4/rYlGolRedjxI7QSc1Bif6aa64waP9P NB2cO6CSOawAonUvSCvqhJNhSw2/rDq4ddAO5ithcGHzwzNI7yd586MZsibPYTPM5dmA NcIwL88foGaqAy8mtW3hjmcAxL5GIxT21uQ2oSa2MrcQA35mU0E2q3T+rH+NIY9HGzwy 4HgA== X-Gm-Message-State: APjAAAWp1wz+R9oclisV++7UT9eWmU/m99FKt09HG5i6yKlBWzqjPLlc Oy6rbc0DTxSVbZi6mvxDBYBMHt2B X-Google-Smtp-Source: APXvYqy+IekJMNZY7DQnW/opetLWucYiqdUvZYVHj2l7WshQodmUNDJiiiaMZEtMqiEbwqdiCrO7zg== X-Received: by 2002:a5d:6781:: with SMTP id v1mr12828402wru.167.1551723649115; Mon, 04 Mar 2019 10:20:49 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:54 +0100 Message-Id: <1551723614-1823-35-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::429 Subject: [Qemu-devel] [PULL 34/54] ppc: Express dependencies of the Mac machines 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, Mark Cave-Ayland 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: Thomas Huth This will make it for example easier if the users want to disable one of the two machines for their builds. Cc: Mark Cave-Ayland Reviewed-by: Paolo Bonzini Signed-off-by: Thomas Huth Signed-off-by: Paolo Bonzini --- default-configs/ppc-softmmu.mak | 15 --------------- hw/misc/Kconfig | 6 ++++++ hw/net/Kconfig | 1 + hw/pci-host/Kconfig | 4 +++- hw/ppc/Kconfig | 15 +++++++++++++++ 5 files changed, 25 insertions(+), 16 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 066cec9..caaff60 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -35,21 +35,6 @@ CONFIG_VGA_CIRRUS=3Dy CONFIG_SMBUS_EEPROM=3Dy =20 # For Macs -CONFIG_ESCC=3Dy -CONFIG_MACIO=3Dy -CONFIG_MACIO_GPIO=3Dy -CONFIG_SUNGEM=3Dy -CONFIG_MOS6522=3Dy -CONFIG_CUDA=3Dy -CONFIG_ADB=3Dy -CONFIG_MAC_NVRAM=3Dy -CONFIG_MAC_DBDMA=3Dy -CONFIG_MAC_PMU=3Dy -CONFIG_HEATHROW_PIC=3Dy -CONFIG_GRACKLE_PCI=3Dy -CONFIG_UNIN_PCI=3Dy -CONFIG_DEC_PCI=3Dy -CONFIG_IDE_MACIO=3Dy CONFIG_MAC_OLDWORLD=3Dy CONFIG_MAC_NEWWORLD=3Dy =20 diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 2433d1b..a012d2c 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -57,6 +57,12 @@ config MOS6522 =20 config MACIO bool + select CUDA + select ESCC + select IDE_MACIO + select MAC_DBDMA + select MAC_NVRAM + select MOS6522 =20 config IVSHMEM_DEVICE bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index c562b69..6b4633b 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -86,6 +86,7 @@ config FTGMAC100 =20 config SUNGEM bool + depends on PCI =20 config COLDFIRE bool diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index ff4080c..b39ea29 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -10,8 +10,10 @@ config GRACKLE_PCI bool =20 config UNIN_PCI - select PCI bool + select PCI + select DEC_PCI + select OPENPIC =20 config PPCE500_PCI select PCI diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 24e4ed9..9b5056f 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -55,9 +55,24 @@ config RS6000_MC =20 config MAC_OLDWORLD bool + imply PCI_DEVICES + imply SUNGEM + imply TEST_DEVICES + select ADB + select GRACKLE_PCI + select HEATHROW_PIC + select MACIO =20 config MAC_NEWWORLD bool + imply PCI_DEVICES + imply SUNGEM + imply TEST_DEVICES + select ADB + select MACIO + select MACIO_GPIO + select MAC_PMU + select UNIN_PCI =20 config E500 bool --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 155172861873075.47786920464841; Mon, 4 Mar 2019 11:43:38 -0800 (PST) Received: from localhost ([127.0.0.1]:59848 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tUp-0004Yv-Gj for importer@patchew.org; Mon, 04 Mar 2019 14:43:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46259) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sD4-0002R1-Ji for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCz-0004xI-Kn for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:06 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:37960) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCx-0004aQ-FB for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:01 -0500 Received: by mail-wr1-x443.google.com with SMTP id g12so6640061wrm.5 for ; Mon, 04 Mar 2019 10:20:51 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:49 -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=lseyjgMU6zmnboxJ2FGFj0ivR6cjsWSFDz+Aqi1ZIKs=; b=hyR2iu2UdATFAx2MraKie+fFDygaBbKQTkD5cCaaqzRn5O679f86nmg4iC97dDcEoO pmmzx9MBOnd5OSyCihjXLLgG+MMIpN8ypSoMxM6wN6D6luX9URlc7zjMM/uCFJzQFd6y WeyWSf9hdyNlxewy8Cn2LVDF7//x/5H0O+OXXwvla0pWo00YRkkqgj9joI5ce+0mwn4A HdMVqT6K2bdgKAmiSqXsgJbswEGpp/NYDjK1uak+y3hYhr0r6FIlyyNMb1DGI9vY4v5b cf0wQISaILSm+sa5e3rDUfeGSvD978sxvgLPCzHqDifWn5S+E/6M+mUUEUxJ50BqN41D rcKw== 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=lseyjgMU6zmnboxJ2FGFj0ivR6cjsWSFDz+Aqi1ZIKs=; b=F2gVX/i/zo8qBKs2897ppW+dqHBjKGCNjZh9L6cSuC9fSOV5kH+DOB0moXT+JPmBXi UUmy99QfN1RNhsNRcTMkxMhJ/NluVrv5Bxk7ONpEpacawOQATlOnnJtAiBGnD/r7+s2q r9kDSqYpwU5sX9Djlg/hg4qy9o8xcoV6cBAN+ZZ7AjoORDkSEn12FFmXvxWAIimTdGXS FLbnxwY+QvxpPMqIQ9ov6FcNjbsmuj/uDm4tOQes+xo+aVlvOJCiqfM+AmOyzPWR7hiV m4byTYeuUuGtD2OlWD0CKktKzHkYVSLXKCeHUMp6kLuqcc4flImIsQ/x8LRkT8gMyC5s inMw== X-Gm-Message-State: APjAAAUsueXMRJT8ZmJOJ48RguXisL2OAQO7U06vn+T+0vwRRe5G4Xbd D6qYP6WL71aOMtCYPZ6vsqJEH8DH X-Google-Smtp-Source: APXvYqyf8pKRF2ClqfT7HIrUkUvvQR0+rWFsnGSuwkPw2RvppcG4lmmeuCkm5FVvOKmHMSWbOyQCXw== X-Received: by 2002:adf:c54d:: with SMTP id s13mr13101717wrf.169.1551723650020; Mon, 04 Mar 2019 10:20:50 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:55 +0100 Message-Id: <1551723614-1823-36-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::443 Subject: [Qemu-devel] [PULL 35/54] ppc: Express dependencies of the Sam460EX machines 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: Thomas Huth Most of the dependencies are now directly selected by the SAM460EX switch. We can drop CONFIG_VGA_CIRRUS since this device is already selected automatically when CONFIG_PCI_DEVICES is set. Reviewed-by: BALATON Zoltan Reviewed-by: Paolo Bonzini Signed-off-by: Thomas Huth Signed-off-by: Paolo Bonzini --- default-configs/ppc-softmmu.mak | 8 -------- hw/ppc/Kconfig | 11 +++++++++++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index caaff60..fb43cba 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -25,14 +25,6 @@ CONFIG_PCI_EXPRESS=3Dy =20 # For Sam460ex CONFIG_SAM460EX=3Dy -CONFIG_USB_EHCI_SYSBUS=3Dy -CONFIG_SM501=3Dy -CONFIG_IDE_SII3112=3Dy -CONFIG_AT24C=3Dy -CONFIG_BITBANG_I2C=3Dy -CONFIG_M41T80=3Dy -CONFIG_VGA_CIRRUS=3Dy -CONFIG_SMBUS_EEPROM=3Dy =20 # For Macs CONFIG_MAC_OLDWORLD=3Dy diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 9b5056f..f4fce16 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -33,9 +33,20 @@ config PPC440 =20 config PPC4XX bool + select BITBANG_I2C + select PCI =20 config SAM460EX bool + select PFLASH_CFI01 + select IDE_SII3112 + select M41T80 + select PPC440 + select SERIAL + select SM501 + select SMBUS_EEPROM + select USB_EHCI_SYSBUS + select USB_OHCI =20 config PREP bool --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551727911138468.5289748962356; Mon, 4 Mar 2019 11:31:51 -0800 (PST) Received: from localhost ([127.0.0.1]:59675 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tJT-0002wX-29 for importer@patchew.org; Mon, 04 Mar 2019 14:31:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46176) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sD1-0002Pm-H4 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCz-0004xE-LF for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:03 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:53712) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCx-0004bX-GP for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:01 -0500 Received: by mail-wm1-x331.google.com with SMTP id e74so128930wmg.3 for ; Mon, 04 Mar 2019 10:20:51 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:50 -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=SDnXlUDMV1f0Sd1B5HhtFxBUEMREcJX6Ms4BRGwKYB0=; b=BbTKSpauiM7ltmo+jAUIdZOvmbhQbrlbU+vDY1R3il/u/jHxjzubXfGcz1FZZ9OYfQ 1MHi4Tx3mO9a5iOYDWB0/EVVq9IQzU+d0XGs+8oLJ+Pt8qpVHHqhhVE82aSr8fHPFje5 eLNp3jx2vRb6jaBRG8eY7ixmdu4f7WbtgeowqnR5YJ2DN+qV3NwV+sy5IYae8oOuXuoL h7w6NO3/Bs0qtGrXp3YD+ovlcmj9S9WIXFx/E1xREDtXYt5+evABsCJMoPNBA9Q7lBZO /PRdnDUV49x4aBY5Nbe7VkS7Ll0PvxVoeE9xnWOObzdl4hLTicZVxvSFIC06UbubC0l4 gfbA== 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=SDnXlUDMV1f0Sd1B5HhtFxBUEMREcJX6Ms4BRGwKYB0=; b=J3ymSdgjFqwTsWxqrbLxqM3ZIusm/6gySyCzJzDNv7EPVMNP6K6nfwb5n1LwRlR3jr 1PPk4IM17G1d8hXx9a4QrqwXiZVVM756KqibxXrKGXXWD4QZqnqvVl2ojE1oEosPCFiU TGHuvfTV1q6oeGrWrFrUtaC+8asD3P8cwIDNY3VAVurZpSlT05UgNdSmzR0qJVRPMXuS P7FZUhvRHxuPRRN5dG8l3m4UMltHw+q2xdaEtlOtBLubxMtD15hjgfI7e5rMDG+4K7lR 0w0n+RC44h0teqiJm9L+GirIijuWvUvWDgVBuw9dXAlXu6mQrRxiEVQN/4ov0IpnFNYI Wrrw== X-Gm-Message-State: APjAAAU6PDjgIONti40pn6gcy8IeZcJ1EVTqA5KmMGvZqpyTQg9tMBYB q3bUDC2wj1yWphykk3HaQcGCAOzM X-Google-Smtp-Source: APXvYqxDoGnEzTGotgDXL2W1d+n30JG2VHWDnQqVa1n2feErycCUw6GL4Tbexlwy3+3/YHjx2BOYnQ== X-Received: by 2002:a1c:6854:: with SMTP id d81mr268845wmc.1.1551723650791; Mon, 04 Mar 2019 10:20:50 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:56 +0100 Message-Id: <1551723614-1823-37-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::331 Subject: [Qemu-devel] [PULL 36/54] ppc: Express dependencies of the embedded machines 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: Thomas Huth This makes it much easier if the users want to disable some of the embedded machines for their builds. Reviewed-by: Paolo Bonzini Signed-off-by: Thomas Huth Signed-off-by: Paolo Bonzini --- default-configs/ppc-softmmu.mak | 17 ----------------- hw/ppc/Kconfig | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index fb43cba..6ea36d4 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -1,27 +1,10 @@ # Default configuration for ppc-softmmu =20 -CONFIG_ISA_BUS=3Dy -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_TEST_DEVICES=3Dy - # For embedded PPCs: -CONFIG_PPC4XX=3Dy -CONFIG_M48T59=3Dy -CONFIG_SERIAL=3Dy -CONFIG_OPENPIC=3Dy -CONFIG_PPCE500_PCI=3Dy -CONFIG_PFLASH_CFI01=3Dy -CONFIG_PFLASH_CFI02=3Dy -CONFIG_XILINX=3Dy -CONFIG_XILINX_ETHLITE=3Dy CONFIG_E500=3Dy -CONFIG_PLATFORM_BUS=3Dy -CONFIG_ETSEC=3Dy CONFIG_PPC405=3Dy CONFIG_PPC440=3Dy CONFIG_VIRTEX=3Dy -CONFIG_PCI_EXPRESS=3Dy =20 # For Sam460ex CONFIG_SAM460EX=3Dy diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index f4fce16..e759a3f 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -27,9 +27,18 @@ config POWERNV =20 config PPC405 bool + select M48T59 + select PFLASH_CFI02 + select PPC4XX + select SERIAL =20 config PPC440 bool + imply PCI_DEVICES + imply TEST_DEVICES + select PCI_EXPRESS + select PPC4XX + select SERIAL =20 config PPC4XX bool @@ -87,9 +96,19 @@ config MAC_NEWWORLD =20 config E500 bool + imply AT24C + select ETSEC + select OPENPIC + select PLATFORM_BUS + select PPCE500_PCI + select SERIAL =20 config VIRTEX bool + select PFLASH_CFI01 + select SERIAL + select XILINX + select XILINX_ETHLITE =20 config XIVE bool --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551730080523394.046070785805; Mon, 4 Mar 2019 12:08:00 -0800 (PST) Received: from localhost ([127.0.0.1]:60254 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tsS-0000ig-7q for importer@patchew.org; Mon, 04 Mar 2019 15:07:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sD7-0002UC-F7 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sD5-00059T-Oj for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:09 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:51875) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sD3-0004cB-T5 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:06 -0500 Received: by mail-wm1-x32d.google.com with SMTP id n19so141410wmi.1 for ; Mon, 04 Mar 2019 10:20:52 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:51 -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=aUKz4PWJwhePpSywRhOheggZUFsmHsEDVJrwz73oHT4=; b=LyaK/4Yn3w2APL7Vp+KvLlcLIbFQuEce6ekGR/ZgguLWGItpUOwSsZ4M/4O1W0Az11 /igGnp9nzRkGbw2D5mnm5cfVCLXLC5KwPrNh35dLBLMXmnj7hRc41KcIEgnuNGBncFSr l4Hnq0CmFW+j/mGIcfn3omgIn4tcUz4aQrLHZ+jgRzkKh0VbhjWyIh4FuVxln39s8oit 6Al/6CwUWE7GjAw5dhuQUeXq43JMNdoi+UYWr2EuzyOHr1Me4gz/BRweYFrUa8DWy/1T DqCCpm+v8g4IWhtCXWrLtkdHxnc2aaKyf3FzZuXOUgiT97+WlChtewE5BlMThCTtCIFk buPQ== 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=aUKz4PWJwhePpSywRhOheggZUFsmHsEDVJrwz73oHT4=; b=H2zCMviX0/417ooh42zGwYunXCWY0330OO6/UkDSoaSZBwt1JShMjlyZPhva7hBzj5 1dXiWaWq4HIegI7MVmRl4+B+Y0IkGqtvHX+dKjjSD8FiPN84LAFYr45ac+VDOTJJvLvi KXOIVMA1kycOuOyeK4ck2FcMjK+8JCm9qyRdRJxuEzE1FqnGls0DZf251P9uuFMaKUSK NGIb7+F1C+i+2cJ+kX9si5VrqUoD3QN4E2bfdYWLLZ2GYkzcdg1Irw6u/pTcZB6S2Dgv 8CE+y32IAatQ6tBt1eEfGxDVlGHCm/idayKk8ga1EoaVZ6Dl31hUin6iN/QOOOTzFvvj w1HA== X-Gm-Message-State: APjAAAUn+P9Ep/XKvyF4fIVYdPPMQYKZDxU3SLLB3bMvYlnzlNIRc7QO saOHClc4WKQ7LWCJT+h0E0IGJkdT X-Google-Smtp-Source: APXvYqzw0U7cgoIml6SXqqCtMeQYi/ysjlkhoWXQQU8LC4iFA+kVlOh0TkUXiwBfaQPf/f0jjDmB3w== X-Received: by 2002:a1c:234d:: with SMTP id j74mr259386wmj.130.1551723651819; Mon, 04 Mar 2019 10:20:51 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:57 +0100 Message-Id: <1551723614-1823-38-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::32d Subject: [Qemu-devel] [PULL 37/54] alpha-softmmu.mak: express 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" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini --- default-configs/alpha-softmmu.mak | 19 +++++++------------ hw/alpha/Kconfig | 10 ++++++++++ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index 762e3a2..d186fe8 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -1,15 +1,10 @@ # Default configuration for alpha-softmmu =20 -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_I82374=3Dy -CONFIG_I8254=3Dy -CONFIG_PCKBD=3Dy -CONFIG_VGA_CIRRUS=3Dy -CONFIG_VMWARE_VGA=3Dy -CONFIG_IDE_CMD646=3Dy -CONFIG_I8259=3Dy -CONFIG_MC146818RTC=3Dy -CONFIG_TEST_DEVICES=3Dy -CONFIG_SMC37C669=3Dy +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_PCI_DEVICES=3Dn +#CONFIG_TEST_DEVICES=3Dn + +# Boards: +# CONFIG_DP264=3Dy diff --git a/hw/alpha/Kconfig b/hw/alpha/Kconfig index c5d0438..22cefd9 100644 --- a/hw/alpha/Kconfig +++ b/hw/alpha/Kconfig @@ -1,2 +1,12 @@ config DP264 bool + imply PCI_DEVICES + imply TEST_DEVICES + select I82374 + select I8254 + select I8259 + select IDE_CMD646 + select MC146818RTC + select PCI + select PCKBD + select SMC37C669 --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551728273987915.9296915589115; Mon, 4 Mar 2019 11:37:53 -0800 (PST) Received: from localhost ([127.0.0.1]:59762 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tPM-0007sx-SM for importer@patchew.org; Mon, 04 Mar 2019 14:37:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46440) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sDA-0002Vd-3h for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sD7-0005CT-H7 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:11 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:34037) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sD5-0004dR-Un for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:09 -0500 Received: by mail-wm1-x344.google.com with SMTP id o10so400428wmc.1 for ; Mon, 04 Mar 2019 10:20:53 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:52 -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=BUsqquIZJrlCQabIGdZTGsTywcrHXoqrL8qgsUEd0Ao=; b=HfuDBjKlk+OVvCnmw7Vpb3CpQAu3mnjm5zv9+51SwHDZ+00S8tioh0RtA7mMePH3Cv Nyy7H7OKFElSLOf9sC8pEi+Z7+AtCvFILUfGV4eNpQJrWEKmOL9MP9tml/YJFU41MA66 qpdu9Vv2oplC/1/XjOl8IEEhUPnPP3Yu+2L5/fm20nGe/3xXng4kfh6Ns54L1JD6yRLS o/jkNjtVBUTxVAW4VcCxYZZ+D7kTEOMdDABwp77moUKtwqaGYkLEjLZZ/w0baJCBC2D7 tGgo+iI0PDNv0AfuTUjxWf5YGdugGK8ZlKzsLX88zUHFtqy/BmNP/hDnOItA0uuLwe4N MPxA== 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=BUsqquIZJrlCQabIGdZTGsTywcrHXoqrL8qgsUEd0Ao=; b=XZJNaD9EcGTp9gkV4u29n7uCM4AP1Lnyiu7zqLTYptxHg75Zt4s9oqQZI1XwkRC16c Wb6az1mxkySRTBQn2LqE7KYiOlnnnnRi4cCXf0kPSYiSyeR0b6VM0bev1IkcHGRQkS8a ePD0WsOaVvuyjHkXTkOyce5idE+zLAIfSO/OXLCFHCayEPnW60EKBAU1qWSRnWNBLHYR OsN6IkZ2yc1b8hpkD+M7ShTHj/kGHyhtpAT+5zKhRdMnjBaYCUjaiy282+VHR+Vx8phn wXLFEMDu34H6LgZsWQ40VtwVQtBxaNY0gUKCyzn/9WKi3BnsUsQG/0tbIcweRQZoDd/2 Og0g== X-Gm-Message-State: APjAAAUfkZcGI/BabOJMUAwnoy0r0s5aOf9YHydY9LsQ7G3fbu9TR0C8 VjFOV0rBTencECJ67/XQqdzvoXdK X-Google-Smtp-Source: APXvYqwxI/IjyeBuqGjgOeSTPXlooQnIWR3bZlF0A8L8IiqxvxbfIK96FZD18Qk7l/IBDM+QBLuNUQ== X-Received: by 2002:a1c:9c0e:: with SMTP id f14mr299464wme.78.1551723652646; Mon, 04 Mar 2019 10:20:52 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:58 +0100 Message-Id: <1551723614-1823-39-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::344 Subject: [Qemu-devel] [PULL 38/54] cris-softmmu.mak: express 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" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini --- default-configs/cris-softmmu.mak | 5 ++--- hw/cris/Kconfig | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/default-configs/cris-softmmu.mak b/default-configs/cris-softmm= u.mak index b3cae59..5932cf4 100644 --- a/default-configs/cris-softmmu.mak +++ b/default-configs/cris-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for cris-softmmu =20 -CONFIG_ETRAXFS=3Dy -CONFIG_NAND=3Dy -CONFIG_PFLASH_CFI02=3Dy +# Boards: +# CONFIG_AXIS=3Dy diff --git a/hw/cris/Kconfig b/hw/cris/Kconfig index b7738ab..884ad2c 100644 --- a/hw/cris/Kconfig +++ b/hw/cris/Kconfig @@ -1,5 +1,8 @@ config AXIS bool + select ETRAXFS + select PFLASH_CFI02 + select NAND =20 config ETRAXFS bool --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551728976173752.5234787120525; Mon, 4 Mar 2019 11:49:36 -0800 (PST) Received: from localhost ([127.0.0.1]:59929 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tae-0001ES-6A for importer@patchew.org; Mon, 04 Mar 2019 14:49:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46472) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sDC-0002Xp-Sn for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sDA-0005FV-7e for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:14 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:53222) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sD7-0004g1-G7 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:11 -0500 Received: by mail-wm1-x343.google.com with SMTP id f65so137668wma.2 for ; Mon, 04 Mar 2019 10:20:54 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:52 -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=NeY5hQS/dM+EQxDe37MjDjW2RdFDN4s8f7fdlCMOsYo=; b=U/XJ6PVcNZA7CeIlZZa29IvYM7GnX9t1n5guOme2B68j7QRJN8dhq9Maf+JbPreKoW awoAaqof0KhQVtc2Hx4w3JC5gUCb61gpYJmnPUfy5z/FBSYj5Cp+kkxCtHPFn5SAS6ef GAdPurXOVsRgHVNaidBJOUKmf0/KearDnzDlcykte5IaZobmwFR1aLcgYJXNKPkyCT97 KC5LIpvRotvAMhBDcrTHbV1HpA9qtAb4mb4QSdqy03wkMjRSO32ed8jAcU+pxm/H3/4s z8IXgggjAwvhBSfAHzW4OO5efzs2ZnUV84AmYV+uXxTyVfRTrZNZNj/4//qYfKtSseL1 8PqA== 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=NeY5hQS/dM+EQxDe37MjDjW2RdFDN4s8f7fdlCMOsYo=; b=c13qxPiwi9JrRWdzfNtVhp5zJOjU1qggsJZKn3pW3+XNlTdut9T78KGa1XkS7NDpCH zdt92tYCxv72zfSEnQTwHngO/1DlpLCT7k1FhUuF+vu/bZFqP6zH4syP/H+jyDuhw6AS aZK0i08GytIQG6ANLrf9hO08PIztPfv/dZDpqoUn85x/4T2f64UuUlCO6XZXThHsICsf /mJGfikzsMZpCSn8T/dGcCNqemcLuxpt4jiVAuhDncaWghhoJbpMhz7VRufXUkzk/7Le l1vK6UoXJUCL7M7PynzAW5CNWDtgSbvwFuN9Fu9Gc/4InjsBGEaqV9zKCjnQuErDHIew uLRA== X-Gm-Message-State: APjAAAW3AqjufKA5g410x2R//PM69JcIhegsdnrPnI0hX5PrQH+i8IvZ ZEZx7y+tCZkhQxJCejdG02f5IpnB X-Google-Smtp-Source: APXvYqyg43ws7/HeTJGIdSqwHryyBetIcWpuFIE1Bvn71QSrogbxiRlwfjs7vU3VlYKjkxM+BUR1jw== X-Received: by 2002:a1c:4884:: with SMTP id v126mr281589wma.118.1551723653630; Mon, 04 Mar 2019 10:20:53 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:59 +0100 Message-Id: <1551723614-1823-40-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::343 Subject: [Qemu-devel] [PULL 39/54] hppa-softmmu.mak: express 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" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Note that the Dino board uses a memory mapped 16550 UART and therefore only CONFIG_SERIAL is needed, not CONFIG_SERIAL_ISA. Signed-off-by: Paolo Bonzini --- default-configs/hppa-softmmu.mak | 20 ++++++++------------ hw/hppa/Kconfig | 8 ++++++++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmm= u.mak index b7f2b43..b64c5eb 100644 --- a/default-configs/hppa-softmmu.mak +++ b/default-configs/hppa-softmmu.mak @@ -1,13 +1,9 @@ -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy -CONFIG_ISA_BUS=3Dy -CONFIG_I8259=3Dy -CONFIG_E1000_PCI=3Dy -CONFIG_IDE_CMD646=3Dy -# CONFIG_IDE_MMIO=3Dy -CONFIG_LSI_SCSI_PCI=3Dy -CONFIG_VIRTIO_VGA=3Dy -CONFIG_MC146818RTC=3Dy +# Default configuration for hppa-softmmu + +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_PCI_DEVICES=3Dn + +# Boards: +# CONFIG_DINO=3Dy diff --git a/hw/hppa/Kconfig b/hw/hppa/Kconfig index 5ce48ef..2d9b072 100644 --- a/hw/hppa/Kconfig +++ b/hw/hppa/Kconfig @@ -1,2 +1,10 @@ config DINO bool + imply PCI_DEVICES + select PCI + select SERIAL + select ISA_BUS + select I8259 + select IDE_CMD646 + select MC146818RTC + select LSI_SCSI_PCI --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 15517284563211000.7727818115868; Mon, 4 Mar 2019 11:40:56 -0800 (PST) Received: from localhost ([127.0.0.1]:59822 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tSG-00027q-6D for importer@patchew.org; Mon, 04 Mar 2019 14:40:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sD3-0002QF-Nh for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCz-0004x9-KW for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:05 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:34033) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCx-0004h1-EV for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:01 -0500 Received: by mail-wr1-x444.google.com with SMTP id f14so6649474wrg.1 for ; Mon, 04 Mar 2019 10:20:55 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:53 -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=m5nkZJsU98Cd1XDlOV16svTUAU7Vm7FdcjVXR3eHiCk=; b=T6M/I/ywXe6aD0xWGU1sfU80GTJgT/cMKATGU8ATjw9/CWnaDP0O/GmTrMgLRcTBUv nvWg/0D8J0YrR5uJXWBZQ6bSVrh9jISbyV9dZCTBRo3IGBpm3l6Qi23ymDNAZmQsXOEp TbcogYoPPh//i+92io9kVBh9i8xwjKKju/QjZ+qhVnWvM9urpU//zkE1fzU42X5uy+rS QXcrUd4CQ+DTsvlCK/yJ+BwrkMBxogtnQ+IMRCJlc/J/NO/riYTnP8QJg9pwEVqtYwwn JT4SnXRxAuO9EdXnPsmuclbrVwdBys28invglJqOdKEoYI504AAq3VPk74BMCTfkrEom y6gA== 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=m5nkZJsU98Cd1XDlOV16svTUAU7Vm7FdcjVXR3eHiCk=; b=ZWhqO30QWYKc+Jur+0xtJ6qJXFxUNAtKKgtNJlM34M+kx3TRCWAYUD9o3Q9KKi8jwG zr8QmySy+kZgR1A4cyfqw4S9tnw1cV3xY6kbXE5OOMt1ngu1LDa0cOY5+Jtn270m94+i RrbohS16taayno6XhPZX9C0scERRBSoyimRGk6N9qJc3tjF1NxSBqPizx6ZqNtSSqt3u xo9WDMFACbK2IHQWQNGVSaCq8zp/NSC5A74SYNPNve3M94MKtPt1U+HEtSp4oWbF/yeR 4EZGeWq1z+z6mmCuljq6BvFvxzc9loMz/92mJG4n8KASa2mnrc9zBINwJ13iy1bTVfnu X0Ow== X-Gm-Message-State: APjAAAUrk6Pw9IW8DK4ODHKRrvZVfWPdR4/u+CseKBnQc34rqmFljxGj Xk8OQOzsnrRm0lhfboAmI+zWvyRU X-Google-Smtp-Source: APXvYqzyxiT1gDMS72uYCT3u1jUyoXmJeyyVIoLBlWgg+C+7NfglVQzyiYBPMR3wzT2bpxd9etn0og== X-Received: by 2002:adf:f78e:: with SMTP id q14mr15086992wrp.227.1551723654441; Mon, 04 Mar 2019 10:20:54 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:20:00 +0100 Message-Id: <1551723614-1823-41-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::444 Subject: [Qemu-devel] [PULL 40/54] lm32-softmmu.mak: express 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" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini --- default-configs/lm32-softmmu.mak | 10 ++++++---- hw/display/Kconfig | 3 +-- hw/lm32/Kconfig | 6 ++++++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmm= u.mak index f489838..6d25966 100644 --- a/default-configs/lm32-softmmu.mak +++ b/default-configs/lm32-softmmu.mak @@ -1,8 +1,10 @@ # Default configuration for lm32-softmmu =20 +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_MILKYMIST_TMU2=3Dn # disabling it actually causes compile-t= ime failures + +# Boards: +# CONFIG_LM32=3Dy CONFIG_MILKYMIST=3Dy -CONFIG_FRAMEBUFFER=3Dy -CONFIG_PFLASH_CFI01=3Dy -CONFIG_PFLASH_CFI02=3Dy -CONFIG_SD=3Dy diff --git a/hw/display/Kconfig b/hw/display/Kconfig index e126cbb..a96ea76 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -70,8 +70,7 @@ config FRAMEBUFFER =20 config MILKYMIST_TMU2 bool - default y - depends on OPENGL && X11 && MILKYMIST + depends on OPENGL && X11 =20 config SM501 bool diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig index 4f45840..3d09c2d 100644 --- a/hw/lm32/Kconfig +++ b/hw/lm32/Kconfig @@ -1,7 +1,13 @@ config LM32 bool select PTIMER + select PFLASH_CFI02 =20 config MILKYMIST bool + # FIXME: disabling it results in compile-time errors + select MILKYMIST_TMU2 if OPENGL && X11 select PTIMER + select PFLASH_CFI01 + select FRAMEBUFFER + select SD --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551728107763993.4417930443601; Mon, 4 Mar 2019 11:35:07 -0800 (PST) Received: from localhost ([127.0.0.1]:59700 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tMY-0005KI-K2 for importer@patchew.org; Mon, 04 Mar 2019 14:34:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46305) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sD5-0002SD-No for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sD3-00054V-LO for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:07 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:43859) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sD1-0004hk-KP for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:04 -0500 Received: by mail-wr1-x429.google.com with SMTP id d17so6638070wre.10 for ; Mon, 04 Mar 2019 10:20:56 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:54 -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=PSoXYbR02XTv2fuRf82F4HlUk7Zvkrr/kPlrCVfdBHI=; b=R6qDH+hraN3BqC2U7GzGbE0sQ8cTIVPifIZcPcIDKsnSlyrzgqxvMznxl919Zpl/CP UGH4Y7Z5nSY+X7EFP2fY4s0uqmuVs5KGW6QtitkyiIxwc4886Do7nIrQgQXf0Zm047jt J0/ZMWRMiKVFIQx5pz0oE0ax54YyYQt/n5P7ExZUXoWO0jIaldn16rYaOwThNESHuolm 6o1lOwwfSIR8wkyCSdiR3zh5RPSzP2v17DzI9f+jUPWbFkQwuH3kHLH42tvOx1E4Tjgy 39SlL2kKA+ba6haQhymLYSfj5ah1ABzbJDK/mhayrXemZcX825HeVhpLOWHmKHvQ8ery 23zw== 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=PSoXYbR02XTv2fuRf82F4HlUk7Zvkrr/kPlrCVfdBHI=; b=m5bUceV07FR1ubGL1mWqGxCXS6zLDFqYrWW+fbNdJwB8QNs5SW1iPijls2kfrr6ptl VR3YZ2o6uVN8r76GUmLSXk/rwrpnbzzaSKMlXBmhnXSrbYygb61JImA0Erae/LZi4Qyr JD++wB43OCOE3NNO63xvM6zPl9zUQJj3JuBqxyBnKw9AkE28egZgD6DacXJBoRV9uEqJ VqXXoTh9cYnZghRV+9xPzIx+VaolJGsYQMdx4t+oF93NsOK7DAXqLaYxXS5uKSfZzRgm Qr7Drqv8XzK2fc5BZ+NQVgW9IJJDWF/UYGvahNPGX+I4QMYHSGCKomF+YIpCtW6EZzVi zhfg== X-Gm-Message-State: APjAAAUrSJ9HSqzk1LghjxrP3M8lAYOHiLsqRhZ4SnYpSoB1yqMc2XO3 CKNaCzkRXMLjwGOTFqR38ncD9Qsy X-Google-Smtp-Source: APXvYqzEBi8mcTFYqooh4tXASzvrP+esxnWWpTz7wqzVQLXjElhS7URcPwf7LL+/egnBE2dvmmcV/Q== X-Received: by 2002:adf:f391:: with SMTP id m17mr12802960wro.137.1551723655369; Mon, 04 Mar 2019 10:20:55 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:20:01 +0100 Message-Id: <1551723614-1823-42-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::429 Subject: [Qemu-devel] [PULL 41/54] m68k-softmmu.mak: express 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" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini --- default-configs/m68k-softmmu.mak | 3 ++- hw/m68k/Kconfig | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmm= u.mak index a12eece..e17495e 100644 --- a/default-configs/m68k-softmmu.mak +++ b/default-configs/m68k-softmmu.mak @@ -1,5 +1,6 @@ # Default configuration for m68k-softmmu =20 -CONFIG_COLDFIRE=3Dy +# Boards: +# CONFIG_AN5206=3Dy CONFIG_MCF5208=3Dy diff --git a/hw/m68k/Kconfig b/hw/m68k/Kconfig index 8e91eda..49ef0b3 100644 --- a/hw/m68k/Kconfig +++ b/hw/m68k/Kconfig @@ -1,10 +1,9 @@ config AN5206 bool - -config MCF5206 - bool + select COLDFIRE select PTIMER =20 config MCF5208 bool + select COLDFIRE select PTIMER --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551729711492552.4098071100827; Mon, 4 Mar 2019 12:01:51 -0800 (PST) Received: from localhost ([127.0.0.1]:60156 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tmW-0004CE-Ek for importer@patchew.org; Mon, 04 Mar 2019 15:01:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sD1-0002Pn-H2 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCz-0004wa-FE for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:03 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:37960) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCx-0004iM-Ci for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:59 -0500 Received: by mail-wr1-x442.google.com with SMTP id g12so6640333wrm.5 for ; Mon, 04 Mar 2019 10:20:57 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:55 -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=vqci00vRae1XGfirQMhJ3EJu8kT0U4p53PVWDecRAfE=; b=efn2HdQGZGSbDnkfLMSNgoCMoUSdXSe085FzNYhVaPGQlahyxvZKiqNi5G1NDBNNtj i9/Hdf116fa3pch1T1xkKpn9gwVmfTSq1s7y/MO2yvyrK1x6SPhGw00Zp+K9pTclCs1P bS8O/HOdng0EwUHPGbsjF6JceyhizDWQcW8FaJdPYxTfC3DM12d1/uP+vUdGPJeV7uxi 9niIjr1UJG3hqFVJ2rmEKRRg4dieKHrr7RF3S+vX8Q4hJJzsYsAFymAL5LkYQzPyFJip GCGqJfhneIE3xdM3r+wWiUklL/UGRWrOfGjeLiyRKPCShFXLDhP7omNNz0LuXfiaRhf7 9Krw== 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=vqci00vRae1XGfirQMhJ3EJu8kT0U4p53PVWDecRAfE=; b=Fc4sZF0U6VMcrmKjkuiru+yHkWxqrQtFxGqlx7T4+83mBvD+DUuzYmilGZ1yyhakgM jvrYexYZyXepxvDkzjgNdvkaDTlMlXAtm4HinUXj8sAvVuqgW/0rIiLSeV3rQahSGO6w QDBzomvNk1j0JHOoGBx3DjXjTbo7ADX+MAqW1bNYtI6dMBx0MlOaVt1h0WBKR32UWGtl CFbNIroes8FuTFMmcjYqL+bIFkqZPt3vylopSsjR8atmZiXBrx+6x57PTATzzRIYOcLV wZ1cXGESwsWa5WCpNGKDEefM/B3MntU5uClO5AyiEb9tP+IGdm7lkbwOA4E17BYTF5Dh TsqQ== X-Gm-Message-State: APjAAAUdaHnsptOPaXLjQKexUYG5IvOc0iPmeUF1+pL0Sfk/UfFmCDH0 ojzF/ps/hCkEX82Ngqdihq4CnmgW X-Google-Smtp-Source: APXvYqxc1OnOdBFuyZrsvI4hCRZZS2MGtGzqULiS3XVmU2xCIw/mTwMgZsvFAfut3ZMhr0gcCnUUaw== X-Received: by 2002:a5d:4147:: with SMTP id c7mr14382497wrq.235.1551723656211; Mon, 04 Mar 2019 10:20:56 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:20:02 +0100 Message-Id: <1551723614-1823-43-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::442 Subject: [Qemu-devel] [PULL 42/54] microblaze-softmmu.mak: express 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" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini --- default-configs/microblaze-softmmu.mak | 10 ++-------- hw/microblaze/Kconfig | 12 ++++++++++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/micro= blaze-softmmu.mak index 7140ef3..db8c6e4 100644 --- a/default-configs/microblaze-softmmu.mak +++ b/default-configs/microblaze-softmmu.mak @@ -1,13 +1,7 @@ # Default configuration for microblaze-softmmu =20 -CONFIG_PFLASH_CFI01=3Dy -CONFIG_SERIAL=3Dy -CONFIG_XILINX=3Dy -CONFIG_XILINX_AXI=3Dy -CONFIG_XILINX_SPI=3Dy -CONFIG_XILINX_ETHLITE=3Dy -CONFIG_SSI_M25P80=3Dy -CONFIG_XLNX_ZYNQMP=3Dy +# Boards: +# CONFIG_PETALOGIX_S3ADSP1800=3Dy CONFIG_PETALOGIX_ML605=3Dy CONFIG_XLNX_ZYNQMP_PMU=3Dy diff --git a/hw/microblaze/Kconfig b/hw/microblaze/Kconfig index 44683b2..c4dc120 100644 --- a/hw/microblaze/Kconfig +++ b/hw/microblaze/Kconfig @@ -1,8 +1,20 @@ config PETALOGIX_S3ADSP1800 bool + select PFLASH_CFI01 + select XILINX + select XILINX_AXI + select XILINX_ETHLITE =20 config PETALOGIX_ML605 bool + select PFLASH_CFI01 + select SERIAL + select SSI_M25P80 + select XILINX + select XILINX_AXI + select XILINX_ETHLITE + select XILINX_SPI =20 config XLNX_ZYNQMP_PMU bool + select XLNX_ZYNQMP --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551728783822444.11400697107615; Mon, 4 Mar 2019 11:46:23 -0800 (PST) Received: from localhost ([127.0.0.1]:59905 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tXY-0007RV-ND for importer@patchew.org; Mon, 04 Mar 2019 14:46:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46317) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sD5-0002SX-UI for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sD4-00057C-Gp for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:07 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:33489) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sD3-0004jV-KC for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:05 -0500 Received: by mail-wm1-x344.google.com with SMTP id c13so404353wmb.0 for ; Mon, 04 Mar 2019 10:20:58 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:56 -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=GDUDe+QjKgxorclZxkkxyem4z2dj9J/Vh7OFrpkEB3g=; b=HBVUO7Syd5cm1KC/FpTrlO3mbEm6OMjIhFCshkkrFcSGxXFevv5V0Ns3vr+oyCSvPx MKAVBCwojFuV9oehTkWWM/mz0RGHeTj4lrbp47K9e/C99/3600F9SrDu9Z/xOv4elCWJ PeuufjgApx9ZdN6P5WIgeQRaJ4uf5qwaEeXN6Jv7oHaYoUsjKHctxzzc0UrUMq8SgxZy LR679K07ffC7SEVWnVmLrBDD80dYf58gn59/m1b1OT0B2kJyxxburdVE3cKYJ4G1vErb r4I7t3iX1roEVJG4w33IU7clKTfv1gLSoKAWbkfrucR6zgxzfJZRoIiXCjJ4IOZTEQhZ maZw== 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=GDUDe+QjKgxorclZxkkxyem4z2dj9J/Vh7OFrpkEB3g=; b=X2R2L4uhO6BOMEuEJXw/O05e6CAkW56NTGFbBlOcsERo5gQ8Kevkf6eO2FidfynCd3 2nGy0uSQtQk0UmRLHt4CWI4zumiReT6GSLxh0lnzJt+7EtWhI6VXWbmYR3XOhFub7GGX SJaWEj4TUd/H7/lyCt08L15u38st2DqTFV2lcrUT1kidcq4hRBuUKINrOxsErHOzeZQl nz4JUp0qKUUqGEHafI4C69TBiOa9Zj4mFvOe4dwReVz1naS7rhUcGRa1DQqLs/yU4wSi VQ+Gpk1DD8Gxe49HnxR0IILJJa9kAtW0skTQCO4QgqFSPQ7zqDSV6V+g/g/U1a2cII+c idzw== X-Gm-Message-State: APjAAAXAcH5YpqyuzfEXg3x4rgyfKNZVZRgeT2MPmgsr+mNAr15GlOIv 6PlykuMliwqT6pldVm3fXg4Pq9x1 X-Google-Smtp-Source: APXvYqzZL8iAyeHX5yC5G9ukSB96ZRI3I7oVs5Tptx9qbIwK6hvEGtzewhikd/5uUAJBmmy249KiLA== X-Received: by 2002:a7b:cf27:: with SMTP id m7mr283156wmg.80.1551723657002; Mon, 04 Mar 2019 10:20:57 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:20:03 +0100 Message-Id: <1551723614-1823-44-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::344 Subject: [Qemu-devel] [PULL 43/54] moxie-softmmu.mak: express 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" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Moxie does not use VGA, ISA or RTC, and only has a memory-mapped serial port. Adjust for the correct dependencies. Signed-off-by: Paolo Bonzini --- default-configs/moxie-softmmu.mak | 7 ++----- hw/moxie/Kconfig | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/default-configs/moxie-softmmu.mak b/default-configs/moxie-soft= mmu.mak index 17ba906..bd50da3 100644 --- a/default-configs/moxie-softmmu.mak +++ b/default-configs/moxie-softmmu.mak @@ -1,8 +1,5 @@ # Default configuration for moxie-softmmu =20 -CONFIG_ISA_BUS=3Dy -CONFIG_MC146818RTC=3Dy -CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy -CONFIG_VGA=3Dy +# Boards: +# CONFIG_MOXIESIM=3Dy diff --git a/hw/moxie/Kconfig b/hw/moxie/Kconfig index 03f62e3..3793ef0 100644 --- a/hw/moxie/Kconfig +++ b/hw/moxie/Kconfig @@ -1,2 +1,3 @@ config MOXIESIM bool + select SERIAL --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551729899475986.4314686582135; Mon, 4 Mar 2019 12:04:59 -0800 (PST) Received: from localhost ([127.0.0.1]:60182 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tpU-0006b8-DI for importer@patchew.org; Mon, 04 Mar 2019 15:04:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sD4-0002R7-Kz for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sD3-000545-Jk for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:06 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:37049) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sD1-0004mR-EE for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:03 -0500 Received: by mail-wm1-x341.google.com with SMTP id x10so127913wmg.2 for ; Mon, 04 Mar 2019 10:20:59 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:57 -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=klJ/Hs9ECxa12HZ+XmFOyqcRdDExAPz2E1W/0og8DE4=; b=Ux3j+iBG+tCPZl6NnfXhQ+62oXDaqcpNRBJ0au5LpxbaDeGaZfla1hW3PsxeF4VHs+ u7pe9ouOKONYuTRhatfKPcqeBR7U1DkPiLVDvcymdRiH8iB/J4lj0edd1FqPBbE6FcX4 2P3dNmeYYpvKLkWix6LYOG2LOKK+mf2MMTvzoqcZQaOdgfbH6h6k+qDVTrjvreeT3ter B0j/ejyUH6u6r6gl6RqQgFyJhLWfhPHrzX6sZToS1yLBuyEamxHvaOfA4vkB+5lHWLcF m+AZkB6lAMPyqweR4I9oMO2/WoRL7XTduPhCXjLp/PwY/F+L/1YqtSiZTkl76DmK/5+b ZqaA== 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=klJ/Hs9ECxa12HZ+XmFOyqcRdDExAPz2E1W/0og8DE4=; b=lRJdnXkSM4Qc1dPcyelyMtxxI8Kkd3GZ67EwF5NYMq6zOAo8l9IUTGbI/qUftsLSFS JO6ysVia5dzYlSI8ffk2Sgfu99ZymZEfDY50sAtBZpR2BgFrnf0mL3ZuWJFXEauM/QSw aKi0HYW4mlwy8ia7CWBbJc4EYAb6l22JdGz0XCQXy2T4LHEQmi4TLRweUn/o+xaU801f jD62DLDBC7sAYg8jyuSQ41L0wnRIS0N2oUxgB3LUJB8AzMCagpi92d7NrmTn17KoqJXG S6g9xeZh1FhyvtNll21gdUUn7sHR/kzkx6hraPR2CBwGl2gZBwVGdZyH2eRcpRVtfGcG ilFg== X-Gm-Message-State: APjAAAXET2Zl0a7PHIgm8/PsYWKLHwTlO/A2U148zT7txfybTO3CF6Tr Ni4zqIh0n5RYfRQyTmhxfyyzOGmk X-Google-Smtp-Source: APXvYqwDV5E+E4ZetUVqaFPR9+NwUiYg8S/Yrtk1WQxs7IsSqfnHzZqwjFvLZNQbHDYIEqMvNvRN2Q== X-Received: by 2002:a1c:e084:: with SMTP id x126mr273135wmg.39.1551723657861; Mon, 04 Mar 2019 10:20:57 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:20:04 +0100 Message-Id: <1551723614-1823-45-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::341 Subject: [Qemu-devel] [PULL 44/54] nios2-softmmu.mak: express 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" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini --- default-configs/nios2-softmmu.mak | 5 ++--- hw/nios2/Kconfig | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/default-configs/nios2-softmmu.mak b/default-configs/nios2-soft= mmu.mak index b3c507e..e11dc54 100644 --- a/default-configs/nios2-softmmu.mak +++ b/default-configs/nios2-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for nios2-softmmu =20 -CONFIG_NIOS2=3Dy -CONFIG_SERIAL=3Dy -CONFIG_ALTERA_TIMER=3Dy +# Boards: +# CONFIG_NIOS2_10M50=3Dy diff --git a/hw/nios2/Kconfig b/hw/nios2/Kconfig index 22817e4..ab953e0 100644 --- a/hw/nios2/Kconfig +++ b/hw/nios2/Kconfig @@ -1,5 +1,8 @@ config NIOS2_10M50 bool + select NIOS2 + select SERIAL + select ALTERA_TIMER =20 config NIOS2 bool --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551728598970935.7939294813018; Mon, 4 Mar 2019 11:43:18 -0800 (PST) Received: from localhost ([127.0.0.1]:59846 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tUZ-0004Gc-U5 for importer@patchew.org; Mon, 04 Mar 2019 14:43:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sDC-0002Xn-SB for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sD9-0005EH-J6 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:13 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:41184) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sD6-0004qn-2j for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:09 -0500 Received: by mail-wr1-x42e.google.com with SMTP id n2so6634467wrw.8 for ; Mon, 04 Mar 2019 10:20:59 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:58 -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=+mITbK0sV/p/wHQkgkimbl85T3Zhe8uz8eGh/gUPV0s=; b=K7GpRcEUku7qgLxGtUVT7/IUWC2PWnfcGCA6CXOsOPKS9hLthqFkcRuAeCqro7p08f bg3IGsA6pK4Q+EhtINxQk5vnjlLonIxmYOZqw7KgGuBpvWbKvGO4KyFz1Uh0T4tQ274h h5rae/sp3rS9PbxPTIyQKvBm8e3q6IQGL9geLTK/UaMP2f4swtknI+ym3GziHyD0Dsrg BGp+IV7TUx48OeTF/dNhuAjTXdFnd1uk2wNX3vN8JYpco3TxbwGPrDkaTA7NH0NEe2BO I1bFZoN8ikWFMdrZpXu0DYaD52/keABEdFni07mQ9Mzl9lAwgVOXCfPVBhN3UuZFAExA ZYsg== 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=+mITbK0sV/p/wHQkgkimbl85T3Zhe8uz8eGh/gUPV0s=; b=XMmrIIghJHaukskW4kRR2YHf0u4SoOZnDffpPaR5P7Emq1QSnH5ym+VyngMwdZLN3S bi9YmWZjYeEYy+sfW4LmX4S9Zou7Rc6Y4kRMcVJMvKX7rjJlgiwIcXjhkaRBgUD//Eik xfLWLk0gC6FXYXAms5LBcLqj4poJRipnHnNdsUFi/+G5El3yTWzNDw/WMNgqGtwOW9EM iDJ1ACfFixBkUpH6pv5nE47IMsq1r1yNdlx2fejpKlZyWqDXfwpgVM2ckdRKtXQU6V6h GmMt6yNRTwo6qoHcirKNfu2MWhr+0kXhfQ1YkVrfO7mo5ATT6dkHwOGoo0Nwjctg3eeU otAQ== X-Gm-Message-State: APjAAAXuznKOdkQw4PBwbFBtQUA1mrwnoIrwP8f2O80mXV5L/OIzFgV1 oKizJYJBmuxR8Pr/0dm+84jQQakL X-Google-Smtp-Source: APXvYqyv315/L39dLClf40w0ZM2/LHx5UTbm2AbzmNjZgi8z3hfR/6uz9skXg/gY2iUI4VSGYS/IGQ== X-Received: by 2002:adf:9c85:: with SMTP id d5mr13490526wre.68.1551723658792; Mon, 04 Mar 2019 10:20:58 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:20:05 +0100 Message-Id: <1551723614-1823-46-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::42e Subject: [Qemu-devel] [PULL 45/54] or1k-softmmu.mak: express 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" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini --- default-configs/or1k-softmmu.mak | 5 ++--- hw/openrisc/Kconfig | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/default-configs/or1k-softmmu.mak b/default-configs/or1k-softmm= u.mak index 6a0f2ef..168101c 100644 --- a/default-configs/or1k-softmmu.mak +++ b/default-configs/or1k-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for or1k-softmmu =20 -CONFIG_SERIAL=3Dy -CONFIG_OPENCORES_ETH=3Dy -CONFIG_OMPIC=3Dy +# Boards: +# CONFIG_OR1K_SIM=3Dy diff --git a/hw/openrisc/Kconfig b/hw/openrisc/Kconfig index 7aef98d..6c1e868 100644 --- a/hw/openrisc/Kconfig +++ b/hw/openrisc/Kconfig @@ -1,2 +1,5 @@ config OR1K_SIM bool + select SERIAL + select OPENCORES_ETH + select OMPIC --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551729340851921.8950507226355; Mon, 4 Mar 2019 11:55:40 -0800 (PST) Received: from localhost ([127.0.0.1]:60023 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tgT-0006T7-Qp for importer@patchew.org; Mon, 04 Mar 2019 14:55:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sDC-0002Xt-TN for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sD4-00057T-KD for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:14 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:42397) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sD3-0004sm-LT for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:05 -0500 Received: by mail-wr1-x42e.google.com with SMTP id r5so6632384wrg.9 for ; Mon, 04 Mar 2019 10:21:00 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:59 -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=QgqBdMuhJzYZYJTvGb920gQmStPDhqh9vYdN2guZ+I4=; b=FE7apUoMyQlK88RBHV34RbsykLzgwvQj7gjILDMFr+JP81w+7JKjPP4lIe3idTt12R cUu729wH2HN7GcjV+VhIOnSud/gQO7WRHEO/dY16kiyRgsU0qPjkJDJOXS4heKonhpbO 9BMLIkojpzEIr6koEJn+u6XEdxD/FB+XcgLxzYCadOOCNsAKZ3FwxmGUcmuUUy5y10+l TzavKjrD+how9saHypOOFxm+XUwb4qVzUQHTGL04GxZVPp75YM4C8nwMlvDSi0ABfsCG 9wqY/tH9PoDoeePw8tWFj6b/nRApL8J4jhoY1GgAqA/nfWuUtwFOVl6ZNXNXGi9gIffr ciUA== 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=QgqBdMuhJzYZYJTvGb920gQmStPDhqh9vYdN2guZ+I4=; b=jLKgcYtCHvdO+SJ9mGe+IAzDUXr1rC9j1Z1E97waICyGB2akmjLofOb7wdAFejp0On Z8yoDN3dxvkkP6oc88osb97dPn0G0D0CiHyus0FO/y5uDpmwLpfAPsxxGuv0gefi41T5 EqqmHnVz9G4Nh4XL0mlh+IT2UxiWZBXg3YEkdK2dBW3z9DIV6o/a8lgJ8/taVj9izjBa B2/F+lXGJFZW/I3kkixEcZPERSczo5r4SKs1fHmGqlqOH5E0PXcuT8Y1veook7PI33BG lUNG7iR+6MbiE/Shv3YuMOZx1DHjud1qP7e1E2UzLJEOBNXOHBWDpOKqL+Nq5cewS2pe 9fTw== X-Gm-Message-State: APjAAAUaHcuMwlG4aguxz1kTTfcmLuE91yD3D6myIXWadrNMqC6u/kO6 6cAb5O+krUpeGIo+UnNDb8AmOVJr X-Google-Smtp-Source: APXvYqyC19dTUhQdXBu/KwZrAy2F3hs3rw66wP1VAHjnKzNC+fOvPLR0EvH+Mxfj9Ni306/dAUqU9g== X-Received: by 2002:a5d:4e52:: with SMTP id r18mr12899159wrt.7.1551723659759; Mon, 04 Mar 2019 10:20:59 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:20:06 +0100 Message-Id: <1551723614-1823-47-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::42e Subject: [Qemu-devel] [PULL 46/54] riscv-softmmu.mak: replace CONFIG_* with Kconfig "select" directives 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" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini --- default-configs/riscv32-softmmu.mak | 21 ++++++--------------- default-configs/riscv64-softmmu.mak | 22 ++-------------------- hw/riscv/Kconfig | 13 +++++++++++++ 3 files changed, 21 insertions(+), 35 deletions(-) diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index fd91efb..1ae077e 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -1,21 +1,12 @@ -# Default configuration for riscv-softmmu +# Default configuration for riscv32-softmmu =20 -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_SERIAL=3Dy -CONFIG_VIRTIO_MMIO=3Dy - -CONFIG_CADENCE=3Dy - -CONFIG_PCI_EXPRESS=3Dy -CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy - -CONFIG_VGA=3Dy -CONFIG_VGA_PCI=3Dy +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_PCI_DEVICES=3Dn =20 +# Boards: +# CONFIG_SPIKE=3Dy -CONFIG_HART=3Dy CONFIG_SIFIVE_E=3Dy -CONFIG_SIFIVE=3Dy CONFIG_SIFIVE_U=3Dy CONFIG_RISCV_VIRT=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index fd91efb..235c6f4 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -1,21 +1,3 @@ -# Default configuration for riscv-softmmu +# Default configuration for riscv64-softmmu =20 -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_SERIAL=3Dy -CONFIG_VIRTIO_MMIO=3Dy - -CONFIG_CADENCE=3Dy - -CONFIG_PCI_EXPRESS=3Dy -CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy - -CONFIG_VGA=3Dy -CONFIG_VGA_PCI=3Dy - -CONFIG_SPIKE=3Dy -CONFIG_HART=3Dy -CONFIG_SIFIVE_E=3Dy -CONFIG_SIFIVE=3Dy -CONFIG_SIFIVE_U=3Dy -CONFIG_RISCV_VIRT=3Dy +include riscv32-softmmu.mak diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig index 4989589..e0ee304 100644 --- a/hw/riscv/Kconfig +++ b/hw/riscv/Kconfig @@ -9,12 +9,25 @@ config SIFIVE =20 config SIFIVE_E bool + select HART + select SIFIVE =20 config SIFIVE_U bool + select CADENCE + select HART + select SIFIVE =20 config SPIKE bool + select HART + select HTIF + select SIFIVE =20 config RISCV_VIRT bool + select HART + select SERIAL + select VIRTIO_MMIO + select PCI_EXPRESS_GENERIC_BRIDGE + select SIFIVE --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551730253265120.82799578856668; Mon, 4 Mar 2019 12:10:53 -0800 (PST) Received: from localhost ([127.0.0.1]:60319 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tvF-00038I-0u for importer@patchew.org; Mon, 04 Mar 2019 15:10:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46381) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sD7-0002UB-FI for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sD5-00059i-Tw for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:09 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:43410) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sD4-0004vA-JZ for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:07 -0500 Received: by mail-wr1-x441.google.com with SMTP id d17so6638313wre.10 for ; Mon, 04 Mar 2019 10:21:01 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:21: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=SRwyIvW+u5c0BibQ8SjXniAV6J1NU4E+SgBz35m2GG0=; b=iPATjdsKBNgXKUj/zWul5OwPP2JqC1Kf+Hy5S4hXprghq3/OyCYMfFW0VBuLavjz5a TgeDvSt0UTjrWuJ7BvtoPQIAwcOrJTtazNOYk8ziiXubak77Z+BWjDqn5PmDDAaagsZ1 n8j0CCMJ1XdUzCqzJOoqtvFUk5GrcqlTSv5mke2B4k9E37MzdhMlAbF0OxJLeY6tPMZU 5Ms/9zNZBH5g+zXUKaNbiD0Ror929Z4fZmXvEOJnoaUO6FyW1ebdedEOlyLGgbEpK9ok EM85Gvjl23n37wUprxPgDId04QrIS30Mr0Bt3b+qI2VPKN37BugX7joGBgVDO5y8FT3A ydVA== 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=SRwyIvW+u5c0BibQ8SjXniAV6J1NU4E+SgBz35m2GG0=; b=kcR2Klw2pxmfPLM6UFjd5zZ08BP7ej8eLGjNbjbevMDdzwqpmiLbmrVt2rNbQnRvpr 9igw/M5W+xnvCoCLm0a53ugse1/zD5N0jw7suQHWiisYzHbR+acBSTx/ZZrDvPmigB8C B/xIY0GSCX6KDZIonsmKaUIZfNbE1kr+/MDbW3iUEq1nE/F3lX/iN0MRy4pLib6jGLR4 /R+cuywoaALrnWTUNMrA5qIrKxNvMgB4j5Qv+BRBgOoPAYVf4qGWReDSEWBne4QxQmu+ SVG8KVwT390B6YwdMFgHxl02p0/eWRMPlLZTIVtiQCQ1vEI+00+OsjwGNoollTUFRNeM RQKw== X-Gm-Message-State: APjAAAU7rhQWU3pDGN0xKVv92mS0as8bMiwA/I7eEU9vibZOWO/9U/0p RTETL2a495aeClc+G44tv8Ur6hjq X-Google-Smtp-Source: APXvYqxIdaun9kC+UVxlAonqC7tP++nMo22XupqXycVT54l8DnZaMl7fqlFOOtcR/l9YlZ6jlnu7uQ== X-Received: by 2002:a5d:570a:: with SMTP id a10mr10094947wrv.85.1551723660562; Mon, 04 Mar 2019 10:21:00 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:20:07 +0100 Message-Id: <1551723614-1823-48-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::441 Subject: [Qemu-devel] [PULL 47/54] s390x: express 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: Thomas Huth Instead of hard-coding all config switches in the config file default-configs/s390x-softmmu.mak, let's use the new Kconfig files to express the necessary dependencies: The S390_CCW_VIRTIO config switch for the "s390-ccw-virtio" machine now selects all non-optional devices. And since we already have the VIRTIO_PCI and VIRTIO_MMIO config switches for the other two virtio transports, this patch also introduces a new config switch VIRTIO_CCW for the third, s390x-specific virtio transport, so that all three virtio transports are now handled in the same way. Signed-off-by: Thomas Huth Acked-by: Cornelia Huck Signed-off-by: Paolo Bonzini --- default-configs/s390x-softmmu.mak | 20 ++++++++++++-------- hw/s390x/Kconfig | 9 +++++++++ hw/s390x/Makefile.objs | 4 +++- hw/virtio/Kconfig | 4 ++++ 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-soft= mmu.mak index 2be5059..f2287a1 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -1,9 +1,13 @@ -CONFIG_PCI=3Dy -CONFIG_VIRTIO_PCI=3Dy -CONFIG_SCLPCONSOLE=3Dy -CONFIG_TERMINAL3270=3Dy -CONFIG_S390_FLIC=3Dy -CONFIG_WDT_DIAG288=3Dy +# Default configuration for s390x-softmmu + +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_TERMINAL3270=3Dn +#CONFIG_VFIO_AP=3Dn +#CONFIG_VFIO_CCW=3Dn +#CONFIG_VIRTIO_PCI=3Dn +#CONFIG_WDT_DIAG288=3Dn + +# Boards: +# CONFIG_S390_CCW_VIRTIO=3Dy -CONFIG_VFIO_CCW=3Dy -CONFIG_VFIO_AP=3Dy diff --git a/hw/s390x/Kconfig b/hw/s390x/Kconfig index 303db7f..a7046ea 100644 --- a/hw/s390x/Kconfig +++ b/hw/s390x/Kconfig @@ -1,2 +1,11 @@ config S390_CCW_VIRTIO bool + imply VIRTIO_PCI + imply TERMINAL3270 + imply VFIO_AP + imply VFIO_CCW + imply WDT_DIAG288 + select PCI + select S390_FLIC + select SCLPCONSOLE + select VIRTIO_CCW diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs index bfd5326..e02ed80 100644 --- a/hw/s390x/Makefile.objs +++ b/hw/s390x/Makefile.objs @@ -6,7 +6,8 @@ obj-y +=3D sclpcpu.o obj-y +=3D ipl.o obj-y +=3D css.o obj-$(CONFIG_S390_CCW_VIRTIO) +=3D s390-virtio-ccw.o -obj-y +=3D 3270-ccw.o +obj-$(CONFIG_TERMINAL3270) +=3D 3270-ccw.o +ifeq ($(CONFIG_VIRTIO_CCW),y) obj-y +=3D virtio-ccw.o obj-$(CONFIG_VIRTIO_SERIAL) +=3D virtio-ccw-serial.o obj-$(CONFIG_VIRTIO_BALLOON) +=3D virtio-ccw-balloon.o @@ -19,6 +20,7 @@ obj-$(CONFIG_VIRTIO_NET) +=3D virtio-ccw-net.o obj-$(CONFIG_VIRTIO_BLK) +=3D virtio-ccw-blk.o obj-$(call land,$(CONFIG_VIRTIO_9P),$(CONFIG_VIRTFS)) +=3D virtio-ccw-9p.o obj-$(CONFIG_VHOST_VSOCK) +=3D vhost-vsock-ccw.o +endif obj-y +=3D css-bridge.o obj-y +=3D ccw-device.o obj-y +=3D s390-pci-bus.o s390-pci-inst.o diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig index 74f4573..e0452de 100644 --- a/hw/virtio/Kconfig +++ b/hw/virtio/Kconfig @@ -16,6 +16,10 @@ config VIRTIO_MMIO bool select VIRTIO =20 +config VIRTIO_CCW + bool + select VIRTIO + config VIRTIO_BALLOON bool default y --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551728988562912.6300266594649; Mon, 4 Mar 2019 11:49:48 -0800 (PST) Received: from localhost ([127.0.0.1]:59932 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tar-0001SM-EY for importer@patchew.org; Mon, 04 Mar 2019 14:49:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46323) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sD6-0002Sg-1h for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sD4-00057Z-LR for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:07 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:53714) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sD3-0004xg-QE for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:06 -0500 Received: by mail-wm1-x332.google.com with SMTP id e74so129320wmg.3 for ; Mon, 04 Mar 2019 10:21:02 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.21.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:21: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=5gJM+Uoo0C9kJr/jT5zAR4CvLYEHTQs4ZFvYyqQRLaQ=; b=GwXaYH55HkofXqwZZBCPGH8nleaQmvNokT0s4XekOakSqp9fxFch+16huakc2WED+4 YjCl31tdh16QpPKs7Nrz5bgvP+LuRr/JL/IPQToTD5/km4N9AyfdexT+ZDbweZ+FsG+O PklJ9sgea9tNHbnIOChrQkjMKCk5V+tqWnalCICxHmbj6qoSLMnHcolCeXaFEBw5dhhu 8kv+M7HweTiw1N0lXzOvzjC6Rt1MgEyaZZtdDg7HhN96O+TcOZxisuprLVnebn3oF4a9 cfLGmb3izXA3ni9xJfUmUt+loPHIZbB1RoYl3cXR5jBjwaLpxG/JJ6lMVtX7wBquF8us nOdg== 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=5gJM+Uoo0C9kJr/jT5zAR4CvLYEHTQs4ZFvYyqQRLaQ=; b=RmXrFS4DXhsy6T5zNC/LjS2JcoFH3fFnmBnkjXie649+vWvRtsu2k2lCRs1PAnVJ/N RGpFqhq8LH0Vv2NZnjNvHgKZq96EiDLLA1FYfHdmryrKFqujx3hUYNxUmLsa00HNtU38 rEelkL7cGsLM91/gy6ZQgwHq2kVu+7ITc5FKyEZoxGd4ZxwKa4IAx6e1TmIlmtRXOI+u c5TLIGVLcVtb7CzdMTowqxjJafeVjzGLLapCN87BpvRbve97aLl/76ApxDO2rN1CZCcC e9SC6KZpNACl0Cd/MzNWrHYkatUqmlsRQ6zwVqpc2u6YprE8lQG7DEYE680Gi/Vte8yk HPnw== X-Gm-Message-State: APjAAAXEfin9Syi+sNG//bk9YZiW01S5vaoHEo1qZ4d8eO1rQLdEe7nG 7DrRTr1tVgMPIcPn5QszJm6uRcVW X-Google-Smtp-Source: APXvYqwG62exvq/xIF6s/h/BQG2eIMmiIN4oilTBaI3QBmwyjuvWi2CLvJuwhPATz/MjkkskG57xBg== X-Received: by 2002:a1c:80d6:: with SMTP id b205mr269507wmd.109.1551723661291; Mon, 04 Mar 2019 10:21:01 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:20:08 +0100 Message-Id: <1551723614-1823-49-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::332 Subject: [Qemu-devel] [PULL 48/54] sh4-softmmu.mak: express 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" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Note that USB_OHCI was missing (it was brought in via pci.mak, but r2d needs the sysbus version) and SERIAL is not used. Signed-off-by: Paolo Bonzini --- default-configs/sh4-softmmu.mak | 18 +++++++----------- default-configs/sh4eb-softmmu.mak | 13 +------------ hw/sh4/Kconfig | 11 +++++++++++ 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 4ba5584..565e8b0 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -1,15 +1,11 @@ # Default configuration for sh4eb-softmmu =20 -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_SERIAL=3Dy -CONFIG_PFLASH_CFI02=3Dy -CONFIG_SH4=3Dy -CONFIG_IDE_MMIO=3Dy -CONFIG_SM501=3Dy -CONFIG_TEST_DEVICES=3Dy -CONFIG_I82378=3Dy -CONFIG_I82374=3Dy +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_PCI_DEVICES=3Dn +#CONFIG_TEST_DEVICES=3Dn + +# Boards: +# CONFIG_R2D=3Dy CONFIG_SHIX=3Dy -CONFIG_TEST_DEVICES=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index 9717673..522a7a5 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -1,14 +1,3 @@ # Default configuration for sh4eb-softmmu =20 -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_SERIAL=3Dy -CONFIG_PFLASH_CFI02=3Dy -CONFIG_SH4=3Dy -CONFIG_IDE_MMIO=3Dy -CONFIG_SM501=3Dy -CONFIG_TEST_DEVICES=3Dy -CONFIG_I82378=3Dy -CONFIG_I82374=3Dy -CONFIG_R2D=3Dy -CONFIG_SHIX=3Dy +include sh4-softmmu.mak diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 1ea2bc3..8597613 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -1,8 +1,19 @@ config R2D bool + imply PCI_DEVICES + imply TEST_DEVICES + select I82378 if TEST_DEVICES + select IDE_MMIO + select PFLASH_CFI02 + select USB_OHCI + select PCI + select SM501 + select SH4 =20 config SHIX bool + select SH7750 + select SH4 =20 config SH7750 bool --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551728955316935.592779785292; Mon, 4 Mar 2019 11:49:15 -0800 (PST) Received: from localhost ([127.0.0.1]:59927 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0taJ-00012E-8b for importer@patchew.org; Mon, 04 Mar 2019 14:49:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sD7-0002UA-FG for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sD5-00059M-Oo for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:09 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:45377) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sD3-0004z5-V2 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:06 -0500 Received: by mail-wr1-x444.google.com with SMTP id w17so6627528wrn.12 for ; Mon, 04 Mar 2019 10:21:03 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.21.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:21:01 -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=MhUXd5Pm+Wlj2lKmdF0Sg/ajiEC2Wm5Cm4hvyeDOv/k=; b=m+hQERuy8Mos7jSfY/SGSLxkO9Tq/nm6E2oyNUpheylnGo+hiPUor9YiGfsfXnzOEr igkfv6amtaQyQVQO1yBLr8a5hW9XT5RYUjHQqRs/ub/fBTypNCdvY4Gj0VFSJNd8Pub3 vdmiue/0C17ALA4zFdjC9bgUIr33pC1IET/HeDJU/Pb+/zfwzOwRevAPXVsLTwOIrupI KroQkPaW1M36UOnlBgr6QIBKDm1VAEEeMfh7/Jv8pxEj/9Jb3RLk2TV26dQRF+WBYwOh qTGgzt3qaYoC1RdkGBMisuUfz8L6Ao6R0LmPFUII63M5aTYWudoA/io3tENELuTea0mR IF2g== 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=MhUXd5Pm+Wlj2lKmdF0Sg/ajiEC2Wm5Cm4hvyeDOv/k=; b=ASpiidHlxK6GxuYSWEWKU2AsoNoR8tDKHMrIUT9W1vOJvva/EwlMDR7Ufj63jF938q CGlTjvexr4gVEvKIw4n35a6PusrqZzHGK9pSgmQgwMFy6dK7mLOmOHS0pGZlDmluwusR HLsxYR9IL7TgwiYLEibEb4urhVEcrLHSyqWrD2iPExquVTsPIrcyM9ow9/nrodpWVt41 wfMN8Px4IidILUzAtAvwAhynQoQI0g1Cq9zxQYdBK43Shi65uyCTOdH2QSxKcLSvYhfw VUn6JLO06LBytno3nxYmVa8oL1XU6iG72vojJHf8nCImnuQMCrJqI0I9E7zCq4jrikAl Y25A== X-Gm-Message-State: APjAAAVEHgOPk94QEmmrpc2k6XhnyZVT3+X3SAIzVgZjAs96Z+ggo4TF x+YGmkxSd7UtKNaI1rE64gp5jorT X-Google-Smtp-Source: APXvYqy5OQqa3uB/S/UT6FUdhnfhuRGVucn0MCscnbvj2kHSVZ2miFKKyrvcQpA6R9atJagCrQX9UQ== X-Received: by 2002:a5d:650d:: with SMTP id x13mr13729911wru.119.1551723662229; Mon, 04 Mar 2019 10:21:02 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:20:09 +0100 Message-Id: <1551723614-1823-50-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::444 Subject: [Qemu-devel] [PULL 49/54] sparc-softmmu.mak: express 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" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini --- default-configs/sparc-softmmu.mak | 22 ++++++---------------- hw/misc/Kconfig | 1 + hw/net/Kconfig | 1 + hw/sparc/Kconfig | 13 +++++++++++++ 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-soft= mmu.mak index b31a9f2..ee85218 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -1,21 +1,11 @@ # Default configuration for sparc-softmmu =20 -CONFIG_ISA_BUS=3Dy -CONFIG_ECC=3Dy -CONFIG_ESP=3Dy -CONFIG_ESCC=3Dy -CONFIG_M48T59=3Dy -CONFIG_FDC=3Dy -CONFIG_EMPTY_SLOT=3Dy -CONFIG_PCNET_COMMON=3Dy -CONFIG_LANCE=3Dy -CONFIG_TCX=3Dy -CONFIG_CG3=3Dy -CONFIG_SLAVIO=3Dy -CONFIG_CS4231=3Dy -CONFIG_GRLIB=3Dy -CONFIG_STP2000=3Dy -CONFIG_ECCMEMCTL=3Dy +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_TCX=3Dn +#CONFIG_CG3=3Dn =20 +# Boards: +# CONFIG_SUN4M=3Dy CONFIG_LEON3=3Dy diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index a012d2c..2c60be9 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -71,6 +71,7 @@ config IVSHMEM_DEVICE =20 config ECCMEMCTL bool + select ECC =20 config IMX bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index 6b4633b..c00ec03 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -77,6 +77,7 @@ config STELLARIS_ENET =20 config LANCE bool + select PCNET_COMMON =20 config SUNHME bool diff --git a/hw/sparc/Kconfig b/hw/sparc/Kconfig index c9c2142..2a83a80 100644 --- a/hw/sparc/Kconfig +++ b/hw/sparc/Kconfig @@ -1,8 +1,21 @@ config SUN4M bool + imply TCX + imply CG3 + select CS4231 + select ECCMEMCTL + select EMPTY_SLOT + select ESCC + select ESP + select FDC + select SLAVIO + select LANCE + select M48T59 + select STP2000 =20 config LEON3 bool + select GRLIB =20 config GRLIB bool --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551730416057360.57055620264646; Mon, 4 Mar 2019 12:13:36 -0800 (PST) Received: from localhost ([127.0.0.1]:60379 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0txr-0005by-W0 for importer@patchew.org; Mon, 04 Mar 2019 15:13:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sD7-0002UE-GV for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sD6-0005Ai-4L for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:09 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:33022) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sD5-00050v-Ny for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:07 -0500 Received: by mail-wr1-x444.google.com with SMTP id i12so6644210wrw.0 for ; Mon, 04 Mar 2019 10:21:04 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.21.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:21:02 -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=lRWytvmXezRJFWGrdYcAD3Cz+nCCYBhlZ42inWCQv+Q=; b=CMtTOnv7FHFd4ol3RI9SnXw18CLVC7PO9suczyVKvSSBRG/dukJR7Uh3G+4cxOiFZ3 2S+W1i00mpUpuvopuegyYLCrAkaO910bijxgjO+bMxklKWIfIX1Tv0+EU/B844HnPmOX Xfu2KfbjTOEDbs014K86YqyMxPGAVg+nzh56frtlCrid5kaoFEXg1BiGZSda2eg3YaVt N99hd4jR84wIvuSTprktYt0T8S2fLEKSOf//iBZKNRmk+CmLji5cWv1o0kak2k0obl1Z /jmjHokY2pqBByt5lT7xgMaDV4LEzcSQGrUOwQqSpNTJD4ol3qrgyhSnIIPYTmByUBFQ SEIA== 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=lRWytvmXezRJFWGrdYcAD3Cz+nCCYBhlZ42inWCQv+Q=; b=cDxWyl1PymyPYCpYEcRRF7dssz2LfpFyq8ws0B10mkcE3IR1Ccc/v55mnWy/9Dbzqa saYF6vqoq2EwgDx6QBxV9olCU1+fzwxBAWQza2jbS8npCghT+9Y8iiuH/zysPSQcI+/m K0fMwWqLIc2aCE5NYnh0xJ9c8kodlnRXU9w/cfBnvcKWchRlnFRfryYGCDbOXMJf43Tn V537CDWwS6S8Bpxt/haSLAg5cqIEVzWrDPzi6SNtfpAslIhTsnvQjZZ2tEmBrnl8ZnPX 7A4tfsEAnEMs7I2RJiB0ToN/wOb1KRtIgkb/iBPo/wyq37FiCaGZL33+6ugzP/MC7+3m BMgA== X-Gm-Message-State: APjAAAWzvOTiJhsxx8FX7UfRv7JJXv8fZrFLGtyci+vZG3HX/HxVwINA nFQEGFkbTDqgFQY5gvUG/WZlxfFg X-Google-Smtp-Source: APXvYqxnY53h5NiIYYlIczuOGGVMcikEqkT8C2fPYKPbzhph1AZ1cRYpXBArE2JXe+EuP53rqf9yGA== X-Received: by 2002:a5d:4711:: with SMTP id y17mr14352693wrq.141.1551723663071; Mon, 04 Mar 2019 10:21:03 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:20:10 +0100 Message-Id: <1551723614-1823-51-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::444 Subject: [Qemu-devel] [PULL 50/54] sparc64-softmmu.mak: express 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" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini --- default-configs/sparc64-softmmu.mak | 23 ++++++++--------------- hw/sparc64/Kconfig | 13 +++++++++++++ 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index 528af8f..e50030a 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -1,19 +1,12 @@ # Default configuration for sparc64-softmmu =20 -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_M48T59=3Dy -CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy -CONFIG_PARALLEL=3Dy -CONFIG_PCKBD=3Dy -CONFIG_FDC=3Dy -CONFIG_IDE_CMD646=3Dy -CONFIG_PCI_SABRE=3Dy -CONFIG_SIMBA=3Dy -CONFIG_SUNHME=3Dy -CONFIG_MC146818RTC=3Dy -CONFIG_TEST_DEVICES=3Dy -CONFIG_SUN4V_RTC=3Dy +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_PCI_DEVICES=3Dn +#CONFIG_SUNHME=3Dn +#CONFIG_TEST_DEVICES=3Dn + +# Boards: +# CONFIG_SUN4U=3Dy CONFIG_NIAGARA=3Dy diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig index 41f7295..4a8166e 100644 --- a/hw/sparc64/Kconfig +++ b/hw/sparc64/Kconfig @@ -1,6 +1,19 @@ config SUN4U bool + imply PCI_DEVICES + imply SUNHME + imply TEST_DEVICES + select M48T59 select ISA_BUS + select FDC + select SERIAL_ISA + select PCI_SABRE + select IDE_CMD646 + select PARALLEL + select PCKBD + select SIMBA =20 config NIAGARA bool + select EMPTY_SLOT + select SUN4V_RTC --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551729170446330.2651665974903; Mon, 4 Mar 2019 11:52:50 -0800 (PST) Received: from localhost ([127.0.0.1]:59991 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tdm-00042h-E6 for importer@patchew.org; Mon, 04 Mar 2019 14:52:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46475) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sDC-0002Xr-St for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sDA-0005Fb-87 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:14 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:45375) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sD7-000533-Ed for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:11 -0500 Received: by mail-wr1-x441.google.com with SMTP id w17so6627622wrn.12 for ; Mon, 04 Mar 2019 10:21:05 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.21.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:21:03 -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=tMKMSy3+8dwCidkJZbNjAhdE6SHIn2k3fDcUvd8yy0I=; b=e/mFWbpqRWl3zoHyuJskyEJC06ipdEB0NJsAhLux6lwNLBDtVuJSh3P14KLoSFf+LU c9XnsEz1w6YNU2Oomv1pdt93aoq6XAlkQTYz5fdVb6F3hYaXYxzq7fuMkPaM0K5oUJXO a3cwRtLLok67cqdIWupFIun9wUMEsDsTgHKA9AwX4v8/E/CFM9wziHe7UPyvNrfwwMnK dOYu+L0AK3qdlnUeNM9YWCszw0bwjoGBHODe5UwlzJ3c358U+qzbpNi/mIvV4WzVROf/ yuWKTxfrrL5/lsLRTJgGVh7JqWzppWdFcrqIlqObJ97/5eS/+GNCTlM1ZRPrOX8IcdZd XVSA== 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=tMKMSy3+8dwCidkJZbNjAhdE6SHIn2k3fDcUvd8yy0I=; b=NRLoLpVOaG2pRDhfZqGR6kqgX4K3HuqKZq1OyzjQsAUJxnYR2M4W9u0pI9+lMzHcct 2QTytasWdzBdKfkXdTklI1HOVmGIUluuwTee+n9OopPRCw3QXbgk7hsfWK7QVv7PMIhY myd4K3yEsA2gbAGnJSODuYTVcdavE+Ji9ZEBKUUfZbE0DQZfcnQIaiAuP50Ko2kTgKAl gcsErFkGhCjYXUHUT9uwaedPgTLbAPvNpOaOdiZphcixWp1PGg7Ca6BynzRhUE/4D+Lw izVxWzH9jYRU65eCGZs0Y2vRdy/UEx04xqmUlXSbtsyLJdsx8rDaYj7ecPIVe1ZwuN3q UxUQ== X-Gm-Message-State: APjAAAUVW7GC6pbtCNI2zrUnqZaNc1eMV0i/a93NQYEC9n1j3/KKUtcJ J107whnWSPFgeXv7P+3gEY7Tcnlk X-Google-Smtp-Source: APXvYqxHzvgLEYCnl3AAI73BnDR3XnxidtHcNAFWf4kf5A5eQI/fF6kSXdQPOVSeQvmh0I/R2lt1oA== X-Received: by 2002:adf:b648:: with SMTP id i8mr13296394wre.319.1551723664149; Mon, 04 Mar 2019 10:21:04 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:20:11 +0100 Message-Id: <1551723614-1823-52-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::441 Subject: [Qemu-devel] [PULL 51/54] unicore32-softmmu.mak: express 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" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini --- default-configs/unicore32-softmmu.mak | 5 +++-- hw/unicore32/Kconfig | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/default-configs/unicore32-softmmu.mak b/default-configs/unicor= e32-softmmu.mak index 17a7915..0bfce48 100644 --- a/default-configs/unicore32-softmmu.mak +++ b/default-configs/unicore32-softmmu.mak @@ -1,4 +1,5 @@ # Default configuration for unicore32-softmmu -CONFIG_ISA_BUS=3Dy + +# Boards: +# CONFIG_PUV3=3Dy -CONFIG_PCKBD=3Dy diff --git a/hw/unicore32/Kconfig b/hw/unicore32/Kconfig index a03a996..4443a29 100644 --- a/hw/unicore32/Kconfig +++ b/hw/unicore32/Kconfig @@ -1,3 +1,5 @@ config PUV3 bool + select ISA_BUS + select PCKBD select PTIMER --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551728770016264.1554594001377; Mon, 4 Mar 2019 11:46:10 -0800 (PST) Received: from localhost ([127.0.0.1]:59900 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tXJ-00077z-OA for importer@patchew.org; Mon, 04 Mar 2019 14:46:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46474) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sDC-0002Xq-Sm for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sD9-0005EW-Nc for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:14 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:54968) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sD7-00053n-CF for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:09 -0500 Received: by mail-wm1-x342.google.com with SMTP id f3so123662wmj.4 for ; Mon, 04 Mar 2019 10:21:06 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.21.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:21:04 -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=Oo9etUCtBxkwr9jZmqYhP1CHXh7iDrjJ/VOYr09M4JU=; b=M22dNX3tXR091Rd8DmYfpjLg17cgP2KOosj6nfQHPq7nHz2MOqFZHUSGziQkj0i751 jiGPF+7KDE1t5KHN+Y/kEwSVjE+NKHugtnGF8i0jZav9JF/5glr3f0bwOmdRWyjcAERK bByR5VEgScP2wgBpK9gId/Ds6weU5SiqDZc4BZo5YCL18rQ0LU1J2juIj9r1zZSp9Nct wHWcvbv5n6zfT3ssJNkNgS6OvwbfvtVORjKRW4fJ9a1Ru8K621UJ52ttG+w/TFUnluto KbppltvnAMjh7dKTN/n+nlIWW3jc9NfrQSq6QVGZwTAVPm1ONv/KvjflbWZvxphboDGd SqjA== 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=Oo9etUCtBxkwr9jZmqYhP1CHXh7iDrjJ/VOYr09M4JU=; b=cIrgaolKjUtYOadpV6t/Fmqns/oPuST6iy4EIA2z3d0KEqd7RLe+W8q7dT32WTKaqs 5aWO6r+ydP5bvTqxDmEF0OvihB2PkZJYL3/iJNPbXchIZ47g/LSUXxzGsRqBlGCEdki8 3yC7yeAnVwFDM6wD5J3l4GWn7VCrNC1sCDFHPYljY4g9/pD0BNmGIB7Q3ixRbMRje+IA W/2T/bmlUNajJl8Osnn3GHSvfhcEA1Hd0GVZ27B+o5732xGQvrfoWErhw7YfetMIE6Lw 82MVNoUheg//qODo3ZqhMOxkJvt00l4ApNy7dhQXpZzrX6MpLyiS8EbNbXgl+DlEMwta NOXg== X-Gm-Message-State: APjAAAVXV4aSjA6x0dpds12zG8YJ3f8vjs65JsHNV/YV8wLmTzWjAAgi Bc8WRnJYzY2onwfTD6UaItQ4WwoM X-Google-Smtp-Source: APXvYqwiwB0DnTQ6t92wbXFdd8EtNCQ6b0bocdbHUZbTaFJk5THdWwvge65sHKNqyoqi6UY0gZmxjQ== X-Received: by 2002:a1c:2885:: with SMTP id o127mr267309wmo.135.1551723664910; Mon, 04 Mar 2019 10:21:04 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:20:12 +0100 Message-Id: <1551723614-1823-53-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::342 Subject: [Qemu-devel] [PULL 52/54] xtensa-softmmu.mak: express 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" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini --- default-configs/xtensa-softmmu.mak | 6 ++---- default-configs/xtensaeb-softmmu.mak | 7 +------ hw/xtensa/Kconfig | 3 +++ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/default-configs/xtensa-softmmu.mak b/default-configs/xtensa-so= ftmmu.mak index 7aa7fa6..7e4d1cc 100644 --- a/default-configs/xtensa-softmmu.mak +++ b/default-configs/xtensa-softmmu.mak @@ -1,8 +1,6 @@ # Default configuration for Xtensa =20 -CONFIG_SERIAL=3Dy -CONFIG_OPENCORES_ETH=3Dy -CONFIG_PFLASH_CFI01=3Dy - +# Boards: +# CONFIG_XTENSA_SIM=3Dy CONFIG_XTENSA_XTFPGA=3Dy diff --git a/default-configs/xtensaeb-softmmu.mak b/default-configs/xtensae= b-softmmu.mak index 7aa7fa6..f7e48c7 100644 --- a/default-configs/xtensaeb-softmmu.mak +++ b/default-configs/xtensaeb-softmmu.mak @@ -1,8 +1,3 @@ # Default configuration for Xtensa =20 -CONFIG_SERIAL=3Dy -CONFIG_OPENCORES_ETH=3Dy -CONFIG_PFLASH_CFI01=3Dy - -CONFIG_XTENSA_SIM=3Dy -CONFIG_XTENSA_XTFPGA=3Dy +include xtensa-softmmu.mak diff --git a/hw/xtensa/Kconfig b/hw/xtensa/Kconfig index dc8eaf6..d72817d 100644 --- a/hw/xtensa/Kconfig +++ b/hw/xtensa/Kconfig @@ -3,3 +3,6 @@ config XTENSA_SIM =20 config XTENSA_XTFPGA bool + select OPENCORES_ETH + select PFLASH_CFI01 + select SERIAL --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551728441290226.03441742843268; Mon, 4 Mar 2019 11:40:41 -0800 (PST) Received: from localhost ([127.0.0.1]:59801 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tS1-0001qm-8w for importer@patchew.org; Mon, 04 Mar 2019 14:40:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sDA-0002Ve-3j for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sD7-0005C6-FC for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:11 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:51879) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sD5-000570-R0 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:08 -0500 Received: by mail-wm1-x330.google.com with SMTP id n19so141981wmi.1 for ; Mon, 04 Mar 2019 10:21:06 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.21.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:21:05 -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=HIsTctyNuwSlJ9oFgqOEdg8Hsd79SuqARW4XvWomoU0=; b=QHDEhB+hPQJKW0mEYJ3oBmSb4KzVjwIN44uAgdpuWytWLlkcmDIghmwamjZCzFyDNe 6l/hsaSEiwe+SF3BZm/B7txOo/hYylsBIbIARomH24JB3v+7i/OocEuvLaJgGNtNzYy6 7bcY71N9MPeW2kTHcYBIqwexUBMZp/VWsra6j2j9bJ6EJGCgVQ3BO61x4khJSiF9Sg/G xqFRkg6uf3t8du5PN/siG+3bVBxvJEQ6e0Dvjhe1V2fuYB58GT37h2WRogAveD4i114U XfSThWdW8y3kLVw//alU3Ki3jX+MDL9mD3zTxMaUGbhCsuOiCnnEEsbj/20GY5oUsgNQ W+aw== 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=HIsTctyNuwSlJ9oFgqOEdg8Hsd79SuqARW4XvWomoU0=; b=eVHmap9mctJniF14fSpx7WID20jKjW9Tq8RhixRN11BInyQYBMYP4D3+Nc+H+R83RK Mun9bdjOUgqMJdaKXdRzbN+Ejgg9P5cVRtPGP/9FhmuRvDE7hw/FK/Yph20HXtmeOgOq J9zmrlpXgTR6R3tjHSllMgv7hwdDtYCWzQBdRaAh0QBHrypZC/X7haVfKrpADtCxvuQi FUmpbkHhNt1FdwWEIbSHLw4IYgYRPXK4NHJzrX71RSIZe+kVMoNTxXBbbq76EIGveKBX KGQzeFDFnJhcVSBdlwEz4vkp7yktFXRtIYJKK0mJ27amFRbs8mbNJNTqTtEYezoq6j/O AKMA== X-Gm-Message-State: APjAAAU1Jnv6RX9R/dtyGhwRJgZcILfyrZc13XXPJC2ebfwVP3kpejLe 5FkTBLXvm1MQ+vSR/XxXVq9tp88s X-Google-Smtp-Source: APXvYqy4rUEeZcNVE8OMyX3Vd672WKPkTcB6W/SCANxVL1NFbwf7h1QaOQpbQXr5ZT1B0cJVUrOMuw== X-Received: by 2002:a1c:4844:: with SMTP id v65mr305116wma.66.1551723665838; Mon, 04 Mar 2019 10:21:05 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:20:13 +0100 Message-Id: <1551723614-1823-54-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::330 Subject: [Qemu-devel] [PULL 53/54] .travis.yml: test that no-default-device builds do not regress 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" Signed-off-by: Paolo Bonzini --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index cca57f4..e942175 100644 --- a/.travis.yml +++ b/.travis.yml @@ -151,6 +151,12 @@ matrix: =20 # We manually include builds which we disable "make check" for - env: + - CONFIG=3D"--without-default-devices" + - TEST_CMD=3D"" + + + # We manually include builds which we disable "make check" for + - env: - CONFIG=3D"--enable-debug --enable-tcg-interpreter" - TEST_CMD=3D"" =20 --=20 1.8.3.1 From nobody Sun Oct 5 00:06:42 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 1551729147463854.8813885438911; Mon, 4 Mar 2019 11:52:27 -0800 (PST) Received: from localhost ([127.0.0.1]:59986 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tdL-0003gG-Q3 for importer@patchew.org; Mon, 04 Mar 2019 14:52:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sDE-0002am-QN for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sDC-0005J9-MT for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:16 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:45480) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sD9-00058w-Ea for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:21:11 -0500 Received: by mail-wr1-x42f.google.com with SMTP id w17so6627752wrn.12 for ; Mon, 04 Mar 2019 10:21:07 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.21.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:21:06 -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=c8MBxh0TvUsXJW3IaRTdLId6t6GlV1PR4IInMtg/35A=; b=FlVAv0BgVaTBqmBHXwK5RDxLZQaCY6WF4lYmx0q+l+6Va9J33vcAfc1pwLMg6GIUgR 1PafXOcNm5DfCWH9fuLV4/7+sGKKDczVHezhhbM/FSgYyf9k9aJqE1Qm3h+7VMh9yb6Z Km+aUVxwWwF5IM4cNaLuHLwxOoKgWVnarzb49EvJSqT+Xye/DOW3/pjKxUrm+kteyGuU mdTlur+ayUy90k7YdTtz+DabkhvB5Bj+gUvBfZFGjisCEEhwZvtNdcb+sQRuPHrPBS3t PCbtWwOk5siyx0QhCDD50EHyZcl5H9llthgmOl9HBuKMowheA8FgLrffjBbWn6K5uU94 oMCQ== 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=c8MBxh0TvUsXJW3IaRTdLId6t6GlV1PR4IInMtg/35A=; b=C7jkMUAB/bF1bhiQF4j+ELCg7t9ByFoGnuOjdNvLIS9zOPAniTkFdPztjlO7Ga4L9b Y5QJG6+Wq5lZdkltZPDcjrdrJ52fTqztDvGXb2PEAx6zVX4xHn0qeG/DyFIMx/bBltNg s3stOoq1MvP/rxNZBpRGWHV11KhE1BgYRvA/T+HZFCpM6OpOWlkoSlIJy7fRcueTWsg5 OlOl/W8mzbI6MbhlgoH3Lu1U6UCYDE2E3D4TY7QSlgsT8+QowyFdIQmM/RRpSvL26MOa UlbJsapcrap+rGJ4ICLIKvDCi9jrGU8eJr4q27EyDTZ3C+WqU2RvjTwqj0t9dPicB+sR jGxA== X-Gm-Message-State: APjAAAWEXiIT6Qt8QQifoyo3jGJczYHvfzIZroPTmTfvYEpwPcyv5Nzv 2WYf8ymOLz8PmHJUr4qRQUqPWLMp X-Google-Smtp-Source: APXvYqxhVqIzzwQxLxjJXKmem6VGygR1GTL/b7KRiYhfWnaQu3OUZ6AiRH4i3lAQS6S8H8/9sJKsZA== X-Received: by 2002:adf:e8cf:: with SMTP id k15mr13030937wrn.193.1551723666584; Mon, 04 Mar 2019 10:21:06 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:20:14 +0100 Message-Id: <1551723614-1823-55-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::42f Subject: [Qemu-devel] [PULL 54/54] kconfig: add documentation 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" Signed-off-by: Paolo Bonzini --- docs/devel/kconfig.rst | 305 +++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 305 insertions(+) create mode 100644 docs/devel/kconfig.rst diff --git a/docs/devel/kconfig.rst b/docs/devel/kconfig.rst new file mode 100644 index 0000000..0f84522 --- /dev/null +++ b/docs/devel/kconfig.rst @@ -0,0 +1,305 @@ +Introduction +------------ + +QEMU is a very versatile emulator; it can be built for a variety of +targets, where each target can emulate various boards and at the same +time different targets can share large amounts of code. For example, +a POWER and an x86 board can run the same code to emulate a PCI network +card, even though the boards use different PCI host bridges, and they +can run the same code to emulate a SCSI disk while using different +SCSI adapters. ARM, s390 and x86 boards can all present a virtio-blk +disk to their guests, but with three different virtio guest interfaces. + +Each QEMU target enables a subset of the boards, devices and buses that +are included in QEMU's source code. As a result, each QEMU executable +only links a small subset of the files that form QEMU's source code; +anything that is not needed to support a particular target is culled. + +QEMU uses a simple domain-specific language to describe the dependencies +between components. This is useful for two reasons: + +* new targets and boards can be added without knowing in detail the + architecture of the hardware emulation subsystems. Boards only have + to list the components they need, and the compiled executable will + include all the required dependencies and all the devices that the + user can add to that board; + +* users can easily build reduced versions of QEMU that support only a subs= et + of boards or devices. For example, by default most targets will include + all emulated PCI devices that QEMU supports, but the build process is + configurable and it is easy to drop unnecessary (or otherwise unwanted) + code to make a leaner binary. + +This domain-specific language is based on the Kconfig language that +originated in the Linux kernel, though it was heavily simplified and +the handling of dependencies is stricter in QEMU. + +Unlike Linux, there is no user interface to edit the configuration, which +is instead specified in per-target files under the ``default-configs/`` +directory of the QEMU source tree. This is because, unlike Linux, +configuration and dependencies can be treated as a black box when building +QEMU; the default configuration that QEMU ships with should be okay in +almost all cases. + +The Kconfig language +-------------------- + +Kconfig defines configurable components in files named ``hw/*/Kconfig``. +Note that configurable components are _not_ visible in C code as preproces= sor +symbols; they are only visible in the Makefile. Each configurable compone= nt +defines a Makefile variable whose name starts with ``CONFIG_``. + +All elements have boolean (true/false) type; truth is written as ``y``, wh= ile +falsehood is written ``n``. They are defined in a Kconfig +stanza like the following:: + + config ARM_VIRT + bool + imply PCI_DEVICES + imply VFIO_AMD_XGBE + imply VFIO_XGMAC + select A15MPCORE + select ACPI + select ARM_SMMUV3 + +The ``config`` keyword introduces a new configuration element. In the exa= mple +above, Makefiles will have access to a variable named ``CONFIG_ARM_VIRT``, +with value ``y`` or ``n`` (respectively for boolean true and false). + +Boolean expressions can be used within the language, whenever ```` +is written in the remainder of this section. The ``&&``, ``||`` and +``!`` operators respectively denote conjunction (AND), disjunction (OR) +and negation (NOT). + +The ``bool`` data type declaration is optional, but it is suggested to +include it for clarity and future-proofing. After ``bool`` the following +directives can be included: + +**dependencies**: ``depends on `` + + This defines a dependency for this configurable element. Dependencies + evaluate an expression and force the value of the variable to false + if the expression is false. + +**reverse dependencies**: ``select [if ]`` + + While ``depends on`` can force a symbol to false, reverse dependencies c= an + be used to force another symbol to true. In the following example, + ``CONFIG_BAZ`` will be true whenever ``CONFIG_FOO`` is true:: + + config FOO + select BAZ + + The optional expression will prevent ``select`` from having any effect + unless it is true. + + Note that unlike Linux's Kconfig implementation, QEMU will detect + contradictions between ``depends on`` and ``select`` statements and prev= ent + you from building such a configuration. + +**default value**: ``default [if ]`` + + Default values are assigned to the config symbol if no other value was + set by the user via ``default-configs/*.mak`` files, and only if + ``select`` or ``depends on`` directives do not force the value to true + or false respectively. ```` can be ``y`` or ``n``; it cannot + be an arbitrary Boolean expression. However, a condition for applying + the default value can be added with ``if``. + + A configuration element can have any number of default values (usually, + if more than one default is present, they will have different + conditions). If multiple default values satisfy their condition, + only the first defined one is active. + +**reverse default** (weak reverse dependency): ``imply [if = ]`` + + This is similar to ``select`` as it applies a lower limit of ``y`` + to another symbol. However, the lower limit is only a default + and the "implied" symbol's value may still be set to ``n`` from a + ``default-configs/*.mak`` files. The following two examples are + equivalent:: + + config FOO + bool + imply BAZ + + config BAZ + bool + default y if FOO + + The next section explains where to use ``imply`` or ``default y``. + +Guidelines for writing Kconfig files +------------------------------------ + +Configurable elements in QEMU fall under five broad groups. Each group +declares its dependencies in different ways: + +**subsystems**, of which **buses** are a special case + + Example:: + + config SCSI + bool + + Subsystems always default to false (they have no ``default`` directive) + and are never visible in ``default-configs/*.mak`` files. It's + up to other symbols to ``select`` whatever subsystems they require. + + They sometimes have ``select`` directives to bring in other required + subsystems or buses. For example, ``AUX`` (the DisplayPort auxiliary + channel "bus") selects ``I2C`` because it can act as an I2C master too. + +**devices** + + Example:: + + config MEGASAS_SCSI_PCI + bool + default y if PCI_DEVICES + depends on PCI + select SCSI + + Devices are the most complex of the five. They can have a variety + of directives that cooperate so that a default configuration includes + all the devices that can be accessed from QEMU. + + Devices *depend on* the bus that they lie on, for example a PCI + device would specify ``depends on PCI``. An MMIO device will likely + have no ``depends on`` directive. Devices also *select* the buses + that the device provides, for example a SCSI adapter would specify + ``select SCSI``. Finally, devices are usually ``default y`` if and + only if they have at least one ``depends on``; the default could be + conditional on a device group. + + Devices also select any optional subsystem that they use; for example + a video card might specify ``select EDID`` if it needs to build EDID + information and publish it to the guest. + +**device groups** + + Example:: + + config PCI_DEVICES + bool + + Device groups provide a convenient mechanism to enable/disable many + devices in one go. This is useful when a set of devices is likely to + be enabled/disabled by several targets. Device groups usually need + no directive and are not used in the Makefile either; they only appear + as conditions for ``default y`` directives. + + QEMU currently has two device groups, ``PCI_DEVICES`` and + ``TEST_DEVICES``. PCI devices usually have a ``default y if + PCI_DEVICES`` directive rather than just ``default y``. This lets + some boards (notably s390) easily support a subset of PCI devices, + for example only VFIO (passthrough) and virtio-pci devices. + ``TEST_DEVICES`` instead is used for devices that are rarely used on + production virtual machines, but provide useful hooks to test QEMU + or KVM. + +**boards** + + Example:: + + config SUN4M + bool + imply TCX + imply CG3 + select CS4231 + select ECCMEMCTL + select EMPTY_SLOT + select ESCC + select ESP + select FDC + select SLAVIO + select LANCE + select M48T59 + select STP2000 + + Boards specify their constituent devices using ``imply`` and ``select`` + directives. A device should be listed under ``select`` if the board + cannot be started at all without it. It should be listed under + ``imply`` if (depending on the QEMU command line) the board may or + may not be started without it. Boards also default to false; they are + enabled by the ``default-configs/*.mak`` for the target they apply to. + +**internal elements** + + Example:: + + config ECCMEMCTL + bool + select ECC + + Internal elements group code that is useful in several boards or + devices. They are usually enabled with ``select`` and in turn select + other elements; they are never visible in ``default-configs/*.mak`` + files, and often not even in the Makefile. + +Writing and modifying default configurations +-------------------------------------------- + +In addition to the Kconfig files under hw/, each target also includes +a file called ``default-configs/TARGETNAME-softmmu.mak``. These files +initialize some Kconfig variables to non-default values and provide the +starting point to turn on devices and subsystems. + +A file in ``default-configs/`` looks like the following example:: + + # Default configuration for alpha-softmmu + + # Uncomment the following lines to disable these optional devices: + # + #CONFIG_PCI_DEVICES=3Dn + #CONFIG_TEST_DEVICES=3Dn + + # Boards: + # + CONFIG_DP264=3Dy + +The first part, consisting of commented-out ``=3Dn`` assignments, tells +the user which devices or device groups are implied by the boards. +The second part, consisting of ``=3Dy`` assignments, tells the user which +boards are supported by the target. The user will typically modify +the default configuration by uncommenting lines in the first group, +or commenting out lines in the second group. + +It is also possible to run QEMU's configure script with the +``--with-default-devices`` option. When this is done, everything defaults +to ``n`` unless it is ``select``ed or explicitly switched on in the +``.mak`` files. In other words, ``default`` and ``imply`` directives +are disabled. When QEMU is built with this option, the user will probably +want to change some lines in the first group, for example like this:: + + CONFIG_PCI_DEVICES=3Dy + #CONFIG_TEST_DEVICES=3Dn + +and/or pick a subset of the devices in those device groups. Right now +there is no single place that lists all the optional devices for +``CONFIG_PCI_DEVICES`` and ``CONFIG_TEST_DEVICES``. In the future, +we expect that ``.mak`` files will be automatically generated, so that +they will include all these symbols and some help text on what they do. + +``Kconfig.host`` +---------------- + +In some special cases, a configurable element depends on host features +that are detected by QEMU's configure script; for example some devices +depend on the availability of KVM or on the presence of a library on +the host. + +These symbols should be listed in ``Kconfig.host`` like this:: + + config KVM + bool + +and also listed as follows in the top-level Makefile's ``MINIKCONF_ARGS`` +variable:: + + MINIKCONF_ARGS =3D \ + $@ $*-config.devices.mak.d $< $(MINIKCONF_INPUTS) \ + CONFIG_KVM=3D$(CONFIG_KVM) \ + CONFIG_SPICE=3D$(CONFIG_SPICE) \ + CONFIG_TPM=3D$(CONFIG_TPM) \ + ... --=20 1.8.3.1