diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2025-03-07 07:38:55 +0800 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2025-03-07 07:38:55 +0800 |
| commit | e17f08b5fbaeb71daee175f835b1b00d841391b6 (patch) | |
| tree | a29a4d9dc313294546617cb1e1d02d2293d420e0 /scripts/qapi/parser.py | |
| parent | b21db92e3543f2f7944d472a53f4d6a71dc0ca6e (diff) | |
| parent | 71ba2613ad470b6397868ae7333cd255e467be68 (diff) | |
| download | focaccia-qemu-e17f08b5fbaeb71daee175f835b1b00d841391b6.tar.gz focaccia-qemu-e17f08b5fbaeb71daee175f835b1b00d841391b6.zip | |
Merge tag 'pull-qapi-2025-03-06' of https://repo.or.cz/qemu/armbru into staging
QAPI patches patches for 2025-03-06 # -----BEGIN PGP SIGNATURE----- # # iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmfJa/4SHGFybWJydUBy # ZWRoYXQuY29tAAoJEDhwtADrkYZTOnsP/3DE/9D1JVBbAEU3i1qc5qvZXFLtQykh # mqMptxOrQ1KQm0abgXv8gS4rd++RycS+48fqnLWdxNYCbW5YEH9a2hlPefrhHRQS # GF4eMvJIECFXFyLWLO9aHDdUQc1fng8QDn8DFGkHaO3veGADJsX0HKGWit0vVc5k # uL61XOAd/Iu2z4BcgpdL29FEnlumIpDe8m8yyQcCLQ6EE7/FNSKPr1MSglk1Ky/1 # bwb+HK6nE5+6LznGimpcQhgh0CWv+hECPpmEy90iRMUSmEv2f0bB69e7pTFqOP9g # 9Vm07NEA93K/oCFDa79MK606n/sPQAn2bfr0aCCw4r3FKtvqe4+/RSSE4J/4/nlJ # rYn+RkKbgRKmuTqSlWwuBa8/THpPFzX6IO1LiAP5b4LR1IZd9YuBa3alc6xMehMF # iZ4tUFsUxjIMLxpcYY/yjEruqFutkig6nzCqxfHT7DplKNX6Ow3mv0fC+raC1jvv # Mdy5Cb6vZa1Ho9JvBLVmn8ASeDBYMqdTohB4QqgJWciLdeFCJxmGk3MgIgDRksSL # abSTqPKjott7K1CQPio/imkT4o4ulXTi0jWtb4eLnER/f7T14npr9+w4UK4iBXyd # pqq/++hgCFDGuQjzn9WWkbyYHhCCmMkf5WMn6Ycc+HIZvuOULUU+y5Ed01gufgb8 # pWpLO2IPupbp # =VfRB # -----END PGP SIGNATURE----- # gpg: Signature made Thu 06 Mar 2025 17:33:50 HKT # 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 * tag 'pull-qapi-2025-03-06' of https://repo.or.cz/qemu/armbru: docs/devel/qapi-code-gen: Discourage use of 'prefix' qdev: Improve a few more PropertyInfo @description members qdev: Improve PropertyInfo member @description for enum properties qdev: Change values of PropertyInfo member @type to be QAPI types qdev: Rename PropertyInfo member @name to @type qdev: Change qdev_prop_pci_devfn member @name from "int32" to "str" qdev: Delete unused qdev_prop_enum qapi/introspect: Use @dataclass to simplify qapi: Eliminate OrderedDict docs/about/build-platforms: Correct minimum supported Python version Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | scripts/qapi/parser.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py index adc85b5b39..64f0bb824a 100644 --- a/scripts/qapi/parser.py +++ b/scripts/qapi/parser.py @@ -14,7 +14,6 @@ # This work is licensed under the terms of the GNU GPL, version 2. # See the COPYING file in the top-level directory. -from collections import OrderedDict import os import re from typing import ( @@ -154,7 +153,7 @@ class QAPISchemaParser: "value of 'include' must be a string") incl_fname = os.path.join(os.path.dirname(self._fname), include) - self._add_expr(OrderedDict({'include': incl_fname}), info) + self._add_expr({'include': incl_fname}, info) exprs_include = self._include(include, info, incl_fname, self._included) if exprs_include: @@ -355,7 +354,7 @@ class QAPISchemaParser: raise QAPIParseError(self, "stray '%s'" % match.group(0)) def get_members(self) -> Dict[str, object]: - expr: Dict[str, object] = OrderedDict() + expr: Dict[str, object] = {} if self.tok == '}': self.accept() return expr |