From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 18 Nov 2011 16:35:37 +0000 (+0100)
Subject: 9p: allow compiling the dummy virtio-9p-handle.c code on Linux
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f5654039497b7c5a2d3fe38d0fcf7898596b21f7;p=qmiga%2Fqemu.git

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 <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/9pfs/virtio-9p-handle.c b/hw/9pfs/virtio-9p-handle.c
index 0a778b48c4..27889d877b 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 */