{"id":2231411,"url":"http://patchwork.ozlabs.org/api/patches/2231411/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260430172204.1006673-17-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-17-pbonzini@redhat.com>","list_archive_url":null,"date":"2026-04-30T17:21:22","name":"[PULL,16/58] minikconf: replace else with early return and avoid unnecessary else","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"5b28f1d50db10afce85bfcc65a8baddfd4939d7e","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-17-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/2231411/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2231411/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=V2qDvQv7;\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=SzoQJNn4;\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 4g61Gg3NZMz1xqf\n\tfor ; Fri, 01 May 2026 03:23:23 +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 1wIV6R-0004m9-Co; Thu, 30 Apr 2026 13:23:07 -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 1wIV6P-0004lR-AK\n for qemu-devel@nongnu.org; Thu, 30 Apr 2026 13:23:05 -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 1wIV6N-0004Ox-KT\n for qemu-devel@nongnu.org; Thu, 30 Apr 2026 13:23:05 -0400","from mail-qk1-f199.google.com (mail-qk1-f199.google.com\n [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n us-mta-351-9F3rCknTMZmFEt-osWPoOA-1; Thu, 30 Apr 2026 13:23:01 -0400","by mail-qk1-f199.google.com with SMTP id\n af79cd13be357-8ed2c173d3bso231946685a.2\n for ; Thu, 30 Apr 2026 10:23:01 -0700 (PDT)","from [192.168.10.48] ([151.49.85.67])\n by smtp.gmail.com with ESMTPSA id\n af79cd13be357-8fbb15c2423sm32744785a.19.2026.04.30.10.22.57\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 30 Apr 2026 10:22:58 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1777569783;\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=2y1bpuysoEbl+6lNkzmdlCJGYQ3nonRiNk3euPaHYUU=;\n b=V2qDvQv7xejrP+/u/adP30g7bZu4WsyW5wSD/Qg38p0Xg0zsiToiDieURjZ8TrcG/Y9lV4\n +NrExU3rL9x5DAEzpEhUB1vZD2bX2bdEMAaXkszC+hSP2BPNUNIGM2/CTAjdxxfsNBpZKn\n HK2k1lXOnThsfjA5JfO+i7EYJQC/KpI=","v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=redhat.com; s=google; t=1777569780; x=1778174580; 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=2y1bpuysoEbl+6lNkzmdlCJGYQ3nonRiNk3euPaHYUU=;\n b=SzoQJNn4KD4B6rT9yOPknvkGCWdncHK1qxjQS6p4oZrb3vchmWf5VWcwK6kUpYiCwc\n M+Sa8mLa1Km8CVvx9BOYnZqqDSHOfQdFp8tatpTlOzuhpQW8m5Qo2KydIs1dKSwyKnAo\n cXc/0VAYineQEB8CZDsNZRap3iLDuepinvXIEuJWnSuqeAa8H4PTolh3JdL+jlPUHx6/\n qXPkQcCQH4apAE136gud/ycnq00G+6G9G9KMSuKnj5ZPPE7dwW3reG8I24zlKcJorNTO\n VgXNpU+SzjoI+Z4ay/HAEdN0FBWFJPtzC/55hW/Tz59sJkFmt9jyne4aWui+QJMxEjuN\n AZXQ=="],"X-MC-Unique":"9F3rCknTMZmFEt-osWPoOA-1","X-Mimecast-MFC-AGG-ID":"9F3rCknTMZmFEt-osWPoOA_1777569781","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777569780; x=1778174580;\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=2y1bpuysoEbl+6lNkzmdlCJGYQ3nonRiNk3euPaHYUU=;\n b=NCLD1il/+rfzmghCR7bEW/3cAyyXLtJCPA9sV6L9C/My9fWFCvzswhBppsz5KGFIn6\n XGYHMcmUtutvARwPBKOFl1BPPr7kYj+ykisef/7ONrKiJ/Tv2t6EA6Qex0PpceAWmccL\n Fx/XrwWgH5TBw+iT1CDPGjtRi4ucUHtkhmcFtfaw0iRqjYzbaLXD+gqmJRtZGU/mHHDd\n zh+qUFCGJ1bW0olO35S3mfmGmEA4ZHQJUgE8RUFwMA/mrcbjnq47X4RvKEZVv3D6qB5I\n ukwmxhB23geTEM3pO3GAcJgqSq5moLIhsfilKkev6WQvH6wsj5FiCvd+xRa9sd6sgqtR\n wJrg==","X-Gm-Message-State":"AOJu0YwsYRPNJl3CAhrhySTDHn0o465o2tnvetH0u01rsipka9U+Meuf\n YolznKvGzGVVAIb0jloPW6YsetEa9IM28V7MSJxBPpv7oBiwVCeMhTyjgXHrZA85LARmGCeie5D\n Aswx2jaSesHTzHgRgOiSPR3E0Ygp+Q/7Ac3G8ouwxsET3o7bYzE+f1W+gGXi1CviZh9nB4NGo0t\n kiXjNEaDiNbm/DOfo5wjWk9CpZ9FbC9VIj+zz3e5O1","X-Gm-Gg":"AeBDiesb4Q2Fjt/g9l7YVisoOWmZnOp+iGAMrd7bQxTeG7WaGMt7agZ7U/KAP1hWxKp\n IdTU/MV6c8FaMeJ8SAqVVRHuVAWOtIvnUJjFFsNX2PpiA9WclnoGMEk4sI1bo9i4+hKPwh5Dj4U\n YBKXLaOR10sNyt10UioUcQeTu41RykK1QPjzAoO2CZyp7iCyBaYzbGjjCKVbIkbLBoHiv9QCNmT\n witsTVWo2ZRlcnVpYhIXFweOd3eQ2YtoQIE3D4coRs6pkIwOPep+Ke8n+UIsi8V4AbtHu3ZUCPs\n 7vqRgCVHGKF2cuDBPMQYq/dTRX4SUf6Xt/1Xzu78jXgFzSaZQ68KQa8O8vv0H9C4XODMF5R6RQs\n RvEzlRP81HV0Q32qoB301R3E+9V0C3nXG+YfXhUz0ozxrQ9xVrovZrAGxRf1S9mybdsmzGi/h6T\n ReU59CicUzS49cFVanI0frn7GEBByPP1r1Kww=","X-Received":["by 2002:a05:620a:2804:b0:8ec:8346:1b70 with SMTP id\n af79cd13be357-8fa888428f9mr606503185a.34.1777569779885;\n Thu, 30 Apr 2026 10:22:59 -0700 (PDT)","by 2002:a05:620a:2804:b0:8ec:8346:1b70 with SMTP id\n af79cd13be357-8fa888428f9mr606496585a.34.1777569779285;\n Thu, 30 Apr 2026 10:22:59 -0700 (PDT)"],"From":"Paolo Bonzini ","To":"qemu-devel@nongnu.org","Cc":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","Subject":"[PULL 16/58] minikconf: replace else with early return and avoid\n unnecessary else","Date":"Thu, 30 Apr 2026 19:21:22 +0200","Message-ID":"<20260430172204.1006673-17-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":"Reviewed-by: Marc-André Lureau \nSigned-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 685e559bb87..7f042daecbf 100644\n--- a/scripts/minikconf.py\n+++ b/scripts/minikconf.py\n@@ -432,24 +432,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@@ -497,11 +497,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@@ -606,41 +605,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@@ -650,21 +649,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() -> None:\n argv = sys.argv\n","prefixes":["PULL","16/58"]}