From patchwork Fri Apr 7 14:30:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amarnath Valluri X-Patchwork-Id: 9669615 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 40E656021C for ; Fri, 7 Apr 2017 14:33:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 32AE828608 for ; Fri, 7 Apr 2017 14:33:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 26A8B28616; Fri, 7 Apr 2017 14:33:27 +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 830BF28608 for ; Fri, 7 Apr 2017 14:33:26 +0000 (UTC) Received: from localhost ([::1]:51173 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwUx3-0006R4-KJ for patchwork-qemu-devel@patchwork.kernel.org; Fri, 07 Apr 2017 10:33:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60439) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwUuL-0005AI-4g for qemu-devel@nongnu.org; Fri, 07 Apr 2017 10:30:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cwUuK-0002bi-1a for qemu-devel@nongnu.org; Fri, 07 Apr 2017 10:30:37 -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 1cwUuJ-0002ZL-Mx for qemu-devel@nongnu.org; Fri, 07 Apr 2017 10:30:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491575435; x=1523111435; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=bEbqszeykUsG/cUL36/nuw9DbsUOrmSQAWk0jrnVYjY=; b=KDBKW2RctzFT3XdZrFhZDyZQPNP5v13Hzu0d5SjFO74giI4G9MuxIYZ6 wKM26JNYom+hzCd5mLlAwYUmtGi01g==; 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:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,165,1488873600"; d="scan'208";a="245879752" Received: from avallurigigabyte.fi.intel.com ([10.237.72.170]) by fmsmga004.fm.intel.com with ESMTP; 07 Apr 2017 07:30:33 -0700 From: Amarnath Valluri To: qemu-devel@nongnu.org Date: Fri, 7 Apr 2017 17:30:26 +0300 Message-Id: <1491575431-32170-5-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 4/9] tpm-backend: Made few interface methods optional 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+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. For mandatory methods assertion checks added. Signed-off-by: Amarnath Valluri Reviewed-by: Stefan Berger --- backends/tpm.c | 28 +++++++++++++++++++++------- hw/tpm/tpm_passthrough.c | 16 ---------------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/backends/tpm.c b/backends/tpm.c index 99d2b2b..c2be17b 100644 --- a/backends/tpm.c +++ b/backends/tpm.c @@ -48,14 +48,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)); } @@ -68,7 +70,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) @@ -82,13 +84,15 @@ int tpm_backend_startup_tpm(TPMBackend *s) NULL); g_thread_pool_push(s->thread_pool, (gpointer)TPM_BACKEND_CMD_INIT, 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); + assert(k->ops->had_startup_error); + return k->ops->had_startup_error(s); } @@ -96,6 +100,8 @@ size_t tpm_backend_realloc_buffer(TPMBackend *s, TPMSizedBuffer *sb) { TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s); + assert(k->ops->realloc_buffer); + return k->ops->realloc_buffer(sb); } @@ -109,7 +115,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); } @@ -118,6 +126,8 @@ void tpm_backend_cancel_cmd(TPMBackend *s) { TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s); + g_assert(k->ops->cancel_cmd); + k->ops->cancel_cmd(s); } @@ -125,20 +135,24 @@ bool tpm_backend_get_tpm_established_flag(TPMBackend *s) { TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s); - return k->ops->get_tpm_established_flag(s); + return k->ops->get_tpm_established_flag ? + k->ops->get_tpm_established_flag(s) : false; } int tpm_backend_reset_tpm_established_flag(TPMBackend *s, uint8_t locty) { TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s); - return k->ops->reset_tpm_established_flag(s, locty); + return k->ops->reset_tpm_established_flag ? + k->ops->reset_tpm_established_flag(s, locty) : 0; } TPMVersion tpm_backend_get_tpm_version(TPMBackend *s) { TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s); + assert(k->ops->get_tpm_version); + return k->ops->get_tpm_version(s); } diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c index 65831b5..0f543bd 100644 --- a/hw/tpm/tpm_passthrough.c +++ b/hw/tpm/tpm_passthrough.c @@ -227,15 +227,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); @@ -247,11 +238,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; @@ -467,8 +453,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,