From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53400) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvOIk-0003Ja-Ep for qemu-devel@nongnu.org; Tue, 04 Apr 2017 09:15:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cvOIj-0002jU-3z for qemu-devel@nongnu.org; Tue, 04 Apr 2017 09:15:14 -0400 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]:33970) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cvOIi-0002iu-Ni for qemu-devel@nongnu.org; Tue, 04 Apr 2017 09:15:13 -0400 Received: by mail-lf0-x243.google.com with SMTP id x137so15508464lff.1 for ; Tue, 04 Apr 2017 06:15:12 -0700 (PDT) MIME-Version: 1.0 References: <1490965817-16913-1-git-send-email-amarnath.valluri@intel.com> <1490965817-16913-5-git-send-email-amarnath.valluri@intel.com> In-Reply-To: <1490965817-16913-5-git-send-email-amarnath.valluri@intel.com> From: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Date: Tue, 04 Apr 2017 13:15:00 +0000 Message-ID: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 4/7] tpm-backend: Call interface methods only if backend implements them List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Amarnath Valluri , qemu-devel@nongnu.org Cc: patrick.ohly@intel.com, stefanb@linux.vnet.ibm.com Hi On Fri, Mar 31, 2017 at 4:57 PM Amarnath Valluri wrote: > This allows backend implementations left optional interface methods. > > Does that make sense to make them optional? instead I would add asserts. 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 =3D TPM_BACKEND_GET_CLASS(s); > > - return k->ops->desc(); > + return k->ops->desc ? k->ops->desc() : ""; > } > > void tpm_backend_destroy(TPMBackend *s) > { > TPMBackendClass *k =3D 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 =3D state; > s->recv_data_callback =3D 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 =3D 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 =3D 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 =3D 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 =3D 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(TPMBacken= d > *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 =3D TPM_PASSTHROUGH(tb); > @@ -248,11 +239,6 @@ static void tpm_passthrough_reset(TPMBackend *tb) > tpm_pt->had_startup_error =3D false; > } > > -static int tpm_passthrough_init(TPMBackend *tb) > -{ > - return 0; > -} > - > These two hunks could be squashed in earlier patch > static bool tpm_passthrough_get_tpm_established_flag(TPMBackend *tb) > { > return false; > @@ -468,8 +454,6 @@ static const TPMDriverOps tpm_passthrough_driver =3D = { > .desc =3D tpm_passthrough_create_desc, > .create =3D tpm_passthrough_create, > .destroy =3D tpm_passthrough_destroy, > - .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, > -- > 2.7.4 > > > -- Marc-Andr=C3=A9 Lureau