diff mbox

[1/2] QMP: Remove duplicate TPM type from query-tpm

Message ID 1363797289-5865-1-git-send-email-coreyb@linux.vnet.ibm.com
State New
Headers show

Commit Message

Corey Bryant March 20, 2013, 4:34 p.m. UTC 
Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
---
 hmp.c            |    8 ++++----
 qapi-schema.json |   12 ++++--------
 tpm/tpm.c        |    9 ++++-----
 3 files changed, 12 insertions(+), 17 deletions(-)

Comments

Eric Blake March 20, 2013, 9:37 p.m. UTC | #1 
On 03/20/2013 10:34 AM, Corey Bryant wrote:
> Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
> ---
>  hmp.c            |    8 ++++----
>  qapi-schema.json |   12 ++++--------
>  tpm/tpm.c        |    9 ++++-----
>  3 files changed, 12 insertions(+), 17 deletions(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

Safe to do now, because 1.5 isn't released; and advisable to take before
we calcify an interface we don't like.
Markus Armbruster March 21, 2013, 7:19 a.m. UTC | #2 
Corey Bryant <coreyb@linux.vnet.ibm.com> writes:

> Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
> ---
>  hmp.c            |    8 ++++----
>  qapi-schema.json |   12 ++++--------
>  tpm/tpm.c        |    9 ++++-----
>  3 files changed, 12 insertions(+), 17 deletions(-)
>
> diff --git a/hmp.c b/hmp.c
> index b0a861c..d319897 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -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 : "",
> diff --git a/qapi-schema.json b/qapi-schema.json
> index fdaa9da..5505bbf 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -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/

>  #
>  # 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' } }
>  

Shortening to just 'options' is a good idea.

>  ##
>  # @query-tpm:
> diff --git a/tpm/tpm.c b/tpm/tpm.c
> index ffd2495..ae00eae 100644
> --- a/tpm/tpm.c
> +++ b/tpm/tpm.c
> @@ -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;

Luiz, if you fix the passthrough typo on commit, you can add my
Reviewed-by.
Luiz Capitulino March 21, 2013, 12:25 p.m. UTC | #3 
On Wed, 20 Mar 2013 12:34:48 -0400
Corey Bryant <coreyb@linux.vnet.ibm.com> wrote:

> 
> Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>

Applied both patches to the qmp branch 'passthough' typo fix as
spotted by Markus.

Thanks.

> ---
>  hmp.c            |    8 ++++----
>  qapi-schema.json |   12 ++++--------
>  tpm/tpm.c        |    9 ++++-----
>  3 files changed, 12 insertions(+), 17 deletions(-)
> 
> diff --git a/hmp.c b/hmp.c
> index b0a861c..d319897 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -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 : "",
> diff --git a/qapi-schema.json b/qapi-schema.json
> index fdaa9da..5505bbf 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -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:
> diff --git a/tpm/tpm.c b/tpm/tpm.c
> index ffd2495..ae00eae 100644
> --- a/tpm/tpm.c
> +++ b/tpm/tpm.c
> @@ -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;
diff mbox

Patch

diff --git a/hmp.c b/hmp.c
index b0a861c..d319897 100644
--- a/hmp.c
+++ b/hmp.c
@@ -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 : "",
diff --git a/qapi-schema.json b/qapi-schema.json
index fdaa9da..5505bbf 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -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:
diff --git a/tpm/tpm.c b/tpm/tpm.c
index ffd2495..ae00eae 100644
--- a/tpm/tpm.c
+++ b/tpm/tpm.c
@@ -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;