From nobody Sun Oct 5 01:45:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 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