Re: [PATCH 5/8] hw/tpm: Move few declarations from 'tpm_util.h' to 'tpm_int.h'

[Stefan Berger]

On 6/10/20 4:02 PM, Philippe Mathieu-Daudé wrote:
> We are going to make "tpm_util.h" publicly accessible by
> moving it to the include/ directory in a pair of commits.
> Keep declarations internals to hw/tpm/ in "tpm_int.h".
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>


> ---
>   hw/tpm/tpm_int.h  | 11 +++++++++++
>   hw/tpm/tpm_util.h | 10 ----------
>   2 files changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/hw/tpm/tpm_int.h b/hw/tpm/tpm_int.h
> index fd5ebc6489..9f72879d89 100644
> --- a/hw/tpm/tpm_int.h
> +++ b/hw/tpm/tpm_int.h
> @@ -13,6 +13,7 @@
>   #define TPM_TPM_INT_H
>   
>   #include "qemu/option.h"
> +#include "sysemu/tpm.h"
>   
>   #define TPM_STANDARD_CMDLINE_OPTS \
>       { \
> @@ -74,4 +75,14 @@ struct tpm_resp_hdr {
>   #define TPM_RC_FAILURE            0x101
>   #define TPM_RC_LOCALITY           0x907
>   
> +int tpm_util_get_buffer_size(int tpm_fd, TPMVersion tpm_version,
> +                             size_t *buffersize);
> +
> +typedef struct TPMSizedBuffer {
> +    uint32_t size;
> +    uint8_t  *buffer;
> +} TPMSizedBuffer;
> +
> +void tpm_sized_buffer_reset(TPMSizedBuffer *tsb);
> +
>   #endif /* TPM_TPM_INT_H */
> diff --git a/hw/tpm/tpm_util.h b/hw/tpm/tpm_util.h
> index 7889081fba..d524935576 100644
> --- a/hw/tpm/tpm_util.h
> +++ b/hw/tpm/tpm_util.h
> @@ -66,19 +66,9 @@ static inline void tpm_cmd_set_error(void *b, uint32_t error)
>       stl_be_p(b + 6, error);
>   }
>   
> -int tpm_util_get_buffer_size(int tpm_fd, TPMVersion tpm_version,
> -                             size_t *buffersize);
> -
>   #define DEFINE_PROP_TPMBE(_n, _s, _f)                     \
>       DEFINE_PROP(_n, _s, _f, qdev_prop_tpm, TPMBackend *)
>   
> -typedef struct TPMSizedBuffer {
> -    uint32_t size;
> -    uint8_t  *buffer;
> -} TPMSizedBuffer;
> -
> -void tpm_sized_buffer_reset(TPMSizedBuffer *tsb);
> -
>   void tpm_util_show_buffer(const unsigned char *buffer,
>                             size_t buffer_size, const char *string);
>