Re: [RFC PATCH 1/6] tools/virtio: fix build

From: Michael S. Tsirkin
Date: Mon Jul 04 2022 - 15:08:14 EST


On Mon, Jul 04, 2022 at 07:16:56PM +0200, Stefano Garzarella wrote:
> Fix the build caused by the following changes:
> - phys_addr_t is now defined in tools/include/linux/types.h
> - dev_warn_once() is used in drivers/virtio/virtio_ring.c
> - linux/uio.h included by vringh.h use INT_MAX defined in limits.h
>
> Signed-off-by: Stefano Garzarella <sgarzare@xxxxxxxxxx>

Post this separately?

> ---
> tools/virtio/linux/kernel.h | 2 +-
> tools/virtio/linux/vringh.h | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tools/virtio/linux/kernel.h b/tools/virtio/linux/kernel.h
> index 0b493542e61a..21593bf97755 100644
> --- a/tools/virtio/linux/kernel.h
> +++ b/tools/virtio/linux/kernel.h
> @@ -29,7 +29,6 @@
> #define READ 0
> #define WRITE 1
>
> -typedef unsigned long long phys_addr_t;
> typedef unsigned long long dma_addr_t;
> typedef size_t __kernel_size_t;
> typedef unsigned int __wsum;
> @@ -136,6 +135,7 @@ static inline void *krealloc_array(void *p, size_t new_n, size_t new_size, gfp_t
> #endif
> #define dev_err(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__)
> #define dev_warn(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__)
> +#define dev_warn_once(dev, format, ...) fprintf (stderr, format, ## __VA_ARGS__)
>
> #define min(x, y) ({ \
> typeof(x) _min1 = (x); \
> diff --git a/tools/virtio/linux/vringh.h b/tools/virtio/linux/vringh.h
> index 9348957be56e..e11c6aece734 100644
> --- a/tools/virtio/linux/vringh.h
> +++ b/tools/virtio/linux/vringh.h
> @@ -1 +1,2 @@
> +#include <limits.h>
> #include "../../../include/linux/vringh.h"
> --
> 2.36.1