{"id":2231439,"url":"http://patchwork.ozlabs.org/api/patches/2231439/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260430172204.1006673-10-pbonzini@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260430172204.1006673-10-pbonzini@redhat.com>","list_archive_url":null,"date":"2026-04-30T17:21:15","name":"[PULL,09/58] minikconf: move command-line assignment out of the parser","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"5127195d58a7b96a9354890db3efb7147b3d8ff5","submitter":{"id":2701,"url":"http://patchwork.ozlabs.org/api/people/2701/?format=json","name":"Paolo Bonzini","email":"pbonzini@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260430172204.1006673-10-pbonzini@redhat.com/mbox/","series":[{"id":502347,"url":"http://patchwork.ozlabs.org/api/series/502347/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=502347","date":"2026-04-30T17:21:16","name":"[PULL,01/58] pythondeps: bump to meson 1.11.1","version":1,"mbox":"http://patchwork.ozlabs.org/series/502347/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2231439/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2231439/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=BP/79UYN;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=google header.b=OV707WOi;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g61NW1T3Zz1yHZ\n\tfor ; Fri, 01 May 2026 03:28:25 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wIV66-0004fI-H8; Thu, 30 Apr 2026 13:22:46 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wIV65-0004es-9D\n for qemu-devel@nongnu.org; Thu, 30 Apr 2026 13:22:45 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.133.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wIV63-0004Fv-Kv\n for qemu-devel@nongnu.org; Thu, 30 Apr 2026 13:22:45 -0400","from mail-qt1-f197.google.com (mail-qt1-f197.google.com\n [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n us-mta-376-AxFH65KnMCyPmeyae6sV_Q-1; Thu, 30 Apr 2026 13:22:41 -0400","by mail-qt1-f197.google.com with SMTP id\n d75a77b69052e-50edf01172bso28634101cf.2\n for ; Thu, 30 Apr 2026 10:22:41 -0700 (PDT)","from [192.168.10.48] ([151.49.85.67])\n by smtp.gmail.com with ESMTPSA id\n d75a77b69052e-5103d206793sm503031cf.11.2026.04.30.10.22.37\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 30 Apr 2026 10:22:38 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1777569762;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=FnwQlRGzVUExHxF++9i6qmAddHxNllxRA7d5XP4c92o=;\n b=BP/79UYNI7jBftuRJDON4jRyzAxPPAdMg9bNdlDJkU2il3fSRyOiHmP75cCO0toZxSSoee\n qOYKbnzO3PKZtlA1gNEyvJlHDS2YLVJAi0b006O/TXVDXdI9B40QrEzI8i7+xS1VqsR2Sz\n AhXtv9InC1aJRmE4mBcuJp6bLTyYWOo=","v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=redhat.com; s=google; t=1777569760; x=1778174560; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=FnwQlRGzVUExHxF++9i6qmAddHxNllxRA7d5XP4c92o=;\n b=OV707WOikVKSCXCr8qYWuGtOqVAlGx/1No8CqvTvR8tdL9LmwKvWrqDoY+5LyYFVdV\n 7nzOfVn8+j69G5AyAopq0fAB2g93CVq59wFwkmEy3Us7Lst9kkCCHwsaGd53Pt8aJ5U+\n WSY9WS22wSuvpEUxNwCN0dBvSsqoM/Wp9iFcqam3W+AfavYOecU6sU04HK/xtQkf9ALY\n 5lRCVoMWG9d51IPxxZBrJidJU6jRPST74p3BpAQOaub7CXmER7bbKzt0UXvbwTMt+9W9\n 57+VWfflFoCdwf5CbWGgALBL8HUx+9VppoqhQnEtcb5HXo3mwZSN/SAYd9Rn6az/PrEa\n qyjQ=="],"X-MC-Unique":"AxFH65KnMCyPmeyae6sV_Q-1","X-Mimecast-MFC-AGG-ID":"AxFH65KnMCyPmeyae6sV_Q_1777569761","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777569760; x=1778174560;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=FnwQlRGzVUExHxF++9i6qmAddHxNllxRA7d5XP4c92o=;\n b=RwsdOQ+Asmo4QPDMJRcGruvoXC0yI9GKlNDca40ee/SCSndDkDcj06v7+FlU2qCKPS\n jbcOJuY8KlSGQNe6zNG5AohqvdMVbsoR4OIa6H6hdvHn7eVDUFIlXdBv04yB0QLrJZLb\n SWsYTmFo7KS2hSEI6WpfvkMlo1NrCVbZpt+VRV/7c6ihTdUZc+2bZVbquqPmJyBM3ZUY\n ef/yfjQyFYDyxDwrRG9d2hPNqf7S3ctXvlzG5Ne0GEW4KV+C1aa5TQsNq083/NZ9XHy/\n uFsSXpbnO0f8BJKjRKBhE8Cll+nhA5WXs34v2C5FDXUBaHhIuKk/Xe6YdYvI3uxqbDC/\n CviA==","X-Gm-Message-State":"AOJu0YyZsewN+w+SSG/l/EEZekV4kwMX7zdlxU7FYv7J6oyKvLwOjF5+\n CWrPs8iLlJmfhAMRCQWx+Tu4+mUmfzfx9EnKX5/ccp4Wru4HKlmXcVSaIMcwHOM3TtB9RrEcPfR\n HMZf60RACA5Jx6j4PhVJJ2CodL6CVu8K5Xp8y4mkokocDqnuK2nj4EyR8HjPOabBEsnSKuay6yD\n ABfnFadsRURDiFioh2pW9fd1FkBqe/m30OD2M3puOW","X-Gm-Gg":"AeBDievGC36OUkLIgiYxqkqKTnGTWiu2pV1NbE4tVJkihAuHDmDu/omu4QHBCOOno6S\n 6vWB8ykuYx9mw7H0YY6p/4R9cEJ4xc+cT3+4ZF/9GutuC3NxK81MZHpXDUF4WHlSse2kR2On5CT\n pEyEo+aJ55ElxnRvTAGzQWENr8dvz44D9ng5/f8oxcOBoydxeSxtHtaY+oRTEwGrjZx77kagRzJ\n iLj9st882zt0rfz5x7rV/yV49NZq9leWGsQOe8N2snYNRImoqzyFaM3s6F6IeDTnvWiMOw1nudj\n 8KQroO2+ySDhX2danGBe+FNBoAX0Gg1r+DSBvOaqvqiQVz4yKm35fGlI4fKHSZ7Fg/g00Ej7jJk\n oZ23GPiQ2ejH7IKUlKhWmu0ySJaKtjVhtz0h49wyFs0iaLsAVbvHKoQ5c15WV9pgyJdsXGUh9Tu\n FmRpACSqWrcN0G+OMC6Linjzzw+7LkBs7shOk=","X-Received":["by 2002:a05:622a:64c:b0:50e:5d24:db5f with SMTP id\n d75a77b69052e-5102ae78731mr53000901cf.60.1777569760236;\n Thu, 30 Apr 2026 10:22:40 -0700 (PDT)","by 2002:a05:622a:64c:b0:50e:5d24:db5f with SMTP id\n d75a77b69052e-5102ae78731mr53000191cf.60.1777569759544;\n Thu, 30 Apr 2026 10:22:39 -0700 (PDT)"],"From":"Paolo Bonzini ","To":"qemu-devel@nongnu.org","Cc":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","Subject":"[PULL 09/58] minikconf: move command-line assignment out of the\n parser","Date":"Thu, 30 Apr 2026 19:21:15 +0200","Message-ID":"<20260430172204.1006673-10-pbonzini@redhat.com>","X-Mailer":"git-send-email 2.54.0","In-Reply-To":"<20260430172204.1006673-1-pbonzini@redhat.com>","References":"<20260430172204.1006673-1-pbonzini@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=170.10.133.124;\n envelope-from=pbonzini@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001,\n SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"KconfigParser.do_assignment() only exists to handle CONFIG_FOO=y/n\narguments from the command line; it is never invoked while parsing\na Kconfig source file. Because main() called it on a parser that\nhad never been through parse_file(), a failing CONFIG_ check would\nraise a KconfigParserError whose __init__ and location() touch\nfields of \"self\" that do not exist yet. The regex in main()\ncurrently shields this, but it is fragile.\n\nMove the prefix-stripping assignment to KconfigData as\ndo_cmdline_assignment(), simplify KconfigParser.parse() to accept\nan existing KconfigData, and call it from main() so the parser is\nonly used for actual file parsing.\n\nReviewed-by: Marc-André Lureau \nSigned-off-by: Paolo Bonzini \n---\n scripts/minikconf.py | 27 +++++++++------------------\n 1 file changed, 9 insertions(+), 18 deletions(-)","diff":"diff --git a/scripts/minikconf.py b/scripts/minikconf.py\nindex 08df8d5dabb..668de577d09 100644\n--- a/scripts/minikconf.py\n+++ b/scripts/minikconf.py\n@@ -278,6 +278,10 @@ def do_var(self, var):\n def do_assignment(self, var, val):\n self.clauses.append(KconfigData.AssignmentClause(var, val))\n \n+ def do_cmdline_assignment(self, var, val):\n+ assert var.startswith(\"CONFIG_\")\n+ self.do_assignment(self.do_var(var[7:]), val)\n+\n def do_default(self, var, val, cond=None):\n val = self.value_mangler(val)\n self.clauses.append(KconfigData.DefaultClause(var, val, cond))\n@@ -338,11 +342,8 @@ def __str__(self):\n class KconfigParser:\n \n @classmethod\n- def parse(cls, fp, mode=None):\n- data = KconfigData(mode or defconfig)\n- parser = cls(data)\n- parser.parse_file(fp)\n- return data\n+ def parse(cls, fp, data):\n+ cls(data).parse_file(fp)\n \n def __init__(self, data):\n self.data = data\n@@ -361,14 +362,6 @@ def parse_file(self, fp):\n self.get_token()\n self.parse_config()\n \n- def do_assignment(self, var, val):\n- if not var.startswith(\"CONFIG_\"):\n- raise KconfigParserError(\n- self, \"assigned variable should start with CONFIG_\"\n- )\n- var = self.data.do_var(var[7:])\n- self.data.do_assignment(var, val)\n-\n # file management -----\n \n def error_path(self):\n@@ -688,18 +681,16 @@ def scan_token(self):\n sys.exit(1)\n \n data = KconfigData(mode)\n- parser = KconfigParser(data)\n external_vars = set()\n for arg in argv[3:]:\n m = re.match(r'^(CONFIG_[A-Z0-9_]+)=([yn]?)$', arg)\n if m is not None:\n name, value = m.groups()\n- parser.do_assignment(name, value == 'y')\n+ data.do_cmdline_assignment(name, value == 'y')\n external_vars.add(name[7:])\n else:\n- fp = open(arg, 'rt', encoding='utf-8')\n- parser.parse_file(fp)\n- fp.close()\n+ with open(arg, 'rt', encoding='utf-8') as fp:\n+ KconfigParser.parse(fp, data)\n \n config = data.compute_config()\n for key in sorted(config.keys()):\n","prefixes":["PULL","09/58"]}