From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49629) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLtW6-00018a-4O for qemu-devel@nongnu.org; Thu, 12 Feb 2015 08:09:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLtVy-0002dU-Fu for qemu-devel@nongnu.org; Thu, 12 Feb 2015 08:09:14 -0500 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:37000) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLtVy-0002aS-5t for qemu-devel@nongnu.org; Thu, 12 Feb 2015 08:09:06 -0500 Received: from /spool/local by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 12 Feb 2015 13:09:02 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 520FB2190056 for ; Thu, 12 Feb 2015 13:08:56 +0000 (GMT) Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t1CD914356819922 for ; Thu, 12 Feb 2015 13:09:01 GMT Received: from d06av04.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t1CD90Vi004827 for ; Thu, 12 Feb 2015 06:09:00 -0700 From: Jens Freimann Date: Thu, 12 Feb 2015 14:08:51 +0100 Message-Id: <1423746533-45739-1-git-send-email-jfrei@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH/RFC 0/2] update-linux-headers.sh and virtio List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" , Paolo Bonzini Cc: Jens Freimann , qemu-devel@nongnu.org Hi, currently when sync'ing linux-headers against kvm/next, qemu/master won't build because of two problems: 1. virtio_types.h needs to be copied to QEMU linux-headers, as it is now included by virtio_ring.h Patch 2 adds virtio_types.h two update-linux-headers.sh. 2. VIRTIO_TRANSPORT_F_END has changed in the kernel. We have this define twice in QEMU, once in include/hw/virtio/virtio.h and then in linux-headers/linux/virtio_config.h It changed in the kernel and now we have two different values after a header sync. Can we get rid of the duplicate define for VIRTIO_TRANSPORT_F_START/_END in QEMU? We still have it in the kernel headers. Jens Freimann (2): update-linux-headers.sh: also grap virtio_types.h virtio: remove QEMU definition of VIRTIO_TRANSPORT_F_START/_END include/hw/virtio/virtio.h | 5 ----- scripts/update-linux-headers.sh | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) -- 2.1.4