From nobody Mon Feb 9 19:25:36 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1491575799691721.7026713067482; Fri, 7 Apr 2017 07:36:39 -0700 (PDT) Received: from localhost ([::1]:51190 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwV08-0000v0-0b for importer@patchew.org; Fri, 07 Apr 2017 10:36:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60463) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwUuP-0005Dr-2t for qemu-devel@nongnu.org; Fri, 07 Apr 2017 10:30:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cwUuO-0002ch-39 for qemu-devel@nongnu.org; Fri, 07 Apr 2017 10:30:41 -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 1cwUuN-0002ZL-Ju for qemu-devel@nongnu.org; Fri, 07 Apr 2017 10:30:39 -0400 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Apr 2017 07:30:39 -0700 Received: from avallurigigabyte.fi.intel.com ([10.237.72.170]) by fmsmga004.fm.intel.com with ESMTP; 07 Apr 2017 07:30:37 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491575439; x=1523111439; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=NCairKHYOuX6CNulu3ja7Iqwm/ziufciHaUjuKtpH28=; b=gVO+Pf+Cy7QowTCQLvdNkgAvIJBENjdqM5by+1/LBcpL6iRzpylYW0RL x8ii5CMxfPWq/dUjc7JWRAQQrl3yEg==; X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,165,1488873600"; d="scan'208";a="245879779" From: Amarnath Valluri To: qemu-devel@nongnu.org Date: Fri, 7 Apr 2017 17:30:28 +0300 Message-Id: <1491575431-32170-7-git-send-email-amarnath.valluri@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491575431-32170-1-git-send-email-amarnath.valluri@intel.com> References: <1491575431-32170-1-git-send-email-amarnath.valluri@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.65 Subject: [Qemu-devel] [PATCH v2 6/9] tpm-backend: Remove unneeded destroy() method from TpmDriverOps interface X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Amarnath Valluri , patrick.ohly@intel.com, marcandre.lureau@gmail.com, stefanb@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" As TPMBackend is a Qemu Object, we can use object_unref() inplace of tpm_backend_destroy() to free the backend object, hence removed destroy() f= rom TPMDriverOps interface. Signed-off-by: Amarnath Valluri --- backends/tpm.c | 11 ----------- hw/tpm/tpm_passthrough.c | 14 -------------- include/sysemu/tpm_backend.h | 7 ------- tpm.c | 2 +- 4 files changed, 1 insertion(+), 33 deletions(-) diff --git a/backends/tpm.c b/backends/tpm.c index c96f462..3493df6 100644 --- a/backends/tpm.c +++ b/backends/tpm.c @@ -51,17 +51,6 @@ const char *tpm_backend_get_desc(TPMBackend *s) return k->ops->desc ? k->ops->desc() : ""; } =20 -void tpm_backend_destroy(TPMBackend *s) -{ - TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); - - if (k->ops->destroy) { - k->ops->destroy(s); - } - - object_unref(OBJECT(s)); -} - int tpm_backend_init(TPMBackend *s, TPMState *state, TPMRecvDataCB *datacb) { diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c index 71bdf25..8e11ed3 100644 --- a/hw/tpm/tpm_passthrough.c +++ b/hw/tpm/tpm_passthrough.c @@ -428,19 +428,6 @@ err_exit: return NULL; } =20 -static void tpm_passthrough_destroy(TPMBackend *tb) -{ - TPMPassthruState *tpm_pt =3D TPM_PASSTHROUGH(tb); - - tpm_passthrough_cancel_cmd(tb); - - qemu_close(tpm_pt->tpm_fd); - qemu_close(tpm_pt->cancel_fd); - g_free(tpm_pt->tpm_dev); - - qapi_free_TPMPassthroughOptions(tpm_pt->ops); -} - static TPMOptions *tpm_passthrough_get_tpm_options(TPMBackend *tb) { TPMPassthruState *tpm_pt =3D TPM_PASSTHROUGH(tb); @@ -483,7 +470,6 @@ static const TPMDriverOps tpm_passthrough_driver =3D { .opts =3D tpm_passthrough_cmdline_opts, .desc =3D tpm_passthrough_create_desc, .create =3D tpm_passthrough_create, - .destroy =3D tpm_passthrough_destroy, .realloc_buffer =3D tpm_passthrough_realloc_buffer, .reset =3D tpm_passthrough_reset, .had_startup_error =3D tpm_passthrough_get_startup_error, diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h index 7f4d621..8f8f133 100644 --- a/include/sysemu/tpm_backend.h +++ b/include/sysemu/tpm_backend.h @@ -77,7 +77,6 @@ struct TPMDriverOps { const char *(*desc)(void); =20 TPMBackend *(*create)(QemuOpts *opts, const char *id); - void (*destroy)(TPMBackend *t); =20 /* initialize the backend */ int (*init)(TPMBackend *t); @@ -119,12 +118,6 @@ enum TpmType tpm_backend_get_type(TPMBackend *s); const char *tpm_backend_get_desc(TPMBackend *s); =20 /** - * tpm_backend_destroy: - * @s: the backend to destroy - */ -void tpm_backend_destroy(TPMBackend *s); - -/** * tpm_backend_init: * @s: the backend to initialized * @state: TPMState diff --git a/tpm.c b/tpm.c index 1b6b550..43d980e 100644 --- a/tpm.c +++ b/tpm.c @@ -197,7 +197,7 @@ void tpm_cleanup(void) =20 QLIST_FOREACH_SAFE(drv, &tpm_backends, list, next) { QLIST_REMOVE(drv, list); - tpm_backend_destroy(drv); + object_unref(OBJECT(drv)); } } =20 --=20 2.7.4