Re: [PATCH 14/51] backends/tpm: Exclude headers and macros that don't exist on win32

[Marc-André Lureau]

Hi

On Wed, Aug 24, 2022 at 5:26 PM Stefan Berger <stefanb@linux.ibm.com> wrote:

On 8/24/22 05:39, Bin Meng wrote:
> From: Bin Meng <bin.meng@windriver.com>
>
> These headers and macros do not exist on Windows. Exclude them.
>
> Signed-off-by: Bin Meng <bin.meng@windriver.com>
> ---
>
>   backends/tpm/tpm_ioctl.h | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/backends/tpm/tpm_ioctl.h b/backends/tpm/tpm_ioctl.h
> index bd6c12cb86..d67bf0283b 100644
> --- a/backends/tpm/tpm_ioctl.h
> +++ b/backends/tpm/tpm_ioctl.h
> @@ -9,8 +9,10 @@
>   #ifndef TPM_IOCTL_H
>   #define TPM_IOCTL_H
>
> +#ifndef _WIN32
>   #include <sys/uio.h>
>   #include <sys/ioctl.h>
> +#endif
>
>   #ifdef HAVE_SYS_IOCCOM_H
>   #include <sys/ioccom.h>
> @@ -222,6 +224,7 @@ typedef struct ptm_setbuffersize ptm_setbuffersize;
>   #define PTM_CAP_SET_DATAFD         (1 << 12)
>   #define PTM_CAP_SET_BUFFERSIZE     (1 << 13)
>
> +#ifndef _WIN32
>   enum {
>       PTM_GET_CAPABILITY     = _IOR('P', 0, ptm_cap),
>       PTM_INIT               = _IOWR('P', 1, ptm_init),
> @@ -241,6 +244,7 @@ enum {
>       PTM_SET_DATAFD         = _IOR('P', 15, ptm_res),
>       PTM_SET_BUFFERSIZE     = _IOWR('P', 16, ptm_setbuffersize),
>   };
> +#endif
>
>   /*
>    * Commands used by the non-CUSE TPMs

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

I guess it would be worthy to make libtpms/swtpm work under windows too, but this is a larger goal.

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

--

Marc-André Lureau