QMP: Remove duplicate TPM type from query-tpm
PATCH 1/2 QMP: Remove duplicate TPM type from query-tpm
--- hmp.c | 8 ++++---- qapi-schema.json | 12 ++++-------- tpm/tpm.c | 9 ++++----- 3 files changed, 12 insertions(+), 17 deletions(-)
hmp.c +4 -4
@@ -631,11 +631,11 @@ void hmp_info_tpm(Monitor *mon, const QDict *qdict) c, TpmModel_lookup[ti->model]);monitor_printf (mon," \\ %s: type=%s" , - ti->id, TpmType_lookup[ti->type]); + ti->id, TpmTypeOptionsKind_lookup[ti->options->kind]); -switch (ti->tpm_options->kind) { -case TPM_TYPE_OPTIONS_KIND_TPM_PASSTHROUGH_OPTIONS : - tpo = ti->tpm_options->tpm_passthrough_options; +switch (ti->options->kind) { +case TPM_TYPE_OPTIONS_KIND_PASSTHROUGH : + tpo = ti->options->passthrough; monitor_printf(mon, "%s%s%s%s", tpo->has_path ? ",path=" : "", tpo->has_path ? tpo->path : "",
qapi-schema.json +4 -8
@@ -3403,13 +3403,12 @@ # # A union referencing different TPM backend types' configuration options # -# @tpm-passthough-options: TPMPassthroughOptions describing the TPM -# passthrough configuration options +# @passthough: The configuration options for the TPM passthrough type # # Since: 1.5 ## { 'union': 'TpmTypeOptions', - 'data': { 'tpm-passthrough-options' : 'TPMPassthroughOptions' } } + 'data': { 'passthrough' : 'TPMPassthroughOptions' } } ## # @TpmInfo:
@@ -3420,17 +3419,14 @@ # # @model: The TPM frontend model # -# @type: The TPM (backend) type being used -# -# @tpm-options: The TPM (backend) type configuration options +# @options: The TPM (backend) type configuration options # # Since: 1.5 ## { 'type': 'TPMInfo', 'data': {'id': 'str', 'model': 'TpmModel', - 'type': 'TpmType', - 'tpm-options': 'TpmTypeOptions' } } + 'options': 'TpmTypeOptions' } } ## # @query-tpm:
tpm/tpm.c +4 -5
@@ -257,14 +257,13 @@ static TPMInfo *qmp_query_tpm_inst(TPMBackend *drv) res->id =g_strdup (drv->id); res->model = drv->fe_model; - res->type = drv->ops->type; - res->tpm_options =g_new0 (TpmTypeOptions,1 ); + res->options =g_new0 (TpmTypeOptions,1 ); -switch (res->type) { +switch (drv->ops->type) {case TPM_TYPE_PASSTHROUGH : - res->tpm_options->kind =TPM_TYPE_OPTIONS_KIND_TPM_PASSTHROUGH_OPTIONS ; + res->options->kind =TPM_TYPE_OPTIONS_KIND_PASSTHROUGH ; tpo =g_new0 (TPMPassthroughOptions,1 ); - res->tpm_options->tpm_passthrough_options = tpo; + res->options->passthrough = tpo;if (drv->path) { tpo->path =g_strdup (drv->path); tpo->has_path = true;
Signature · 1 line
1.7.1
PATCH 2/2 QMP: TPM QMP and man page documentation updates
--- qemu-options.hx | 3 +- qmp-commands.hx | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 1 deletions(-)
qemu-options.hx +2 -1
@@ -2241,7 +2241,8 @@ Backend type must be: @option{passthrough}. The specific backend type will determine the applicable options. -The @code{-tpmdev} option requires a @code{-device} option. +The @code{-tpmdev} option creates the TPM backend and requires a +@code{-device} option that specifies the TPM frontend interface model. Options to each backend are described below.
qmp-commands.hx +58 -0
76 lines not on this page · raw message
Signature · 1 line
1.7.1
Re: [Qemu-devel] [PATCH 2/2] QMP: TPM QMP and man page documentation updates
Quoted 5 lines · Corey Bryant
Signed-off-by Corey Bryant <[email protected]>--- qemu-options.hx | 3 +- qmp-commands.hx | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 1 deletions(-)
[No cover letter meant I had to answer each mail, instead of doing a series review message on 0/2.]
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Re: [Qemu-devel] [PATCH 2/2] QMP: TPM QMP and man page documentation updates
In reply to Corey BryantQuoted 1 line · Corey Bryant
Signed-off-by Corey Bryant <[email protected]>
Quoted 6 lines · Corey Bryant
Signed-off-by Corey Bryant <[email protected]>--- hmp.c | 8 ++++---- qapi-schema.json | 12 ++++-------- tpm/tpm.c | 9 ++++----- 3 files changed, 12 insertions(+), 17 deletions(-)
Safe to do now, because 1.5 isn't released; and advisable to take before we calcify an interface we don't like.
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Quoted 32 lines · Corey Bryant
Signed-off-by Corey Bryant <[email protected]>--- hmp.c | 8 ++++---- qapi-schema.json | 12 ++++-------- tpm/tpm.c | 9 ++++----- 3 files changed, 12 insertions(+), 17 deletions(-)hmp.c +4
-4@@ -631,11 +631,11 @@ void hmp_info_tpm(Monitor *mon, const QDict *qdict) c, TpmModel_lookup[ti->model]);monitor_printf (mon," \\ %s: type=%s" , - ti->id, TpmType_lookup[ti->type]); + ti->id, TpmTypeOptionsKind_lookup[ti->options->kind]); -switch (ti->tpm_options->kind) { -case TPM_TYPE_OPTIONS_KIND_TPM_PASSTHROUGH_OPTIONS : - tpo = ti->tpm_options->tpm_passthrough_options; +switch (ti->options->kind) { +case TPM_TYPE_OPTIONS_KIND_PASSTHROUGH : + tpo = ti->options->passthrough; monitor_printf(mon, "%s%s%s%s", tpo->has_path ? ",path=" : "", tpo->has_path ? tpo->path : "",qapi-schema.json +0
-0
qapi-schema.json line 3406
Quoted 6 lines
qapi-schema.json +1
-2@@ -3403,13 +3403,12 @@ # # A union referencing different TPM backend types' configuration options # -# @tpm-passthough-options: TPMPassthroughOptions describing the TPM -# passthrough configuration options +# @passthough: The configuration options for the TPM passthrough type
s/passthough/passthrough/
Quoted 17 lines
qapi-schema.json +2
-4# # Since: 1.5 ## { 'union': 'TpmTypeOptions', - 'data': { 'tpm-passthrough-options' : 'TPMPassthroughOptions' } } + 'data': { 'passthrough' : 'TPMPassthroughOptions' } } ## # @TpmInfo:@@ -3420,17 +3419,14 @@ # # @model: The TPM frontend model # -# @type: The TPM (backend) type being used -# -# @tpm-options: The TPM (backend) type configuration options +# @options: The TPM (backend) type configuration options
qapi-schema.json line 3430
Quoted 10 lines
qapi-schema.json +1
-2# # Since: 1.5 ## { 'type': 'TPMInfo', 'data': {'id': 'str', 'model': 'TpmModel', - 'type': 'TpmType', - 'tpm-options': 'TpmTypeOptions' } } + 'options': 'TpmTypeOptions' } }
Shortening to just 'options' is a good idea.
Quoted 15 lines
qapi-schema.json +0
-0## # @query-tpm:tpm/tpm.c +1
-3@@ -257,14 +257,13 @@ static TPMInfo *qmp_query_tpm_inst(TPMBackend *drv) res->id =g_strdup (drv->id); res->model = drv->fe_model; - res->type = drv->ops->type; - res->tpm_options =g_new0 (TpmTypeOptions,1 ); + res->options =g_new0 (TpmTypeOptions,1 ); -switch (res->type) {
tpm/tpm.c static TPMInfo *qmp_query_tpm_inst(TPMBackend *drv) · line 269
Quoted 10 lines
tpm/tpm.c +3
-2+switch (drv->ops->type) {case TPM_TYPE_PASSTHROUGH : - res->tpm_options->kind =TPM_TYPE_OPTIONS_KIND_TPM_PASSTHROUGH_OPTIONS ; + res->options->kind =TPM_TYPE_OPTIONS_KIND_PASSTHROUGH ; tpo =g_new0 (TPMPassthroughOptions,1 ); - res->tpm_options->tpm_passthrough_options = tpo; + res->options->passthrough = tpo;if (drv->path) { tpo->path =g_strdup (drv->path); tpo->has_path = true;
Luiz, if you fix the passthrough typo on commit, you can add my Reviewed-by.
Luiz Capitulino
AppliedQuoted 2 lines · On Wed, 20 Mar 2013 12:34:48 -0400 Corey Bryant <[email protected]>…
Signed-off-by Corey Bryant <[email protected]>
Applied both patches to the qmp branch 'passthough' typo fix as spotted by Markus.
Thanks.
Quoted 89 lines
--- hmp.c | 8 ++++---- qapi-schema.json | 12 ++++-------- tpm/tpm.c | 9 ++++----- 3 files changed, 12 insertions(+), 17 deletions(-)hmp.c +4
-4@@ -631,11 +631,11 @@ void hmp_info_tpm(Monitor *mon, const QDict *qdict) c, TpmModel_lookup[ti->model]);monitor_printf (mon," \\ %s: type=%s" , - ti->id, TpmType_lookup[ti->type]); + ti->id, TpmTypeOptionsKind_lookup[ti->options->kind]); -switch (ti->tpm_options->kind) { -case TPM_TYPE_OPTIONS_KIND_TPM_PASSTHROUGH_OPTIONS : - tpo = ti->tpm_options->tpm_passthrough_options; +switch (ti->options->kind) { +case TPM_TYPE_OPTIONS_KIND_PASSTHROUGH : + tpo = ti->options->passthrough; monitor_printf(mon, "%s%s%s%s", tpo->has_path ? ",path=" : "", tpo->has_path ? tpo->path : "",qapi-schema.json +4
-8@@ -3403,13 +3403,12 @@ # # A union referencing different TPM backend types' configuration options # -# @tpm-passthough-options: TPMPassthroughOptions describing the TPM -# passthrough configuration options +# @passthough: The configuration options for the TPM passthrough type # # Since: 1.5 ## { 'union': 'TpmTypeOptions', - 'data': { 'tpm-passthrough-options' : 'TPMPassthroughOptions' } } + 'data': { 'passthrough' : 'TPMPassthroughOptions' } } ## # @TpmInfo:@@ -3420,17 +3419,14 @@ # # @model: The TPM frontend model # -# @type: The TPM (backend) type being used -# -# @tpm-options: The TPM (backend) type configuration options +# @options: The TPM (backend) type configuration options # # Since: 1.5 ## { 'type': 'TPMInfo', 'data': {'id': 'str', 'model': 'TpmModel', - 'type': 'TpmType', - 'tpm-options': 'TpmTypeOptions' } } + 'options': 'TpmTypeOptions' } } ## # @query-tpm:tpm/tpm.c +4
-5@@ -257,14 +257,13 @@ static TPMInfo *qmp_query_tpm_inst(TPMBackend *drv) res->id =g_strdup (drv->id); res->model = drv->fe_model; - res->type = drv->ops->type; - res->tpm_options =g_new0 (TpmTypeOptions,1 ); + res->options =g_new0 (TpmTypeOptions,1 ); -switch (res->type) { +switch (drv->ops->type) {case TPM_TYPE_PASSTHROUGH : - res->tpm_options->kind =TPM_TYPE_OPTIONS_KIND_TPM_PASSTHROUGH_OPTIONS ; + res->options->kind =TPM_TYPE_OPTIONS_KIND_PASSTHROUGH ; tpo =g_new0 (TPMPassthroughOptions,1 ); - res->tpm_options->tpm_passthrough_options = tpo; + res->options->passthrough = tpo;if (drv->path) { tpo->path =g_strdup (drv->path); tpo->has_path = true;