{"id":2230967,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2230967/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260430090534.841894-13-pbonzini@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/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":""},"msgid":"<20260430090534.841894-13-pbonzini@redhat.com>","date":"2026-04-30T09:05:33","name":"[12/13] minikconf: replace else with early return and avoid unnecessary else","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"0c648d5e07d2338d169f9698aacb1ff85847a93e","submitter":{"id":2701,"url":"http://patchwork.ozlabs.org/api/1.1/people/2701/?format=json","name":"Paolo Bonzini","email":"pbonzini@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260430090534.841894-13-pbonzini@redhat.com/mbox/","series":[{"id":502245,"url":"http://patchwork.ozlabs.org/api/1.1/series/502245/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=502245","date":"2026-04-30T09:05:25","name":"kconfig cleanups and mypy annotations","version":1,"mbox":"http://patchwork.ozlabs.org/series/502245/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2230967/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2230967/checks/","tags":{},"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=e6l0MkTb;\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=AsyBxGQW;\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 4g5pGV2C37z1yGq\n\tfor ; Thu, 30 Apr 2026 19:07:30 +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 1wINLb-00089I-QH; Thu, 30 Apr 2026 05:06:15 -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 1wINLR-00081g-6J\n for qemu-devel@nongnu.org; Thu, 30 Apr 2026 05:06:05 -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 1wINLO-00039i-GS\n for qemu-devel@nongnu.org; Thu, 30 Apr 2026 05:06:04 -0400","from mail-wm1-f72.google.com (mail-wm1-f72.google.com\n [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n us-mta-360-BRMW4z7rP5W_Vza_t7_nPA-1; Thu, 30 Apr 2026 05:06:00 -0400","by mail-wm1-f72.google.com with SMTP id\n 5b1f17b1804b1-488d56f87e8so5751305e9.0\n for ; Thu, 30 Apr 2026 02:05:59 -0700 (PDT)","from [192.168.10.48] ([151.49.85.67])\n by smtp.gmail.com with ESMTPSA id\n 5b1f17b1804b1-48a822be902sm59042405e9.6.2026.04.30.02.05.56\n for \n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 30 Apr 2026 02:05:56 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1777539961;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=qvOzDfKMqp1ekADGqACG/Bzi+q6o7xSLS2++veRRDN0=;\n b=e6l0MkTbjQKs+NWkLnZOuB7iUJkHVVFSAMi6KxOF5lViVCFe0H4C4rIbLTbmcTO8fl4QGX\n sY07FvOWdhT/gsU6XFMec+oYAaUunRoNiNkLWNQCYKCe+Dx6LlLWQdWA34QatZvIFQ7czv\n rja6aAAa8gCeZi6FpUtQSGvqemx7u5U=","v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=redhat.com; s=google; t=1777539958; x=1778144758; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:to:from:from:to:cc:subject:date:message-id\n :reply-to; bh=qvOzDfKMqp1ekADGqACG/Bzi+q6o7xSLS2++veRRDN0=;\n b=AsyBxGQWxMP5GSvFSNeC03zNbF6zjnkrEkazjNOGnptE+9JMDj2aRe5DDGyhYjm7HF\n b+MMKBaUKNUGN3jgS6VhSubXStGBN3wqpqSmUNhlTSvzoNLLBctXUE1WP9Zs+JWUpg0D\n 9ETdPaSt9hTskNx/0gelBkWY7cabOpQrDW7eAVPbvykGYrexkS6sBdebCBruvU/Ycp7H\n ejw1GFndwTN7PjTGVsszK+OLyGDk24fauBf/CLeH2Rb1L2To40g5kJbuyrjsPs5R3wvT\n 67v6aGE41nB7jo3yLV5d9nQ9p4tKa2m/M/lBD3jvkkTYxGFg1t7HxiNfC2ZBpTBSnaeI\n 7hDQ=="],"X-MC-Unique":"BRMW4z7rP5W_Vza_t7_nPA-1","X-Mimecast-MFC-AGG-ID":"BRMW4z7rP5W_Vza_t7_nPA_1777539959","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777539958; x=1778144758;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to\n :cc:subject:date:message-id:reply-to;\n bh=qvOzDfKMqp1ekADGqACG/Bzi+q6o7xSLS2++veRRDN0=;\n b=PdSd9jCUXHVmbWsFcJSGHa8OYe/uhZ5Sg+s6WG2gLTGi+Rp44mAgJwCo6huSUalx5U\n vQfJr+ZbmaQ/lWpvuAHiUL4Y2AnU9OjZPyFhM9K+ZU1HeIQP7mNL01rdWyhngVKaItvB\n 8R7pnHxdgB136HPRobZ/ZLKuCFFunGzKkB/MOzp4pvl/C6gPMszmvIWKUldwOaGxzyfk\n KJmz9VGdLI0CO5CTcRd4uN402YlfCjcxujD/qZ3+z6gJeVhEzFdlABzuji0oJm5aqzG3\n 7vyNqn93z2TiwTMqhPnFvBGFqT8R8SXBSMACd3ioSe6QAlUbtAeGxvwAKqR4qiQgqRak\n 2n7w==","X-Gm-Message-State":"AOJu0Yy7ScZVcpusqFqtmtKHuJ7YOF/HIlx2+rCbutuawUbCZ7I+Y1Xe\n 5p+K5T+Hqd1hmvJfpnqmc8P/4TqKcWIdiwHXZ1k6+YuLhujvprpTfpJPR3kTid+i37rce1/X+x6\n gAgr+CGVJLRV//6X8eK+r81hfxT6L36Xqk2W+rr9CO98iML1/6BN/94fuZ5pDjbYqsFSlFG1sxw\n 4dcW/hUEvaLCr23iE0rrHNfCN7WNXKa9gaasVEpdqj","X-Gm-Gg":"AeBDievpqjFr6uaQlOFF71iuUQPEoksTzuxQ2+CKUet8g0Rr+hSe8tXZXbb2eSuUe/J\n wU4rM5wMMgiJcn6GAaR5HzFOtsInp0mfD5iFaH4gyLG0ZGLfYu5m5U/cij/vKxEmmjBnmAIKe4v\n 8TvL26C0rdwGnYuN1+vIqkj8VkwVIM9rUtfgkLPNinVBWUMB0Rj7bxyQe7VGr9hqpKUeNRLmXnB\n xB/EPAibCXJK+RyVo9SpvRufw5JicoRf3Ki4cq+jxjocgeqKOjqhJCbLgyW6Ya53e1ExXpOT4QR\n hVXzb3bgilzRliRi1dPCdNvqvG7rly0zaqTGh4b3rCGQw0Frpwk+hmq0a+4SIAwk3fvi3ZqLO12\n XMk+wVSoiSmyGJ428TWstM0u78Fg0hskj5t2CvL8y82tkubOS6TE+wE7DpEo+BbH4WnsuRhH8hO\n 0uQBGDQtrKF20TrXo6omCJM0FYYxugVzYmCVo=","X-Received":["by 2002:a05:600c:a593:b0:489:e126:b757 with SMTP id\n 5b1f17b1804b1-48a8447c7dfmr18250935e9.25.1777539958006;\n Thu, 30 Apr 2026 02:05:58 -0700 (PDT)","by 2002:a05:600c:a593:b0:489:e126:b757 with SMTP id\n 5b1f17b1804b1-48a8447c7dfmr18250615e9.25.1777539957376;\n Thu, 30 Apr 2026 02:05:57 -0700 (PDT)"],"From":"Paolo Bonzini ","To":"qemu-devel@nongnu.org","Subject":"[PATCH 12/13] minikconf: replace else with early return and avoid\n unnecessary else","Date":"Thu, 30 Apr 2026 11:05:33 +0200","Message-ID":"<20260430090534.841894-13-pbonzini@redhat.com>","X-Mailer":"git-send-email 2.54.0","In-Reply-To":"<20260430090534.841894-1-pbonzini@redhat.com>","References":"<20260430090534.841894-1-pbonzini@redhat.com>","MIME-Version":"1.0","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":"Signed-off-by: Paolo Bonzini \n---\n scripts/minikconf.py | 79 ++++++++++++++++++++++----------------------\n 1 file changed, 40 insertions(+), 39 deletions(-)","diff":"diff --git a/scripts/minikconf.py b/scripts/minikconf.py\nindex 5fb42c8f760..7a2fe865484 100644\n--- a/scripts/minikconf.py\n+++ b/scripts/minikconf.py\n@@ -430,24 +430,24 @@ def parse_y_or_n(self):\n \n # var: ID\n def parse_var(self):\n- if self.tok == TOK_ID:\n- val = self.val\n- self.get_token()\n- return self.data.do_var(val)\n- else:\n+ if self.tok != TOK_ID:\n raise KconfigParserError(self, 'Expected identifier')\n+ val = self.val\n+ assert val is not None\n+ self.get_token()\n+ return self.data.do_var(val)\n \n # assignment_var: ID (starting with \"CONFIG_\")\n def parse_assignment_var(self):\n- if self.tok == TOK_ID:\n- val = self.val\n- if not val.startswith(\"CONFIG_\"):\n- raise KconfigParserError(self,\n- 'Expected identifier starting with \"CONFIG_\"', TOK_NONE)\n- self.get_token()\n- return self.data.do_var(val[7:])\n- else:\n+ if self.tok != TOK_ID:\n raise KconfigParserError(self, 'Expected identifier')\n+ val = self.val\n+ assert val is not None\n+ if not val.startswith(\"CONFIG_\"):\n+ raise KconfigParserError(self,\n+ 'Expected identifier starting with \"CONFIG_\"', TOK_NONE)\n+ self.get_token()\n+ return self.data.do_var(val[7:])\n \n # assignment: var EQUAL y_or_n\n def parse_assignment(self):\n@@ -495,11 +495,10 @@ def parse_expr(self):\n # condition: IF expr\n # | empty\n def parse_condition(self):\n- if self.tok == TOK_IF:\n- self.get_token()\n- return self.parse_expr()\n- else:\n+ if self.tok != TOK_IF:\n return None\n+ self.get_token()\n+ return self.parse_expr()\n \n # property: DEFAULT y_or_n condition\n # | DEPENDS ON expr\n@@ -604,41 +603,41 @@ def scan_token(self, ch):\n if ch == '#':\n self.cursor = self.src.find('\\n', self.cursor)\n return None\n- elif ch == '=':\n+ if ch == '=':\n return TOK_EQUAL\n- elif ch == '(':\n+ if ch == '(':\n return TOK_LPAREN\n- elif ch == ')':\n+ if ch == ')':\n return TOK_RPAREN\n- elif ch == '&' and self.src[self.pos+1] == '&':\n+ if ch == '&' and self.src[self.pos+1] == '&':\n self.cursor += 1\n return TOK_AND\n- elif ch == '|' and self.src[self.pos+1] == '|':\n+ if ch == '|' and self.src[self.pos+1] == '|':\n self.cursor += 1\n return TOK_OR\n- elif ch == '!':\n+ if ch == '!':\n return TOK_NOT\n- elif ch == 'd' and self.check_keyword(\"epends\"):\n+ if ch == 'd' and self.check_keyword(\"epends\"):\n return TOK_DEPENDS\n- elif ch == 'o' and self.check_keyword(\"n\"):\n+ if ch == 'o' and self.check_keyword(\"n\"):\n return TOK_ON\n- elif ch == 's' and self.check_keyword(\"elect\"):\n+ if ch == 's' and self.check_keyword(\"elect\"):\n return TOK_SELECT\n- elif ch == 'i' and self.check_keyword(\"mply\"):\n+ if ch == 'i' and self.check_keyword(\"mply\"):\n return TOK_IMPLY\n- elif ch == 'c' and self.check_keyword(\"onfig\"):\n+ if ch == 'c' and self.check_keyword(\"onfig\"):\n return TOK_CONFIG\n- elif ch == 'd' and self.check_keyword(\"efault\"):\n+ if ch == 'd' and self.check_keyword(\"efault\"):\n return TOK_DEFAULT\n- elif ch == 'b' and self.check_keyword(\"ool\"):\n+ if ch == 'b' and self.check_keyword(\"ool\"):\n return TOK_BOOL\n- elif ch == 'i' and self.check_keyword(\"f\"):\n+ if ch == 'i' and self.check_keyword(\"f\"):\n return TOK_IF\n- elif ch == 'y' and self.check_keyword(\"\"):\n+ if ch == 'y' and self.check_keyword(\"\"):\n return TOK_Y\n- elif ch == 'n' and self.check_keyword(\"\"):\n+ if ch == 'n' and self.check_keyword(\"\"):\n return TOK_N\n- elif (ch == 's' and self.check_keyword(\"ource\")) or \\\n+ if (ch == 's' and self.check_keyword(\"ource\")) or \\\n ch == 'i' and self.check_keyword(\"nclude\"):\n # source FILENAME\n # include FILENAME\n@@ -648,21 +647,23 @@ def scan_token(self, ch):\n self.cursor = self.src.find('\\n', self.cursor)\n self.val = self.src[start:self.cursor]\n return TOK_SOURCE\n- elif ch.isalnum():\n+ if 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 ch == '\\n':\n+ if 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 ch.isspace():\n- raise KconfigParserError(self, 'invalid input', ch)\n+ return None\n+ if ch.isspace():\n+ return None\n+\n+ raise KconfigParserError(self, 'invalid input', ch)\n \n- return None\n \n def main():\n argv = sys.argv\n","prefixes":["12/13"]}