From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39066) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eBmJH-0006J4-E0 for qemu-devel@nongnu.org; Mon, 06 Nov 2017 13:39:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eBmJE-0004G8-A1 for qemu-devel@nongnu.org; Mon, 06 Nov 2017 13:39:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35916) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eBmJE-0004Fv-12 for qemu-devel@nongnu.org; Mon, 06 Nov 2017 13:39:44 -0500 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Mon, 6 Nov 2017 19:39:00 +0100 Message-Id: <20171106183925.16747-4-marcandre.lureau@redhat.com> In-Reply-To: <20171106183925.16747-1-marcandre.lureau@redhat.com> References: <20171106183925.16747-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 03/28] tpm-backend: store TPMIf interface, improve backend_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amarnath.valluri@intel.com, stefanb@linux.vnet.ibm.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Store the TPM interface, the actual object may be different from TPMState. Keep a reference on the interface, and check the backend wasn't already initialized. Signed-off-by: Marc-Andr=C3=A9 Lureau --- include/sysemu/tpm.h | 2 +- include/sysemu/tpm_backend.h | 6 +++--- backends/tpm.c | 11 +++++++++-- hw/tpm/tpm_emulator.c | 4 ++-- hw/tpm/tpm_passthrough.c | 4 ++-- hw/tpm/tpm_tis.c | 2 +- 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h index 452cdb9cb7..fb1719e5e4 100644 --- a/include/sysemu/tpm.h +++ b/include/sysemu/tpm.h @@ -12,8 +12,8 @@ #ifndef QEMU_TPM_H #define QEMU_TPM_H =20 -#include "qemu/option.h" #include "qom/object.h" +#include "qapi-types.h" =20 typedef struct TPMState TPMState; =20 diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h index 03ea5a3400..b5f21ed8f1 100644 --- a/include/sysemu/tpm_backend.h +++ b/include/sysemu/tpm_backend.h @@ -43,8 +43,8 @@ struct TPMBackend { Object parent; =20 /*< protected >*/ + TPMIf *tpmif; bool opened; - TPMState *tpm_state; GThreadPool *thread_pool; bool had_startup_error; =20 @@ -96,14 +96,14 @@ enum TpmType tpm_backend_get_type(TPMBackend *s); /** * tpm_backend_init: * @s: the backend to initialized - * @state: TPMState + * @tpmif: TPM interface * @datacb: callback for sending data to frontend * * Initialize the backend with the given variables. * * Returns 0 on success. */ -int tpm_backend_init(TPMBackend *s, TPMState *state); +int tpm_backend_init(TPMBackend *s, TPMIf *tpmif); =20 /** * tpm_backend_startup_tpm: diff --git a/backends/tpm.c b/backends/tpm.c index 1e416d7f90..86f0e7e915 100644 --- a/backends/tpm.c +++ b/backends/tpm.c @@ -43,9 +43,15 @@ enum TpmType tpm_backend_get_type(TPMBackend *s) return k->type; } =20 -int tpm_backend_init(TPMBackend *s, TPMState *state) +int tpm_backend_init(TPMBackend *s, TPMIf *tpmif) { - s->tpm_state =3D state; + if (s->tpmif) { + return -1; + } + + s->tpmif =3D tpmif; + object_ref(OBJECT(tpmif)); + s->had_startup_error =3D false; =20 return 0; @@ -193,6 +199,7 @@ static void tpm_backend_instance_finalize(Object *obj= ) { TPMBackend *s =3D TPM_BACKEND(obj); =20 + object_unref(OBJECT(s->tpmif)); g_free(s->id); tpm_backend_thread_end(s); } diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c index 9aaec8e3ef..6bf025c7e2 100644 --- a/hw/tpm/tpm_emulator.c +++ b/hw/tpm/tpm_emulator.c @@ -176,7 +176,7 @@ static int tpm_emulator_set_locality(TPMEmulator *tpm= _emu, uint8_t locty_number, static void tpm_emulator_handle_request(TPMBackend *tb, TPMBackendCmd *c= md) { TPMEmulator *tpm_emu =3D TPM_EMULATOR(tb); - TPMIfClass *tic =3D TPM_IF_GET_CLASS(tb->tpm_state); + TPMIfClass *tic =3D TPM_IF_GET_CLASS(tb->tpmif); Error *err =3D NULL; =20 DPRINTF("processing TPM command"); @@ -191,7 +191,7 @@ static void tpm_emulator_handle_request(TPMBackend *t= b, TPMBackendCmd *cmd) goto error; } =20 - tic->request_completed(TPM_IF(tb->tpm_state)); + tic->request_completed(tb->tpmif); return; =20 error: diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c index c440aff4b2..2ad74badca 100644 --- a/hw/tpm/tpm_passthrough.c +++ b/hw/tpm/tpm_passthrough.c @@ -139,14 +139,14 @@ err_exit: static void tpm_passthrough_handle_request(TPMBackend *tb, TPMBackendCmd= *cmd) { TPMPassthruState *tpm_pt =3D TPM_PASSTHROUGH(tb); - TPMIfClass *tic =3D TPM_IF_GET_CLASS(tb->tpm_state); + TPMIfClass *tic =3D TPM_IF_GET_CLASS(tb->tpmif); =20 DPRINTF("tpm_passthrough: processing command %p\n", cmd); =20 tpm_passthrough_unix_tx_bufs(tpm_pt, cmd->in, cmd->in_len, cmd->out, cmd->out_len, &cmd->selftest_= done); =20 - tic->request_completed(TPM_IF(tb->tpm_state)); + tic->request_completed(tb->tpmif); } =20 static void tpm_passthrough_reset(TPMBackend *tb) diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c index c5c534d7f2..34ceec91c3 100644 --- a/hw/tpm/tpm_tis.c +++ b/hw/tpm/tpm_tis.c @@ -1078,7 +1078,7 @@ static void tpm_tis_realizefn(DeviceState *dev, Err= or **errp) =20 s->be_driver->fe_model =3D TPM_MODEL_TPM_TIS; =20 - if (tpm_backend_init(s->be_driver, s)) { + if (tpm_backend_init(s->be_driver, TPM_IF(s))) { error_setg(errp, "tpm_tis: backend driver with id %s could not b= e " "initialized", s->backend); return; --=20 2.15.0.rc0.40.gaefcc5f6f