From nobody Tue Feb 10 17:08:55 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.zohomail.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 1507599661216676.4488478125278; Mon, 9 Oct 2017 18:41:01 -0700 (PDT) Received: from localhost ([::1]:60647 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1jXO-0000hC-G1 for importer@patchew.org; Mon, 09 Oct 2017 21:40:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41681) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1jRD-0003md-Ar for qemu-devel@nongnu.org; Mon, 09 Oct 2017 21:34:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1jRA-0000GR-5R for qemu-devel@nongnu.org; Mon, 09 Oct 2017 21:34:27 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:44328) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1jR9-0000FX-Sq for qemu-devel@nongnu.org; Mon, 09 Oct 2017 21:34:24 -0400 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v9A1Y8HZ122212 for ; Mon, 9 Oct 2017 21:34:18 -0400 Received: from e36.co.us.ibm.com (e36.co.us.ibm.com [32.97.110.154]) by mx0a-001b2d01.pphosted.com with ESMTP id 2dgbtcgu8h-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 09 Oct 2017 21:34:18 -0400 Received: from localhost by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 9 Oct 2017 19:34:17 -0600 Received: from b03cxnp08027.gho.boulder.ibm.com (9.17.130.19) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 9 Oct 2017 19:34:15 -0600 Received: from b03ledav004.gho.boulder.ibm.com (b03ledav004.gho.boulder.ibm.com [9.17.130.235]) by b03cxnp08027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v9A1YFCu46465256; Mon, 9 Oct 2017 18:34:15 -0700 Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1BAA278041; Mon, 9 Oct 2017 19:34:15 -0600 (MDT) Received: from sbct-3.watson.ibm.com (unknown [9.47.158.153]) by b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTP id 7A84A7804D; Mon, 9 Oct 2017 19:34:14 -0600 (MDT) From: Stefan Berger To: qemu-devel@nongnu.org Date: Mon, 9 Oct 2017 21:33:49 -0400 X-Mailer: git-send-email 2.5.5 In-Reply-To: <1507599235-25123-1-git-send-email-stefanb@linux.vnet.ibm.com> References: <1507599235-25123-1-git-send-email-stefanb@linux.vnet.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 17101001-0020-0000-0000-00000CD36451 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007871; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000235; SDB=6.00928882; UDB=6.00467501; IPR=6.00709153; BA=6.00005631; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00017467; XFM=3.00000015; UTC=2017-10-10 01:34:17 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17101001-0021-0000-0000-00005E731249 Message-Id: <1507599235-25123-5-git-send-email-stefanb@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-10-09_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1710100022 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-001b2d01.pphosted.com id v9A1Y8HZ122212 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PULL v2 04/10] 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: Peter Maydell , amarnath.valluri@intel.com, marcandre.lureau@gmail.com, Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Amarnath Valluri This allows backend implementations left optional interface methods. For mandatory methods assertion checks added. Took the opportunity to remove unused methods: - tpm_backend_get_desc() - TPMDriverOps->handle_startup_error Signed-off-by: Amarnath Valluri Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Stefan Berger Signed-off-by: Stefan Berger --- backends/tpm.c | 39 ++++++++++++++++++++++++--------------- hw/tpm/tpm_passthrough.c | 36 +----------------------------------- include/sysemu/tpm_backend.h | 13 ++----------- tpm.c | 2 +- 4 files changed, 28 insertions(+), 62 deletions(-) diff --git a/backends/tpm.c b/backends/tpm.c index cf5abf1..8911597 100644 --- a/backends/tpm.c +++ b/backends/tpm.c @@ -44,13 +44,6 @@ enum TpmType tpm_backend_get_type(TPMBackend *s) return k->ops->type; } =20 -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) { @@ -58,12 +51,14 @@ int tpm_backend_init(TPMBackend *s, TPMState *state, =20 s->tpm_state =3D state; s->recv_data_callback =3D datacb; + s->had_startup_error =3D false; =20 - return k->ops->init(s); + return k->ops->init ? k->ops->init(s) : 0; } =20 int tpm_backend_startup_tpm(TPMBackend *s) { + int res =3D 0; TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); =20 /* terminate a running TPM */ @@ -73,20 +68,24 @@ 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); + res =3D k->ops->startup_tpm ? k->ops->startup_tpm(s) : 0; + + s->had_startup_error =3D (res !=3D 0); + + return res; } =20 bool tpm_backend_had_startup_error(TPMBackend *s) { - TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); - - return k->ops->had_startup_error(s); + return s->had_startup_error; } =20 size_t tpm_backend_realloc_buffer(TPMBackend *s, TPMSizedBuffer *sb) { TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); =20 + assert(k->ops->realloc_buffer); + return k->ops->realloc_buffer(sb); } =20 @@ -100,15 +99,21 @@ 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); + + s->had_startup_error =3D false; } =20 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 +121,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..4c21e52 100644 --- a/hw/tpm/tpm_passthrough.c +++ b/hw/tpm/tpm_passthrough.c @@ -54,7 +54,6 @@ struct TPMPassthruState { bool tpm_executing; bool tpm_op_canceled; int cancel_fd; - bool had_startup_error; =20 TPMVersion tpm_version; }; @@ -227,29 +226,11 @@ 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); - DPRINTF("tpm_passthrough: CALL TO TPM_RESET!\n"); =20 tpm_passthrough_cancel_cmd(tb); - - tpm_pt->had_startup_error =3D false; -} - -static int tpm_passthrough_init(TPMBackend *tb) -{ - return 0; } =20 static bool tpm_passthrough_get_tpm_established_flag(TPMBackend *tb) @@ -264,13 +245,6 @@ static int tpm_passthrough_reset_tpm_established_flag(= TPMBackend *tb, return 0; } =20 -static bool tpm_passthrough_get_startup_error(TPMBackend *tb) -{ - TPMPassthruState *tpm_pt =3D TPM_PASSTHROUGH(tb); - - return tpm_pt->had_startup_error; -} - static size_t tpm_passthrough_realloc_buffer(TPMSizedBuffer *sb) { size_t wanted_size =3D 4096; /* Linux tpm.c buffer size */ @@ -309,11 +283,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,13 +422,10 @@ 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, .cancel_cmd =3D tpm_passthrough_cancel_cmd, .get_tpm_established_flag =3D tpm_passthrough_get_tpm_established_flag, .reset_tpm_established_flag =3D tpm_passthrough_reset_tpm_established_= flag, diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h index 202ec8d..9ea7072 100644 --- a/include/sysemu/tpm_backend.h +++ b/include/sysemu/tpm_backend.h @@ -47,6 +47,7 @@ struct TPMBackend { TPMState *tpm_state; GThreadPool *thread_pool; TPMRecvDataCB *recv_data_callback; + bool had_startup_error; =20 char *id; enum TpmModel fe_model; @@ -75,7 +76,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 @@ -83,8 +84,6 @@ struct TPMDriverOps { int (*init)(TPMBackend *t); /* start up the TPM on the backend */ int (*startup_tpm)(TPMBackend *t); - /* returns true if nothing will ever answer TPM requests */ - bool (*had_startup_error)(TPMBackend *t); =20 size_t (*realloc_buffer)(TPMSizedBuffer *sb); =20 @@ -109,14 +108,6 @@ struct TPMDriverOps { enum TpmType tpm_backend_get_type(TPMBackend *s); =20 /** - * 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 * @state: TPMState diff --git a/tpm.c b/tpm.c index b19b1a3..db14849 100644 --- a/tpm.c +++ b/tpm.c @@ -62,7 +62,7 @@ static void tpm_display_backend_drivers(void) continue; } fprintf(stderr, "%12s %s\n", - TpmType_str(i), be_drivers[i]->desc()); + TpmType_str(i), be_drivers[i]->desc); } fprintf(stderr, "\n"); } --=20 2.5.5