From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:37832) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDD96-0004OL-TH for qemu-devel@nongnu.org; Mon, 10 Oct 2011 06:31:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RDD95-0005tS-Gu for qemu-devel@nongnu.org; Mon, 10 Oct 2011 06:31:44 -0400 Received: from e5.ny.us.ibm.com ([32.97.182.145]:60989) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDD95-0005sb-52 for qemu-devel@nongnu.org; Mon, 10 Oct 2011 06:31:43 -0400 Received: from /spool/local by e5.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 10 Oct 2011 06:31:33 -0400 Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p9AAVJl2237242 for ; Mon, 10 Oct 2011 06:31:19 -0400 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p9AAVIKH019748 for ; Mon, 10 Oct 2011 04:31:18 -0600 From: Zhi Yong Wu Date: Mon, 10 Oct 2011 18:30:28 +0800 Message-Id: <1318242628-18729-1-git-send-email-wuzhy@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH] virtio-9p: fix QEMU build break List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: stefanha@linux.vnet.ibm.com, kvm@vger.kernel.org, jvrao@us.ibm.com, zwu.kernel@gmail.com, Zhi Yong Wu , aneesh.kumar@linux.vnet.ibm.com 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 --- 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; -- 1.7.6