diff options
| author | Eric Blake <eblake@redhat.com> | 2015-10-26 16:35:00 -0600 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-11-02 08:30:28 +0100 |
| commit | ce21131a0b9e556bb73bf65eacdc07ccb21f78a9 (patch) | |
| tree | db1bc17f384a3e97d3cbac8fcb0671bd0d024f0b /hmp.c | |
| parent | 1fd5d4fea4ba686705fd377c7cffc0f0c9f83f93 (diff) | |
| download | qemu-ce21131a0b9e556bb73bf65eacdc07ccb21f78a9.zip qemu-ce21131a0b9e556bb73bf65eacdc07ccb21f78a9.tar.gz qemu-ce21131a0b9e556bb73bf65eacdc07ccb21f78a9.tar.bz2 | |
tpm: Convert to new qapi union layout
We have two issues with our qapi union layout:
1) Even though the QMP wire format spells the tag 'type', the
C code spells it 'kind', requiring some hacks in the generator.
2) The C struct uses an anonymous union, which places all tag
values in the same namespace as all non-variant members. This
leads to spurious collisions if a tag value matches a non-variant
member's name.
Make the conversion to the new layout for TPM-related code.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1445898903-12082-22-git-send-email-eblake@redhat.com>
[Commit message tweaked slightly]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'hmp.c')
| -rw-r--r-- | hmp.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -841,11 +841,11 @@ void hmp_info_tpm(Monitor *mon, const QDict *qdict) c, TpmModel_lookup[ti->model]); monitor_printf(mon, " \\ %s: type=%s", - ti->id, TpmTypeOptionsKind_lookup[ti->options->kind]); + ti->id, TpmTypeOptionsKind_lookup[ti->options->type]); - switch (ti->options->kind) { + switch (ti->options->type) { case TPM_TYPE_OPTIONS_KIND_PASSTHROUGH: - tpo = ti->options->passthrough; + tpo = ti->options->u.passthrough; monitor_printf(mon, "%s%s%s%s", tpo->has_path ? ",path=" : "", tpo->has_path ? tpo->path : "", |