diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-03-05 15:15:32 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-03-05 15:15:32 +0000 |
| commit | bb736b20a31fa9956195565ea34bc9c28953e70d (patch) | |
| tree | c1fdebda08b415457dcb2e39adb92127078664c0 /scripts | |
| parent | 9a7beaad3dbba982f7a461d676b55a5c3851d312 (diff) | |
| parent | 0e92a19b8c3b269dee377b76898c8bd7cadc1273 (diff) | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2021-03-05' into staging
QAPI patches patches for 2021-03-05
# gpg: Signature made Fri 05 Mar 2021 14:42:18 GMT
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-qapi-2021-03-05:
qapi: Fix parse errors for removal of null from schema language
qapi: Remove QMP events and commands from user-mode builds
qga: Utilize QAPI_LIST_APPEND in qmp_guest_network_get_interfaces
error: Fix "Converting to ERRP_GUARD()" doc on "valid at return"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/qapi/parser.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py index e7b9d670ad..116afe549a 100644 --- a/scripts/qapi/parser.py +++ b/scripts/qapi/parser.py @@ -236,9 +236,9 @@ class QAPISchemaParser: if self.tok == ']': self.accept() return expr - if self.tok not in "{['tfn": + if self.tok not in "{['tf": raise QAPIParseError( - self, "expected '{', '[', ']', string, boolean or 'null'") + self, "expected '{', '[', ']', string, or boolean") while True: expr.append(self.get_expr(True)) if self.tok == ']': @@ -257,12 +257,12 @@ class QAPISchemaParser: elif self.tok == '[': self.accept() expr = self.get_values() - elif self.tok in "'tfn": + elif self.tok in "'tf": expr = self.val self.accept() else: raise QAPIParseError( - self, "expected '{', '[', string, boolean or 'null'") + self, "expected '{', '[', string, or boolean") return expr def get_doc(self, info): |