OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qapi tpm: Elide redundant has_FOO in generated C

Browse Source 
The has_FOO for pointer-valued FOO are redundant, except for arrays.
They are also a nuisance to work with.  Recent commit "qapi: Start to
elide redundant has_FOO in generated C" provided the means to elide
them step by step.  This is the step for qapi/tpm.json.

Said commit explains the transformation in more detail.  The invariant
violations mentioned there do not occur here.

Cc: Stefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Message-Id: <20221104160712.3005652-26-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2022-11-04 17:07:07 +01:00
parent 1dde96d65f
commit ced2939685
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backends/tpm/tpm_passthrough.c
View File

@ -259,12 +259,10 @@ tpm_passthrough_handle_device_opts(TPMPassthruState *tpm_pt, QemuOpts *opts)
value = qemu_opt_get(opts, "cancel-path"); value = qemu_opt_get(opts, "cancel-path");
if (value) { if (value) {
tpm_pt->options->cancel_path = g_strdup(value); tpm_pt->options->cancel_path = g_strdup(value);
tpm_pt->options->has_cancel_path = true;
} }
value = qemu_opt_get(opts, "path"); value = qemu_opt_get(opts, "path");
if (value) { if (value) {
tpm_pt->options->has_path = true;
tpm_pt->options->path = g_strdup(value); tpm_pt->options->path = g_strdup(value);
} }

8
monitor/hmp-cmds.c
View File

@ -864,10 +864,10 @@ void hmp_info_tpm(Monitor *mon, const QDict *qdict)
case TPM_TYPE_PASSTHROUGH: case TPM_TYPE_PASSTHROUGH:
tpo = ti->options->u.passthrough.data; tpo = ti->options->u.passthrough.data;
monitor_printf(mon, "%s%s%s%s", monitor_printf(mon, "%s%s%s%s",
tpo->has_path ? ",path=" : "", tpo->path ? ",path=" : "",
tpo->has_path ? tpo->path : "", tpo->path ?: "",
tpo->has_cancel_path ? ",cancel-path=" : "", tpo->cancel_path ? ",cancel-path=" : "",
tpo->has_cancel_path ? tpo->cancel_path : ""); tpo->cancel_path ?: "");
break; break;
case TPM_TYPE_EMULATOR: case TPM_TYPE_EMULATOR:
teo = ti->options->u.emulator.data; teo = ti->options->u.emulator.data;

1
scripts/qapi/schema.py
View File

@ -759,7 +759,6 @@ class QAPISchemaObjectTypeMember(QAPISchemaMember):
assert self.type assert self.type
# Temporary hack to support dropping the has_FOO in reviewable chunks # Temporary hack to support dropping the has_FOO in reviewable chunks
opt_out = [ opt_out = [
'qapi/tpm.json',
'qapi/transaction.json', 'qapi/transaction.json',
'qapi/ui.json', 'qapi/ui.json',
'qapi/virtio.json', 'qapi/virtio.json',