From nobody Wed Nov 5 18:27:46 2025 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 1496667225778753.4777195681983; Mon, 5 Jun 2017 05:53:45 -0700 (PDT) Received: from localhost ([::1]:33194 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHrVw-0004sJ-8r for importer@patchew.org; Mon, 05 Jun 2017 08:53:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHrN3-0004oh-VQ for qemu-devel@nongnu.org; Mon, 05 Jun 2017 08:44:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHrN2-0001CG-HJ for qemu-devel@nongnu.org; Mon, 05 Jun 2017 08:44:34 -0400 Received: from mga07.intel.com ([134.134.136.100]:29413) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dHrN2-00019b-5o for qemu-devel@nongnu.org; Mon, 05 Jun 2017 08:44:32 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP; 05 Jun 2017 05:44:31 -0700 Received: from avallurigigabyte.fi.intel.com ([10.237.72.170]) by orsmga002.jf.intel.com with ESMTP; 05 Jun 2017 05:44:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,300,1493708400"; d="scan'208";a="95699341" From: Amarnath Valluri To: qemu-devel@nongnu.org Date: Mon, 5 Jun 2017 15:45:07 +0300 Message-Id: <1496666711-14630-5-git-send-email-amarnath.valluri@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496666711-14630-1-git-send-email-amarnath.valluri@intel.com> References: <1496666711-14630-1-git-send-email-amarnath.valluri@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.100 Subject: [Qemu-devel] [PATCH v5 4/8] 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 , marcandre.lureau@gmail.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 This allows backend implementations left optional interface methods. For mandatory methods assertion checks added. Took the opportunity to remove unused methods: tpm_backend_get_type() tpm_backend_get_desc() Signed-off-by: Amarnath Valluri Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Stefan Berger --- backends/tpm.c | 36 +++++++++++++++++------------------- hw/tpm/tpm_passthrough.c | 23 +---------------------- include/sysemu/tpm_backend.h | 19 +------------------ tpm.c | 2 +- 4 files changed, 20 insertions(+), 60 deletions(-) diff --git a/backends/tpm.c b/backends/tpm.c index cf5abf1..05002e6 100644 --- a/backends/tpm.c +++ b/backends/tpm.c @@ -37,20 +37,6 @@ static void tpm_backend_thread_end(TPMBackend *s) } } =20 -enum TpmType tpm_backend_get_type(TPMBackend *s) -{ - TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); - - return k->ops->type; -} - -const char *tpm_backend_get_desc(TPMBackend *s) -{ - TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); - - return k->ops->desc(); -} - int tpm_backend_init(TPMBackend *s, TPMState *state, TPMRecvDataCB *datacb) { @@ -59,7 +45,7 @@ int tpm_backend_init(TPMBackend *s, TPMState *state, s->tpm_state =3D state; s->recv_data_callback =3D datacb; =20 - return k->ops->init(s); + return k->ops->init ? k->ops->init(s) : 0; } =20 int tpm_backend_startup_tpm(TPMBackend *s) @@ -73,13 +59,15 @@ int tpm_backend_startup_tpm(TPMBackend *s) NULL); g_thread_pool_push(s->thread_pool, (gpointer)TPM_BACKEND_CMD_INIT, NUL= L); =20 - return k->ops->startup_tpm(s); + return k->ops->startup_tpm ? k->ops->startup_tpm(s) : 0; } =20 bool tpm_backend_had_startup_error(TPMBackend *s) { TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); =20 + assert(k->ops->had_startup_error); + return k->ops->had_startup_error(s); } =20 @@ -87,6 +75,8 @@ size_t tpm_backend_realloc_buffer(TPMBackend *s, TPMSized= Buffer *sb) { TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); =20 + assert(k->ops->realloc_buffer); + return k->ops->realloc_buffer(sb); } =20 @@ -100,7 +90,9 @@ void tpm_backend_reset(TPMBackend *s) { TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); =20 - k->ops->reset(s); + if (k->ops->reset) { + k->ops->reset(s); + } =20 tpm_backend_thread_end(s); } @@ -109,6 +101,8 @@ void tpm_backend_cancel_cmd(TPMBackend *s) { TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); =20 + assert(k->ops->cancel_cmd); + k->ops->cancel_cmd(s); } =20 @@ -116,20 +110,24 @@ bool tpm_backend_get_tpm_established_flag(TPMBackend = *s) { TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); =20 - return k->ops->get_tpm_established_flag(s); + return k->ops->get_tpm_established_flag ? + k->ops->get_tpm_established_flag(s) : false; } =20 int tpm_backend_reset_tpm_established_flag(TPMBackend *s, uint8_t locty) { TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); =20 - 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; } =20 TPMVersion tpm_backend_get_tpm_version(TPMBackend *s) { TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); =20 + assert(k->ops->get_tpm_version); + return k->ops->get_tpm_version(s); } =20 diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c index 815a72e..a0459a6 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) } } =20 -/* - * 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 =3D TPM_PASSTHROUGH(tb); @@ -247,11 +238,6 @@ static void tpm_passthrough_reset(TPMBackend *tb) tpm_pt->had_startup_error =3D false; } =20 -static int tpm_passthrough_init(TPMBackend *tb) -{ - return 0; -} - static bool tpm_passthrough_get_tpm_established_flag(TPMBackend *tb) { return false; @@ -309,11 +295,6 @@ static void tpm_passthrough_cancel_cmd(TPMBackend *tb) } } =20 -static const char *tpm_passthrough_create_desc(void) -{ - return "Passthrough TPM backend driver"; -} - static TPMVersion tpm_passthrough_get_tpm_version(TPMBackend *tb) { TPMPassthruState *tpm_pt =3D TPM_PASSTHROUGH(tb); @@ -453,10 +434,8 @@ static const QemuOptDesc tpm_passthrough_cmdline_opts[= ] =3D { static const TPMDriverOps tpm_passthrough_driver =3D { .type =3D TPM_TYPE_PASSTHROUGH, .opts =3D tpm_passthrough_cmdline_opts, - .desc =3D tpm_passthrough_create_desc, + .desc =3D "Passthrough TPM backend driver", .create =3D tpm_passthrough_create, - .init =3D tpm_passthrough_init, - .startup_tpm =3D tpm_passthrough_startup_tpm, .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 f61bcfe..d6ae463 100644 --- a/include/sysemu/tpm_backend.h +++ b/include/sysemu/tpm_backend.h @@ -75,7 +75,7 @@ struct TPMDriverOps { enum TpmType type; const QemuOptDesc *opts; /* get a descriptive text of the backend to display to the user */ - const char *(*desc)(void); + const char *desc; =20 TPMBackend *(*create)(QemuOpts *opts, const char *id); =20 @@ -99,23 +99,6 @@ struct TPMDriverOps { TPMVersion (*get_tpm_version)(TPMBackend *t); }; =20 - -/** - * tpm_backend_get_type: - * @s: the backend - * - * Returns the TpmType of the backend. - */ -enum TpmType tpm_backend_get_type(TPMBackend *s); - -/** - * tpm_backend_get_desc: - * @s: the backend - * - * Returns a human readable description of the backend. - */ -const char *tpm_backend_get_desc(TPMBackend *s); - /** * tpm_backend_init: * @s: the backend to initialized diff --git a/tpm.c b/tpm.c index 70f74fa..2979508 100644 --- a/tpm.c +++ b/tpm.c @@ -102,7 +102,7 @@ static void tpm_display_backend_drivers(void) =20 for (i =3D 0; i < TPM_MAX_DRIVERS && be_drivers[i] !=3D NULL; i++) { fprintf(stderr, "%12s %s\n", - TpmType_lookup[be_drivers[i]->type], be_drivers[i]->desc()= ); + TpmType_lookup[be_drivers[i]->type], be_drivers[i]->desc); } fprintf(stderr, "\n"); } --=20 2.7.4