Skip to content

Commit

Permalink
tpm-backend: Remove unneeded member variable from backend class
Browse files Browse the repository at this point in the history
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>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
  • Loading branch information
avalluri authored and stefanberger committed Oct 13, 2017
1 parent 98979cd commit fb4b0c6
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 6 deletions.
4 changes: 0 additions & 4 deletions hw/tpm/tpm_passthrough.c
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
1 change: 0 additions & 1 deletion include/sysemu/tpm_backend.h
Expand Up @@ -50,7 +50,6 @@ struct TPMBackend {
enum TpmModel fe_model;
char *path;
char *cancel_path;
const TPMDriverOps *ops;

QLIST_ENTRY(TPMBackend) list;
};
Expand Down
2 changes: 1 addition & 1 deletion tpm.c
Expand Up @@ -211,7 +211,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);
Expand Down

0 comments on commit fb4b0c6

Please sign in to comment.