From patchwork Fri Mar 31 13:10:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amarnath Valluri X-Patchwork-Id: 9656549 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D821760352 for ; Fri, 31 Mar 2017 14:57:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CAD5128433 for ; Fri, 31 Mar 2017 14:57:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BBCA328456; Fri, 31 Mar 2017 14:57:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5C69428456 for ; Fri, 31 Mar 2017 14:57:14 +0000 (UTC) Received: from localhost ([::1]:41439 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctxzF-0003Kp-Bw for patchwork-qemu-devel@patchwork.kernel.org; Fri, 31 Mar 2017 10:57:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40891) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctwJq-0003kn-Ni for qemu-devel@nongnu.org; Fri, 31 Mar 2017 09:10:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ctwJo-0000X0-9C for qemu-devel@nongnu.org; Fri, 31 Mar 2017 09:10:22 -0400 Received: from mga09.intel.com ([134.134.136.24]:16468) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ctwJn-0000WJ-TE for qemu-devel@nongnu.org; Fri, 31 Mar 2017 09:10:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1490965819; x=1522501819; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=tfniAnmmgLm+jnRrKCVCn6qmcSsSGwxRQ40m09U8iYE=; b=v82LE1COHdO3pQza7qxRhCqcQQFyRha7VkOoaJg2UOS4CNakvZpQ8mRU 0JQx8nWMVmKUtoMGOHpGVNIEJt5Crg==; Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Mar 2017 06:10:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.36,251,1486454400"; d="scan'208"; a="1129316614" Received: from avallurigigabyte.fi.intel.com ([10.237.72.170]) by fmsmga001.fm.intel.com with ESMTP; 31 Mar 2017 06:10:17 -0700 From: Amarnath Valluri To: qemu-devel@nongnu.org Date: Fri, 31 Mar 2017 16:10:13 +0300 Message-Id: <1490965817-16913-5-git-send-email-amarnath.valluri@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490965817-16913-1-git-send-email-amarnath.valluri@intel.com> References: <1490965817-16913-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.24 X-Mailman-Approved-At: Fri, 31 Mar 2017 10:56:08 -0400 Subject: [Qemu-devel] [PATCH 4/7] tpm-backend: Call interface methods only if backend implements them 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, stefanb@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This allows backend implementations left optional interface methods. Signed-off-by: Amarnath Valluri Signed-off-by: Amarnath Valluri --- backends/tpm.c | 22 ++++++++++++++-------- hw/tpm/tpm_passthrough.c | 16 ---------------- 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/backends/tpm.c b/backends/tpm.c index 00c82d7..0bdc5af 100644 --- a/backends/tpm.c +++ b/backends/tpm.c @@ -50,14 +50,16 @@ const char *tpm_backend_get_desc(TPMBackend *s) { TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s); - return k->ops->desc(); + return k->ops->desc ? k->ops->desc() : ""; } void tpm_backend_destroy(TPMBackend *s) { TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s); - k->ops->destroy(s); + if (k->ops->destroy) { + k->ops->destroy(s); + } object_unref(OBJECT(s)); } @@ -70,7 +72,7 @@ int tpm_backend_init(TPMBackend *s, TPMState *state, s->tpm_state = state; s->recv_data_callback = datacb; - return k->ops->init(s); + return k->ops->init ? k->ops->init(s) : 0; } int tpm_backend_startup_tpm(TPMBackend *s) @@ -87,21 +89,21 @@ int tpm_backend_startup_tpm(TPMBackend *s) NULL); } - return k->ops->startup_tpm(s); + return k->ops->startup_tpm ? k->ops->startup_tpm(s) : 0; } bool tpm_backend_had_startup_error(TPMBackend *s) { TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s); - return k->ops->had_startup_error(s); + return k->ops->had_startup_error ? k->ops->had_startup_error(s) : 0; } size_t tpm_backend_realloc_buffer(TPMBackend *s, TPMSizedBuffer *sb) { TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s); - return k->ops->realloc_buffer(sb); + return k->ops->realloc_buffer ? k->ops->realloc_buffer(sb) : (size_t)0; } void tpm_backend_deliver_request(TPMBackend *s) @@ -114,7 +116,9 @@ void tpm_backend_reset(TPMBackend *s) { TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s); - k->ops->reset(s); + if (k->ops->reset) { + k->ops->reset(s); + } tpm_backend_thread_end(s); } @@ -123,7 +127,9 @@ void tpm_backend_cancel_cmd(TPMBackend *s) { TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s); - k->ops->cancel_cmd(s); + if (k->ops->cancel_cmd) { + k->ops->cancel_cmd(s); + } } bool tpm_backend_get_tpm_established_flag(TPMBackend *s) diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c index cb63079..5b3bf1c 100644 --- a/hw/tpm/tpm_passthrough.c +++ b/hw/tpm/tpm_passthrough.c @@ -228,15 +228,6 @@ static void tpm_passthrough_handle_request(TPMBackend *tb, TPMBackendCmd cmd) } } -/* - * Start the TPM (thread). If it had been started before, then terminate - * and start it again. - */ -static int tpm_passthrough_startup_tpm(TPMBackend *tb) -{ - return 0; -} - static void tpm_passthrough_reset(TPMBackend *tb) { TPMPassthruState *tpm_pt = TPM_PASSTHROUGH(tb); @@ -248,11 +239,6 @@ static void tpm_passthrough_reset(TPMBackend *tb) tpm_pt->had_startup_error = false; } -static int tpm_passthrough_init(TPMBackend *tb) -{ - return 0; -} - static bool tpm_passthrough_get_tpm_established_flag(TPMBackend *tb) { return false; @@ -468,8 +454,6 @@ static const TPMDriverOps tpm_passthrough_driver = { .desc = tpm_passthrough_create_desc, .create = tpm_passthrough_create, .destroy = tpm_passthrough_destroy, - .init = tpm_passthrough_init, - .startup_tpm = tpm_passthrough_startup_tpm, .realloc_buffer = tpm_passthrough_realloc_buffer, .reset = tpm_passthrough_reset, .had_startup_error = tpm_passthrough_get_startup_error,