{"id":2231432,"url":"http://patchwork.ozlabs.org/api/patches/2231432/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260430172204.1006673-12-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-12-pbonzini@redhat.com>","list_archive_url":null,"date":"2026-04-30T17:21:17","name":"[PULL,11/58] minikconf: simplify self.tok","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"77c4a6c6ba6bd91575cd13c13caecc37031a5af3","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-12-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/2231432/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2231432/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=hpDsKR+F;\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=S+d39Zco;\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 4g61Lj5mykz1yHZ\n\tfor ; Fri, 01 May 2026 03:26:53 +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 1wIV6D-0004hD-7v; Thu, 30 Apr 2026 13:22:53 -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 1wIV6B-0004gp-Ha\n for qemu-devel@nongnu.org; Thu, 30 Apr 2026 13:22:51 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.129.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 1wIV69-0004Hr-Np\n for qemu-devel@nongnu.org; Thu, 30 Apr 2026 13:22:51 -0400","from mail-qt1-f199.google.com (mail-qt1-f199.google.com\n [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n us-mta-623--CrMY0lHP0W4cbp6N-0x1w-1; Thu, 30 Apr 2026 13:22:47 -0400","by mail-qt1-f199.google.com with SMTP id\n d75a77b69052e-50e5a336b44so21774171cf.0\n for ; Thu, 30 Apr 2026 10:22:47 -0700 (PDT)","from [192.168.10.48] ([151.49.85.67])\n by smtp.gmail.com with ESMTPSA id\n d75a77b69052e-5103d2f63dbsm284901cf.18.2026.04.30.10.22.43\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 30 Apr 2026 10:22:44 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1777569768;\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=+McHS3rLxz1dlXfKNjuhXZV4i76ytAU3FB6qdTnnEY4=;\n b=hpDsKR+FZ+YgTtUNcGdjyPa9iJtUvqI3mWUv6vhoDhW3/RqTG9xhTFX5hf55Lm1/ZsO1pd\n PyEo1SPfo8yWV3J9kwPUsVp32SPzRapw7lx1ZHA7ZfF6bJ2I3iD7N0YsnHW7oBz38QLQ4d\n WAGk50ygiTIUtm0xIBGOOIaSso0zbM0=","v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=redhat.com; s=google; t=1777569766; x=1778174566; 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=+McHS3rLxz1dlXfKNjuhXZV4i76ytAU3FB6qdTnnEY4=;\n b=S+d39ZcoUUoRe+Zbugn6RZu4p2uj+kgyoihDTfHPh9xpXaMgx1hbijKXXngyZSKBxE\n rMe2r7ud368P59Z3UxwSntMhQzvImbWYLr5ldO60Tny7vutcZ2BZrCgAzlIzwWIsXLXu\n TSxaLG5Pvx+k2V2AdA3+2EJknRjvikg8s4HOPxpywYNf5I0PG6Z84RIOouc2hFluXf8a\n DwgpDLkvAyhAAU/PXsrLm0nGNAifcWlYhi2k0xlxcgSLlzgXvN1kXQ3yiJJAeVKlEfHI\n SrtvLaB0Q0AQnefkCTJC7TLD/gvCGpFxwHjUAg9c2glHXN1PGPQDCExfB31CqPSZxeZn\n yqNQ=="],"X-MC-Unique":"-CrMY0lHP0W4cbp6N-0x1w-1","X-Mimecast-MFC-AGG-ID":"-CrMY0lHP0W4cbp6N-0x1w_1777569767","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777569766; x=1778174566;\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=+McHS3rLxz1dlXfKNjuhXZV4i76ytAU3FB6qdTnnEY4=;\n b=Uxh6IpRuHQGpUp22kxlVtcQVzu/3wW4imBUGReSW0skDHmfn2L5wEHcSF47lFSt4iG\n IGaVVB3rQ2t6KDEca7B26s/8R+JLu3OI55oSYz9p/85jvWuFYJ+RdKtG5krMuDfYOr11\n 6p7ozOYkS18j7AGOhnQKUsq+bmVskDLLGv7SRwcXfoiLYMAfWptXCMOtzzKBWYqqEWzw\n HswEXYIK85akXOs8FM9H23FgvlNgG/NPlTXckK/nZ3/yeoBJACCxU2MTOcSp33zZw2EB\n 1f/JhpzNSuq8SYrEgFfjqAARMuhifPwdBE8ZJGJOhsMMi4CWlu0GDHhy68yfID4QMZU0\n QI0Q==","X-Gm-Message-State":"AOJu0YxWsleokBPnXGpWlK0sUorFFWAXiNu+MHXEA/2iZnyD6EWyP8Ur\n /FByQ6qeeABtCY8q1Onf+kF93z+0sTl2YnGdyv4ISTN5LTmiYMixh/7oaQvDtrIPKovZifVwQPu\n e3+LEWZxs9d3IcmKsxUobKXI+/WLMBTRPiamHzcKpXm6YVtVLTFWCYKi9tyGlhibscT8Z08Spsc\n Zpo/8t5GBuwC8DfgiFWfUG/iDUEQF4k4Gf/8a8HBxI","X-Gm-Gg":"AeBDiesv6kprYghYGnRf64JaAQSvfQbuDLpFclwE0x5/hMW9pKy3tlyGVw6QQsqyJxP\n o25nU06Tq9clDj8vgUfoRz+1FXcS3MIQjsl1FwtDnI5et/G8lnaxx0RpPw6z2l/MRFjqu4UTcoc\n dDykiwt6Obq1mAt0VCX1rqwAqptITaESRuw7BqLkRuwF9nrrlg+1Cgy4Zq1IvlFB1khqPhBAILI\n 0sRW/X8FLNsT1bP9C+aWalgeV3v2ffj4QjFVS03YtEw9d8pQBOXMuFaGPeNhztWH3WGbQMsDHID\n C6cXWKn30aEd+hOBBvKQ7AqZslGoovlYVAtyqyo8unt/1wnMW0EebiDEfWIUvVYwqA8PDjBK///\n xzkd4yWuDDy5/yIwJmMSaPDbX4w7kCz4byrXHS8JKmgY/8IAqpb4AjQqvsolUbCvsJpCxHVhgF4\n S6WzO6JBDtSUqIu8yx9Da46DwBl68v6z1F4o4=","X-Received":["by 2002:a05:622a:248d:b0:50f:bd19:657b with SMTP id\n d75a77b69052e-5102d13e8ddmr43952391cf.10.1777569766190;\n Thu, 30 Apr 2026 10:22:46 -0700 (PDT)","by 2002:a05:622a:248d:b0:50f:bd19:657b with SMTP id\n d75a77b69052e-5102d13e8ddmr43951631cf.10.1777569765504;\n Thu, 30 Apr 2026 10:22:45 -0700 (PDT)"],"From":"Paolo Bonzini ","To":"qemu-devel@nongnu.org","Cc":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","Subject":"[PULL 11/58] minikconf: simplify self.tok","Date":"Thu, 30 Apr 2026 19:21:17 +0200","Message-ID":"<20260430172204.1006673-12-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.129.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_H4=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":"Do not ever store a string in self.tok, only a finished token.\n\nReviewed-by: Marc-André Lureau \nSigned-off-by: Paolo Bonzini \n---\n scripts/minikconf.py | 59 ++++++++++++++++++++++----------------------\n 1 file changed, 30 insertions(+), 29 deletions(-)","diff":"diff --git a/scripts/minikconf.py b/scripts/minikconf.py\nindex 2656d364920..3d63cc6b21f 100644\n--- a/scripts/minikconf.py\n+++ b/scripts/minikconf.py\n@@ -330,9 +330,9 @@ def do_imply(self, var, symbol, cond=None):\n class KconfigParserError(Exception):\n def __init__(self, parser, msg, tok=None):\n self.loc = parser.location()\n- tok = tok or parser.tok\n+ tok = tok if tok is not None else parser.tok\n if tok != TOK_NONE:\n- location = TOKENS.get(tok, None) or ('\"%s\"' % tok)\n+ location = TOKENS[tok] if isinstance(tok, int) else '\"%s\"' % tok\n msg = '%s before %s' % (msg, location)\n self.msg = msg\n \n@@ -573,13 +573,14 @@ def parse_config(self):\n \n def get_token(self):\n while True:\n- self.tok = self.src[self.cursor]\n+ ch = self.src[self.cursor]\n self.pos = self.cursor\n self.cursor += 1\n \n self.val = None\n- self.tok = self.scan_token()\n- if self.tok is not None:\n+ tok = self.scan_token(ch)\n+ if tok is not None:\n+ self.tok = tok\n return\n \n def check_keyword(self, rest):\n@@ -591,46 +592,46 @@ def check_keyword(self, rest):\n self.cursor += length\n return True\n \n- def scan_token(self):\n- if self.tok == '#':\n+ def scan_token(self, ch):\n+ if ch == '#':\n self.cursor = self.src.find('\\n', self.cursor)\n return None\n- elif self.tok == '=':\n+ elif ch == '=':\n return TOK_EQUAL\n- elif self.tok == '(':\n+ elif ch == '(':\n return TOK_LPAREN\n- elif self.tok == ')':\n+ elif ch == ')':\n return TOK_RPAREN\n- elif self.tok == '&' and self.src[self.pos+1] == '&':\n+ elif ch == '&' and self.src[self.pos+1] == '&':\n self.cursor += 1\n return TOK_AND\n- elif self.tok == '|' and self.src[self.pos+1] == '|':\n+ elif ch == '|' and self.src[self.pos+1] == '|':\n self.cursor += 1\n return TOK_OR\n- elif self.tok == '!':\n+ elif ch == '!':\n return TOK_NOT\n- elif self.tok == 'd' and self.check_keyword(\"epends\"):\n+ elif ch == 'd' and self.check_keyword(\"epends\"):\n return TOK_DEPENDS\n- elif self.tok == 'o' and self.check_keyword(\"n\"):\n+ elif ch == 'o' and self.check_keyword(\"n\"):\n return TOK_ON\n- elif self.tok == 's' and self.check_keyword(\"elect\"):\n+ elif ch == 's' and self.check_keyword(\"elect\"):\n return TOK_SELECT\n- elif self.tok == 'i' and self.check_keyword(\"mply\"):\n+ elif ch == 'i' and self.check_keyword(\"mply\"):\n return TOK_IMPLY\n- elif self.tok == 'c' and self.check_keyword(\"onfig\"):\n+ elif ch == 'c' and self.check_keyword(\"onfig\"):\n return TOK_CONFIG\n- elif self.tok == 'd' and self.check_keyword(\"efault\"):\n+ elif ch == 'd' and self.check_keyword(\"efault\"):\n return TOK_DEFAULT\n- elif self.tok == 'b' and self.check_keyword(\"ool\"):\n+ elif ch == 'b' and self.check_keyword(\"ool\"):\n return TOK_BOOL\n- elif self.tok == 'i' and self.check_keyword(\"f\"):\n+ elif ch == 'i' and self.check_keyword(\"f\"):\n return TOK_IF\n- elif self.tok == 'y' and self.check_keyword(\"\"):\n+ elif ch == 'y' and self.check_keyword(\"\"):\n return TOK_Y\n- elif self.tok == 'n' and self.check_keyword(\"\"):\n+ elif ch == 'n' and self.check_keyword(\"\"):\n return TOK_N\n- elif (self.tok == 's' and self.check_keyword(\"ource\")) or \\\n- self.tok == 'i' and self.check_keyword(\"nclude\"):\n+ elif (ch == 's' and self.check_keyword(\"ource\")) or \\\n+ ch == 'i' and self.check_keyword(\"nclude\"):\n # source FILENAME\n # include FILENAME\n while self.src[self.cursor].isspace():\n@@ -639,19 +640,19 @@ def scan_token(self):\n self.cursor = self.src.find('\\n', self.cursor)\n self.val = self.src[start:self.cursor]\n return TOK_SOURCE\n- elif self.tok.isalnum():\n+ elif ch.isalnum():\n # identifier\n while self.src[self.cursor].isalnum() or self.src[self.cursor] == '_':\n self.cursor += 1\n self.val = self.src[self.pos:self.cursor]\n return TOK_ID\n- elif self.tok == '\\n':\n+ elif ch == '\\n':\n if self.cursor == len(self.src):\n return TOK_EOF\n self.line += 1\n self.line_pos = self.cursor\n- elif not self.tok.isspace():\n- raise KconfigParserError(self, 'invalid input')\n+ elif not ch.isspace():\n+ raise KconfigParserError(self, 'invalid input', ch)\n \n return None\n \n","prefixes":["PULL","11/58"]}