[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/7] tpm-backend: Initialize and free data members i
From: |
Amarnath Valluri |
Subject: |
[Qemu-devel] [PATCH 3/7] tpm-backend: Initialize and free data members in it's own methods |
Date: |
Fri, 31 Mar 2017 16:10:12 +0300 |
Initialize and free TPMBackend data members in it's own instance_init() and
instance_finalize methods.
Took the opportunity to fix object cleanup in tpm_backend_destroy() method
Signed-off-by: Amarnath Valluri <address@hidden>
---
backends/tpm.c | 14 +++++++++++++-
hw/tpm/tpm_passthrough.c | 8 +-------
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/backends/tpm.c b/backends/tpm.c
index 50a7809..00c82d7 100644
--- a/backends/tpm.c
+++ b/backends/tpm.c
@@ -59,7 +59,7 @@ void tpm_backend_destroy(TPMBackend *s)
k->ops->destroy(s);
- tpm_backend_thread_end(s);
+ object_unref(OBJECT(s));
}
int tpm_backend_init(TPMBackend *s, TPMState *state,
@@ -187,10 +187,20 @@ static void tpm_backend_prop_set_opened(Object *obj, bool
value, Error **errp)
static void tpm_backend_instance_init(Object *obj)
{
+ TPMBackend *s = TPM_BACKEND(obj);
+
object_property_add_bool(obj, "opened",
tpm_backend_prop_get_opened,
tpm_backend_prop_set_opened,
NULL);
+ s->id = NULL;
+ s->fe_model = -1;
+ s->opened = false;
+ s->tpm_state = NULL;
+ s->thread_pool = NULL;
+ s->recv_data_callback = NULL;
+ s->path = NULL;
+ s->cancel_path = NULL;
}
@@ -199,6 +209,8 @@ static void tpm_backend_instance_finalize(Object *obj)
TPMBackend *s = TPM_BACKEND(obj);
g_free(s->id);
+ g_free(s->path);
+ g_free(s->cancel_path);
tpm_backend_thread_end(s);
}
diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
index 606e064..cb63079 100644
--- a/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -418,8 +418,6 @@ static TPMBackend *tpm_passthrough_create(QemuOpts *opts,
const char *id)
TPMPassthruState *tpm_pt = TPM_PASSTHROUGH(tb);
tb->id = g_strdup(id);
- /* let frontend set the fe_model to proper value */
- tb->fe_model = -1;
if (tpm_passthrough_handle_device_opts(opts, tb)) {
goto err_exit;
@@ -433,7 +431,7 @@ static TPMBackend *tpm_passthrough_create(QemuOpts *opts,
const char *id)
return tb;
err_exit:
- g_free(tb->id);
+ object_unref(obj);
return NULL;
}
@@ -446,10 +444,6 @@ static void tpm_passthrough_destroy(TPMBackend *tb)
qemu_close(tpm_pt->tpm_fd);
qemu_close(tpm_pt->cancel_fd);
-
- g_free(tb->id);
- g_free(tb->path);
- g_free(tb->cancel_path);
g_free(tpm_pt->tpm_dev);
}
--
2.7.4
- [Qemu-devel] [PATCH 0/7] Provide support for the software TPM emulator, Amarnath Valluri, 2017/03/31
- [Qemu-devel] [PATCH 4/7] tpm-backend: Call interface methods only if backend implements them, Amarnath Valluri, 2017/03/31
- [Qemu-devel] [PATCH 7/7] tpm: New backend driver to support TPM emulator, Amarnath Valluri, 2017/03/31
- [Qemu-devel] [PATCH 1/7] tpm-backend: Remove unneeded member variable from backend class, Amarnath Valluri, 2017/03/31
- [Qemu-devel] [PATCH 6/7] tpm-passthrough: move reusable code to utils, Amarnath Valluri, 2017/03/31
- [Qemu-devel] [PATCH 2/7] tpm-backend: Move thread handling inside TPMBackend, Amarnath Valluri, 2017/03/31
- [Qemu-devel] [PATCH 3/7] tpm-backend: Initialize and free data members in it's own methods,
Amarnath Valluri <=
- [Qemu-devel] [PATCH 5/7] tmp backend: Add new api to read backend tpm options, Amarnath Valluri, 2017/03/31
- [Qemu-devel] [PATCH 7/7] Added support for TPM emulator, Amarnath Valluri, 2017/03/31