From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Aneesh Kumar K.V" Subject: Re: [PATCH] virtio-9p: fix QEMU build break Date: Mon, 10 Oct 2011 22:05:21 +0530 Message-ID: <87r52kn6t2.fsf@linux.vnet.ibm.com> References: <1318242628-18729-1-git-send-email-wuzhy@linux.vnet.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: kvm@vger.kernel.org, stefanha@linux.vnet.ibm.com, jvrao@us.ibm.com, zwu.kernel@gmail.com, Zhi Yong Wu To: Zhi Yong Wu , qemu-devel@nongnu.org Return-path: Received: from e9.ny.us.ibm.com ([32.97.182.139]:59959 "EHLO e9.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752742Ab1JJQgX (ORCPT ); Mon, 10 Oct 2011 12:36:23 -0400 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by e9.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p9AG0LD4016512 for ; Mon, 10 Oct 2011 12:00:21 -0400 Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p9AGaLSZ254132 for ; Mon, 10 Oct 2011 12:36:21 -0400 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p9AGaJrd014174 for ; Mon, 10 Oct 2011 13:36:21 -0300 In-Reply-To: <1318242628-18729-1-git-send-email-wuzhy@linux.vnet.ibm.com> Sender: kvm-owner@vger.kernel.org List-ID: On Mon, 10 Oct 2011 18:30:28 +0800, Zhi Yong Wu 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 > --- > 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