aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2011-11-18 17:35:37 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2011-11-21 14:58:48 -0600
commitf5654039497b7c5a2d3fe38d0fcf7898596b21f7 (patch)
treee1841279697ae7eeb46edeb15fc1ca83b7b08126 /hw
parent1ed520c66e3f3b57b88d201c08558ec1616bf69d (diff)
downloadqemu-f5654039497b7c5a2d3fe38d0fcf7898596b21f7.zip
qemu-f5654039497b7c5a2d3fe38d0fcf7898596b21f7.tar.gz
qemu-f5654039497b7c5a2d3fe38d0fcf7898596b21f7.tar.bz2
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>
Diffstat (limited to 'hw')
-rw-r--r--hw/9pfs/virtio-9p-handle.c3
1 files changed, 2 insertions, 1 deletions
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 */