Patchwork virtio-9p: fix QEMU build break

login
register
mail settings
Submitter Zhi Yong Wu
Date Oct. 10, 2011, 10:30 a.m.
Message ID <1318242628-18729-1-git-send-email-wuzhy@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/118686/
State New
Headers show

Comments

Zhi Yong Wu - Oct. 10, 2011, 10:30 a.m.
qemu build break due to the redefinition of struct file_handle. My qemu.git/HEAD is 8acbc9b21d757a6be4f8492e547b8159703a0547

Below is the log:
[root@f15 qemu]# make
  CC    qapi-generated/qga-qapi-types.o
  LINK  qemu-ga
  CC    libhw64/9pfs/virtio-9p-handle.o
/home/zwu/work/virt/qemu/hw/9pfs/virtio-9p-handle.c:31:8: error: redefinition of "struct file_handle"
/usr/include/bits/fcntl.h:254:8: note: originally defined here
make[1]: *** [9pfs/virtio-9p-handle.o] Error 1
make: *** [subdir-libhw64] Error 2

[root@f15 qemu]# rpm -qf /usr/include/bits/fcntl.h
glibc-headers-2.13.90-9.x86_64

Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
 hw/9pfs/virtio-9p-handle.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Aneesh Kumar K.V - Oct. 10, 2011, 4:35 p.m.
On Mon, 10 Oct 2011 18:30:28 +0800, Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> wrote:
> qemu build break due to the redefinition of struct file_handle. My qemu.git/HEAD is 8acbc9b21d757a6be4f8492e547b8159703a0547
> 
> Below is the log:
> [root@f15 qemu]# make
>   CC    qapi-generated/qga-qapi-types.o
>   LINK  qemu-ga
>   CC    libhw64/9pfs/virtio-9p-handle.o
> /home/zwu/work/virt/qemu/hw/9pfs/virtio-9p-handle.c:31:8: error: redefinition of "struct file_handle"
> /usr/include/bits/fcntl.h:254:8: note: originally defined here
> make[1]: *** [9pfs/virtio-9p-handle.o] Error 1
> make: *** [subdir-libhw64] Error 2
> 
> [root@f15 qemu]# rpm -qf /usr/include/bits/fcntl.h
> glibc-headers-2.13.90-9.x86_64
> 

Is this a backported glibc ? On my ubuntu system glibc 2.13 doesn't
provide struct file_handle. I also checked glib repo at
http://repo.or.cz/w/glibc.git. The commit introducing struct file_handle
is 

$ git describe --contains 158648c0bdda281e252a27c0200dd0ea6f4e0215
glibc-2.14~200


> Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
> ---
>  hw/9pfs/virtio-9p-handle.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/9pfs/virtio-9p-handle.c b/hw/9pfs/virtio-9p-handle.c
> index 5c8b5ed..5b3a867 100644
> --- a/hw/9pfs/virtio-9p-handle.c
> +++ b/hw/9pfs/virtio-9p-handle.c
> @@ -27,7 +27,7 @@ struct handle_data {
>      int handle_bytes;
>  };
> 
> -#if __GLIBC__ <= 2 && __GLIBC_MINOR__ < 14
> +#if __GLIBC__ <= 2 && __GLIBC_MINOR__ < 13
>  struct file_handle {
>          unsigned int handle_bytes;
>          int handle_type;
> -- 

-aneesh

Patch

diff --git a/hw/9pfs/virtio-9p-handle.c b/hw/9pfs/virtio-9p-handle.c
index 5c8b5ed..5b3a867 100644
--- a/hw/9pfs/virtio-9p-handle.c
+++ b/hw/9pfs/virtio-9p-handle.c
@@ -27,7 +27,7 @@  struct handle_data {
     int handle_bytes;
 };
 
-#if __GLIBC__ <= 2 && __GLIBC_MINOR__ < 14
+#if __GLIBC__ <= 2 && __GLIBC_MINOR__ < 13
 struct file_handle {
         unsigned int handle_bytes;
         int handle_type;