From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org,
"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [PULL 03/13] qapi: Simplify how QAPISchemaIfCond represents "no condition"
Date: Fri, 3 Sep 2021 21:31:59 +0200 [thread overview]
Message-ID: <20210903193209.1426791-4-armbru@redhat.com> (raw)
In-Reply-To: <20210903193209.1426791-1-armbru@redhat.com>
None works fine, there is no need to replace it by {} in .__init__().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210831123809.1107782-3-armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
scripts/qapi/common.py | 4 ++--
scripts/qapi/schema.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index 1724ac32db..1c1dc87ccb 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -200,7 +200,7 @@ def guardend(name: str) -> str:
name=c_fname(name).upper())
-def cgen_ifcond(ifcond: Union[str, Dict[str, Any]]) -> str:
+def cgen_ifcond(ifcond: Optional[Union[str, Dict[str, Any]]]) -> str:
if not ifcond:
return ''
if isinstance(ifcond, str):
@@ -214,7 +214,7 @@ def cgen_ifcond(ifcond: Union[str, Dict[str, Any]]) -> str:
return '(' + (') ' + oper + ' (').join(operands) + ')'
-def docgen_ifcond(ifcond: Union[str, Dict[str, Any]]) -> str:
+def docgen_ifcond(ifcond: Optional[Union[str, Dict[str, Any]]]) -> str:
# TODO Doc generated for conditions needs polish
if not ifcond:
return ''
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index 1451cdec81..3d72c7dfc9 100644
--- a/scripts/qapi/schema.py
+++ b/scripts/qapi/schema.py
@@ -34,7 +34,7 @@
class QAPISchemaIfCond:
def __init__(self, ifcond=None):
- self.ifcond = ifcond or {}
+ self.ifcond = ifcond
def _cgen(self):
return cgen_ifcond(self.ifcond)
--
2.31.1
next prev parent reply other threads:[~2021-09-03 19:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-03 19:31 [PULL 00/13] QAPI patches patches for 2021-09-03 Markus Armbruster
2021-09-03 19:31 ` [PULL 01/13] qapi: Set boolean value correctly in examples Markus Armbruster
2021-09-03 19:31 ` [PULL 02/13] qapi: Simplify QAPISchemaIfCond's interface for generating C Markus Armbruster
2021-09-03 19:31 ` Markus Armbruster [this message]
2021-09-03 19:32 ` [PULL 04/13] tests/qapi-schema: Correct two 'if' conditionals Markus Armbruster
2021-09-03 19:32 ` [PULL 05/13] tests/qapi-schema: Demonstrate broken C code for 'if' Markus Armbruster
2021-09-03 19:32 ` [PULL 06/13] qapi: Fix C code generation " Markus Armbruster
2021-09-03 19:32 ` [PULL 07/13] qapi: Factor common recursion out of cgen_ifcond(), docgen_ifcond() Markus Armbruster
2021-09-03 19:32 ` [PULL 08/13] qapi: Avoid redundant parens in code generated for conditionals Markus Armbruster
2021-09-03 19:32 ` [PULL 09/13] qapi: Use "not COND" instead of "!COND" for generated documentation Markus Armbruster
2021-09-03 19:32 ` [PULL 10/13] qapi: Use re.fullmatch() where appropriate Markus Armbruster
2021-09-03 19:32 ` [PULL 11/13] tests/qapi-schema: Hide OrderedDict in test output Markus Armbruster
2021-09-03 19:32 ` [PULL 12/13] qapi: Tweak error messages for missing / conflicting meta-type Markus Armbruster
2021-09-03 19:32 ` [PULL 13/13] qapi: Tweak error messages for unknown / conflicting 'if' keys Markus Armbruster
2021-09-05 14:47 ` [PULL 00/13] QAPI patches patches for 2021-09-03 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210903193209.1426791-4-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).