diff options
| author | Peter Maydell | 2018-12-19 15:34:17 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-12-19 15:34:17 +0100 |
| commit | adf02c4419e9ac4b3d9a16efdb7e3089c19ae246 (patch) | |
| tree | 64fa9e44b78ec9de53545f2b32f32eec550bcf45 /scripts/qapi | |
| parent | Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2018-12-1... (diff) | |
| parent | qapi: fix flat union on uncovered branches conditionals (diff) | |
| download | qemu-adf02c4419e9ac4b3d9a16efdb7e3089c19ae246.tar.gz qemu-adf02c4419e9ac4b3d9a16efdb7e3089c19ae246.tar.xz qemu-adf02c4419e9ac4b3d9a16efdb7e3089c19ae246.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2018-12-18' into staging
QAPI patches for 2018-12-18
# gpg: Signature made Tue 18 Dec 2018 07:20:11 GMT
# gpg: using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-qapi-2018-12-18:
qapi: fix flat union on uncovered branches conditionals
qmp hmp: Make system_wakeup check wake-up support and run state
qga: update guest-suspend-ram and guest-suspend-hybrid descriptions
qmp: query-current-machine with wakeup-suspend-support
qmp: Split ShutdownCause host-qmp into quit and system-reset
qmp: Add reason to SHUTDOWN and RESET events
qapi: Turn ShutdownCause into QAPI enum
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/qapi')
| -rw-r--r-- | scripts/qapi/common.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py index 8c2d97369e..c89edc0cb0 100644 --- a/scripts/qapi/common.py +++ b/scripts/qapi/common.py @@ -1460,7 +1460,8 @@ class QAPISchemaObjectTypeVariants(object): cases = set([v.name for v in self.variants]) for m in self.tag_member.type.members: if m.name not in cases: - v = QAPISchemaObjectTypeVariant(m.name, 'q_empty') + v = QAPISchemaObjectTypeVariant(m.name, 'q_empty', + m.ifcond) v.set_owner(self.tag_member.owner) self.variants.append(v) for v in self.variants: |