| Message ID | 1496647406.25318.13.camel@intel.com |
|---|---|
| State | New |
| Headers | show |
Hi On Mon, Jun 5, 2017 at 11:22 AM Valluri, Amarnath < amarnath.valluri@intel.com> wrote: > On Wed, 2017-05-24 at 14:34 +0000, Marc-André Lureau wrote: > > Hi > > On Tue, May 16, 2017 at 12:00 PM Amarnath Valluri < > amarnath.valluri@intel.com> wrote: > > TPMDriverOps inside TPMBackend is not required, as it is supposed to be a > class > member. The only possible reason for keeping in TPMBackend was, to get the > backend type in tpm.c where dedicated backend api, tpm_backend_get_type() > is > present. > > Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> > > > Please add & keep my r-b tags from previous iterations in commit message > if they are no or only minor changes. > > Marc, do you mean to resend the patch set by keeping 'Reviewed-by:' tag > for commits. > On the patches I gave a "Reviewed-by", you should add it to the commit message. Next resend of the series should have them.
diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c index 9234eb3..a0baf5f 100644 --- a/hw/tpm/tpm_passthrough.c +++ b/hw/tpm/tpm_passthrough.c @@ -46,8 +46,6 @@ #define TPM_PASSTHROUGH(obj) \ OBJECT_CHECK(TPMPassthruState, (obj), TYPE_TPM_PASSTHROUGH) -static const TPMDriverOps tpm_passthrough_driver; - /* data structures */ typedef struct TPMPassthruThreadParams { TPMState *tpm_state; @@ -462,8 +460,6 @@ static TPMBackend *tpm_passthrough_create(QemuOpts *opts, const char *id) /* let frontend set the fe_model to proper value */ tb->fe_model = -1; - tb->ops = &tpm_passthrough_driver; - if (tpm_passthrough_handle_device_opts(opts, tb)) { goto err_exit; } diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h index b58f52d..e7f590d 100644 --- a/include/sysemu/tpm_backend.h +++ b/include/sysemu/tpm_backend.h @@ -50,7 +50,6 @@ struct TPMBackend { enum TpmModel fe_model; char *path; char *cancel_path; - const TPMDriverOps *ops; QLIST_ENTRY(TPMBackend) list; }; diff --git a/tpm.c b/tpm.c index 9a7c711..0ee021a 100644 --- a/tpm.c +++ b/tpm.c @@ -258,7 +258,7 @@ static TPMInfo *qmp_query_tpm_inst(TPMBackend *drv) res->model = drv->fe_model; res->options = g_new0(TpmTypeOptions, 1); - switch (drv->ops->type) { + switch (tpm_backend_get_type(drv)) { case TPM_TYPE_PASSTHROUGH: res->options->type = TPM_TYPE_OPTIONS_KIND_PASSTHROUGH; tpo = g_new0(TPMPassthroughOptions, 1);
On Wed, 2017-05-24 at 14:34 +0000, Marc-André Lureau wrote: Hi On Tue, May 16, 2017 at 12:00 PM Amarnath Valluri <amarnath.valluri@intel.com<mailto:amarnath.valluri@intel.com>> wrote: TPMDriverOps inside TPMBackend is not required, as it is supposed to be a class member. The only possible reason for keeping in TPMBackend was, to get the backend type in tpm.c where dedicated backend api, tpm_backend_get_type() is present. Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com<mailto:amarnath.valluri@intel.com>> Please add & keep my r-b tags from previous iterations in commit message if they are no or only minor changes. Marc, do you mean to resend the patch set by keeping 'Reviewed-by:' tag for commits. - Amarnath --- hw/tpm/tpm_passthrough.c | 4 ---- include/sysemu/tpm_backend.h | 1 - tpm.c | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-) -- 2.7.4 -- Marc-André Lureau