OSDN Git Service
(root)
/
qmiga
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1ed520c
)
9p: allow compiling the dummy virtio-9p-handle.c code on Linux
author
Paolo Bonzini
<pbonzini@redhat.com>
Fri, 18 Nov 2011 16:35:37 +0000
(17:35 +0100)
committer
Anthony Liguori
<aliguori@us.ibm.com>
Mon, 21 Nov 2011 20:58:48 +0000
(14:58 -0600)
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>
hw/9pfs/virtio-9p-handle.c
patch
|
blob
|
history
diff --git
a/hw/9pfs/virtio-9p-handle.c
b/hw/9pfs/virtio-9p-handle.c
index
0a778b4
..
27889d8
100644
(file)
--- 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 */