From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwUuJ-000594-27 for qemu-devel@nongnu.org; Fri, 07 Apr 2017 10:30:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cwUuI-0002aw-4d for qemu-devel@nongnu.org; Fri, 07 Apr 2017 10:30:35 -0400 Received: from mga03.intel.com ([134.134.136.65]:63385) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cwUuH-0002ZL-Sg for qemu-devel@nongnu.org; Fri, 07 Apr 2017 10:30:34 -0400 From: Amarnath Valluri Date: Fri, 7 Apr 2017 17:30:25 +0300 Message-Id: <1491575431-32170-4-git-send-email-amarnath.valluri@intel.com> In-Reply-To: <1491575431-32170-1-git-send-email-amarnath.valluri@intel.com> References: <1491575431-32170-1-git-send-email-amarnath.valluri@intel.com> Subject: [Qemu-devel] [PATCH v2 3/9] tpm-backend: Initialize and free data members in it's own methods List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: patrick.ohly@intel.com, stefanb@linux.vnet.ibm.com, marcandre.lureau@gmail.com, berrange@redhat.com, Amarnath Valluri 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_{create,destroy} methods Signed-off-by: Amarnath Valluri --- backends/tpm.c | 8 ++++++-- hw/tpm/tpm_passthrough.c | 18 +++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/backends/tpm.c b/backends/tpm.c index 0ec0c67..99d2b2b 100644 --- a/backends/tpm.c +++ b/backends/tpm.c @@ -57,7 +57,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, @@ -182,11 +182,13 @@ 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->fe_model = -1; } static void tpm_backend_instance_finalize(Object *obj) @@ -194,6 +196,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 f50d9cf..65831b5 100644 --- a/hw/tpm/tpm_passthrough.c +++ b/hw/tpm/tpm_passthrough.c @@ -417,8 +417,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; @@ -432,7 +430,7 @@ static TPMBackend *tpm_passthrough_create(QemuOpts *opts, const char *id) return tb; err_exit: - g_free(tb->id); + object_unref(obj); return NULL; } @@ -445,10 +443,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); } @@ -486,10 +480,20 @@ static const TPMDriverOps tpm_passthrough_driver = { static void tpm_passthrough_inst_init(Object *obj) { + TPMPassthruState *tpm_pt = TPM_PASSTHROUGH(obj); + + tpm_pt->tpm_fd = -1; + tpm_pt->cancel_fd = -1; } static void tpm_passthrough_inst_finalize(Object *obj) { + TPMPassthruState *tpm_pt = TPM_PASSTHROUGH(obj); + + tpm_passthrough_cancel_cmd(TPM_BACKEND(obj)); + + qemu_close(tpm_pt->tpm_fd); + qemu_close(tpm_pt->cancel_fd); } static void tpm_passthrough_class_init(ObjectClass *klass, void *data) -- 2.7.4