From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39467) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZgHb-0004pJ-3C for qemu-devel@nongnu.org; Wed, 09 Sep 2015 10:23:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZZgHV-0005lA-IC for qemu-devel@nongnu.org; Wed, 09 Sep 2015 10:23:31 -0400 Received: from e06smtp07.uk.ibm.com ([195.75.94.103]:43188) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZgHV-0005dP-9w for qemu-devel@nongnu.org; Wed, 09 Sep 2015 10:23:25 -0400 Received: from /spool/local by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 9 Sep 2015 15:23:14 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id F25CE17D8056 for ; Wed, 9 Sep 2015 15:24:56 +0100 (BST) Received: from d06av11.portsmouth.uk.ibm.com (d06av11.portsmouth.uk.ibm.com [9.149.37.252]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t89ENBQX40108244 for ; Wed, 9 Sep 2015 14:23:11 GMT Received: from d06av11.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av11.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t89ENB7Z009177 for ; Wed, 9 Sep 2015 08:23:11 -0600 Date: Wed, 9 Sep 2015 16:23:09 +0200 From: Cornelia Huck Message-ID: <20150909162309.6ec951f0.cornelia.huck@de.ibm.com> In-Reply-To: <1441805152-18988-2-git-send-email-pbonzini@redhat.com> References: <1441805152-18988-1-git-send-email-pbonzini@redhat.com> <1441805152-18988-2-git-send-email-pbonzini@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1/2] update Linux headers to 4.2 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: den@openvz.org, qemu-devel@nongnu.org On Wed, 9 Sep 2015 15:25:51 +0200 Paolo Bonzini wrote: > Signed-off-by: Paolo Bonzini > --- > hw/pci/pcie_aer.c | 4 +- > include/standard-headers/linux/pci_regs.h | 381 ++++++++++++++++++++------- > include/standard-headers/linux/virtio_ring.h | 3 +- > linux-headers/asm-x86/hyperv.h | 2 + > linux-headers/asm-x86/kvm.h | 4 +- > linux-headers/linux/kvm.h | 1 - > scripts/update-linux-headers.sh | 1 + > 7 files changed, 294 insertions(+), 102 deletions(-) > diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h > index b974c85..3bac873 100644 > --- a/linux-headers/linux/kvm.h > +++ b/linux-headers/linux/kvm.h > @@ -317,7 +317,6 @@ struct kvm_run { > struct { > #define KVM_SYSTEM_EVENT_SHUTDOWN 1 > #define KVM_SYSTEM_EVENT_RESET 2 > -#define KVM_SYSTEM_EVENT_CRASH 3 I wonder where this hunk comes from? I don't see it when I run (your modified) update-linux-headers.sh against qemu master + Linux 4.2? > __u32 type; > __u64 flags; > } system_event; > diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh > index f0e830c..7f7b592 100755 > --- a/scripts/update-linux-headers.sh > +++ b/scripts/update-linux-headers.sh > @@ -39,6 +39,7 @@ cp_virtio() { > if > grep '#include' "$f" | grep -v -e 'linux/virtio' \ > -e 'linux/types' \ > + -e 'stdint' \ > -e 'linux/if_ether' \ > -e 'sys/' \ > > /dev/null