[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v5 6/8] tpm-backend: Move realloc_buffer() imple
From: |
Marc-André Lureau |
Subject: |
Re: [Qemu-devel] [PATCH v5 6/8] tpm-backend: Move realloc_buffer() implementation to tpm-tis model |
Date: |
Tue, 06 Jun 2017 12:03:40 +0000 |
On Mon, Jun 5, 2017 at 4:44 PM Amarnath Valluri <address@hidden>
wrote:
> buffer reallocation is very unlikely to be backend specific. Hence move
> inside
> the tis.
>
> Signed-off-by: Amarnath Valluri <address@hidden>
> Reviewed-by: Stefan Berger <address@hidden>
>
Reviewed-by: Marc-André Lureau <address@hidden>
> ---
> backends/tpm.c | 9 ---------
> hw/tpm/tpm_passthrough.c | 12 ------------
> hw/tpm/tpm_tis.c | 14 ++++++++++++--
> include/sysemu/tpm_backend.h | 12 ------------
> 4 files changed, 12 insertions(+), 35 deletions(-)
>
> diff --git a/backends/tpm.c b/backends/tpm.c
> index 4ae6129..3519570 100644
> --- a/backends/tpm.c
> +++ b/backends/tpm.c
> @@ -71,15 +71,6 @@ bool tpm_backend_had_startup_error(TPMBackend *s)
> return k->ops->had_startup_error(s);
> }
>
> -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);
> -}
> -
> void tpm_backend_deliver_request(TPMBackend *s)
> {
> g_thread_pool_push(s->thread_pool,
> (gpointer)TPM_BACKEND_CMD_PROCESS_CMD,
> diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
> index c7706e4..4ac47ed 100644
> --- a/hw/tpm/tpm_passthrough.c
> +++ b/hw/tpm/tpm_passthrough.c
> @@ -258,17 +258,6 @@ static bool
> tpm_passthrough_get_startup_error(TPMBackend *tb)
> return tpm_pt->had_startup_error;
> }
>
> -static size_t tpm_passthrough_realloc_buffer(TPMSizedBuffer *sb)
> -{
> - size_t wanted_size = 4096; /* Linux tpm.c buffer size */
> -
> - if (sb->size != wanted_size) {
> - sb->buffer = g_realloc(sb->buffer, wanted_size);
> - sb->size = wanted_size;
> - }
> - return sb->size;
> -}
> -
> static void tpm_passthrough_cancel_cmd(TPMBackend *tb)
> {
> TPMPassthruState *tpm_pt = TPM_PASSTHROUGH(tb);
> @@ -475,7 +464,6 @@ static const TPMDriverOps tpm_passthrough_driver = {
> .opts = tpm_passthrough_cmdline_opts,
> .desc = "Passthrough TPM backend driver",
> .create = tpm_passthrough_create,
> - .realloc_buffer = tpm_passthrough_realloc_buffer,
> .reset = tpm_passthrough_reset,
> .had_startup_error = tpm_passthrough_get_startup_error,
> .cancel_cmd = tpm_passthrough_cancel_cmd,
> diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
> index a6440fe..d5118e7 100644
> --- a/hw/tpm/tpm_tis.c
> +++ b/hw/tpm/tpm_tis.c
> @@ -963,6 +963,16 @@ static int tpm_tis_do_startup_tpm(TPMState *s)
> return tpm_backend_startup_tpm(s->be_driver);
> }
>
> +static void tpm_tis_realloc_buffer(TPMSizedBuffer *sb)
> +{
> + size_t wanted_size = 4096; /* Linux tpm.c buffer size */
> +
> + if (sb->size != wanted_size) {
> + sb->buffer = g_realloc(sb->buffer, wanted_size);
> + sb->size = wanted_size;
> + }
> +}
> +
> /*
> * Get the TPMVersion of the backend device being used
> */
> @@ -1010,9 +1020,9 @@ static void tpm_tis_reset(DeviceState *dev)
> tis->loc[c].state = TPM_TIS_STATE_IDLE;
>
> tis->loc[c].w_offset = 0;
> - tpm_backend_realloc_buffer(s->be_driver, &tis->loc[c].w_buffer);
> + tpm_tis_realloc_buffer(&tis->loc[c].w_buffer);
> tis->loc[c].r_offset = 0;
> - tpm_backend_realloc_buffer(s->be_driver, &tis->loc[c].r_buffer);
> + tpm_tis_realloc_buffer(&tis->loc[c].r_buffer);
> }
>
> tpm_tis_do_startup_tpm(s);
> diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h
> index 6e5bb8d..bebfba3 100644
> --- a/include/sysemu/tpm_backend.h
> +++ b/include/sysemu/tpm_backend.h
> @@ -85,8 +85,6 @@ struct TPMDriverOps {
> /* returns true if nothing will ever answer TPM requests */
> bool (*had_startup_error)(TPMBackend *t);
>
> - size_t (*realloc_buffer)(TPMSizedBuffer *sb);
> -
> void (*reset)(TPMBackend *t);
>
> void (*cancel_cmd)(TPMBackend *t);
> @@ -132,16 +130,6 @@ int tpm_backend_startup_tpm(TPMBackend *s);
> bool tpm_backend_had_startup_error(TPMBackend *s);
>
> /**
> - * tpm_backend_realloc_buffer:
> - * @s: the backend
> - * @sb: the TPMSizedBuffer to re-allocated to the size suitable for the
> - * backend.
> - *
> - * This function returns the size of the allocated buffer
> - */
> -size_t tpm_backend_realloc_buffer(TPMBackend *s, TPMSizedBuffer *sb);
> -
> -/**
> * tpm_backend_deliver_request:
> * @s: the backend to send the request to
> *
> --
> 2.7.4
>
> --
Marc-André Lureau
- [Qemu-devel] [PATCH v4 0/8] Provide support for the software TPM emulator, Amarnath Valluri, 2017/06/05
- [Qemu-devel] [PATCH v5 1/8] tpm-backend: Remove unneeded member variable from backend class, Amarnath Valluri, 2017/06/05
- [Qemu-devel] [PATCH v5 3/8] tpm-backend: Initialize and free data members in it's own methods, Amarnath Valluri, 2017/06/05
- [Qemu-devel] [PATCH v5 2/8] tpm-backend: Move thread handling inside TPMBackend, Amarnath Valluri, 2017/06/05
- [Qemu-devel] [PATCH v5 4/8] tpm-backend: Made few interface methods optional, Amarnath Valluri, 2017/06/05
- [Qemu-devel] [PATCH v5 5/8] tmp backend: Add new api to read backend TpmInfo, Amarnath Valluri, 2017/06/05
- [Qemu-devel] [PATCH v5 6/8] tpm-backend: Move realloc_buffer() implementation to tpm-tis model, Amarnath Valluri, 2017/06/05
- Re: [Qemu-devel] [PATCH v5 6/8] tpm-backend: Move realloc_buffer() implementation to tpm-tis model,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v5 7/8] tpm-passthrough: move reusable code to utils, Amarnath Valluri, 2017/06/05
- [Qemu-devel] [PATCH v5 8/8] tpm: Added support for TPM emulator, Amarnath Valluri, 2017/06/05