From 8bdbf86b57b751a1b2865c5e868de0bb663cc38b Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 18 Nov 2011 17:35:37 +0100 Subject: [PATCH] 9p: allow compiling the dummy virtio-9p-handle.c code on Linux Avoid a conflict on the definition of struct file_handle by using a replacement name. Signed-off-by: Paolo Bonzini Signed-off-by: Anthony Liguori --- hw/9pfs/virtio-9p-handle.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/9pfs/virtio-9p-handle.c b/hw/9pfs/virtio-9p-handle.c index 0a778b4..27889d8 100644 --- a/hw/9pfs/virtio-9p-handle.c +++ b/hw/9pfs/virtio-9p-handle.c @@ -58,11 +58,12 @@ static inline int open_by_handle(int mountfd, const char *fh, int flags) } #else -struct file_handle { +struct rpl_file_handle { unsigned int handle_bytes; int handle_type; unsigned char handle[0]; }; +#define file_handle rpl_file_handle #ifndef AT_EMPTY_PATH #define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname */ -- 2.7.4