From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49818) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaNNG-0002At-PA for qemu-devel@nongnu.org; Fri, 11 Sep 2015 08:24:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZaNND-0001MD-Jj for qemu-devel@nongnu.org; Fri, 11 Sep 2015 08:24:14 -0400 Received: from mx2.parallels.com ([199.115.105.18]:55159) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaNND-0001Ln-Df for qemu-devel@nongnu.org; Fri, 11 Sep 2015 08:24:11 -0400 References: <1441877978-31156-1-git-send-email-pbonzini@redhat.com> From: "Denis V. Lunev" Message-ID: <55F2C1DB.7070606@parallels.com> Date: Fri, 11 Sep 2015 14:58:19 +0300 MIME-Version: 1.0 In-Reply-To: <1441877978-31156-1-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 0/2] update-linux-headers changes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , qemu-devel@nongnu.org Cc: cornelia.huck@de.ibm.com, mst@redhat.com On 09/10/2015 12:39 PM, Paolo Bonzini wrote: > Patches 1 and 2 updates the Linux headers, which required an unexpected change > to hw/pci/pcie_aer.c. > > Patches 3 and 4 modify the update-linux-headers script so that asm-x86/hyperv.h > can be moved to standard-headers. This is required by the Hyper-V crash > MSR patches, which use a Hyper-V define in cpu.h. > > Please Ack so that I can include it together with the Hyper-V crash MSR > patches. > > Paolo > > v1->v2: Drop unwanted hunk from patch 1 [Cornelia] > Suggested cleanups to patch 2 [Cornelia] > > v2->v3: Separate the hyperv.h and cp_portable changes [mst] > Drop TRAIN entry from list of AER errors [mst] > Drop empty line [mst] > > v2->v3 diff comes below. > > Paolo Bonzini (4): > pci: remove Link Training error from AER error list > update Linux headers to 4.2 > update-linux-headers: copy standard-headers files one by one > target-i386: move asm-x86/hyperv.h to standard-headers > > hw/pci/pcie_aer.c | 4 - > .../standard-headers}/asm-x86/hyperv.h | 12 +- > include/standard-headers/linux/pci_regs.h | 381 +++++++++++++++------ > include/standard-headers/linux/virtio_ring.h | 3 +- > linux-headers/asm-x86/hyperv.h | 251 +------------- > linux-headers/asm-x86/kvm.h | 4 +- > scripts/update-linux-headers.sh | 77 +++-- > target-i386/kvm.c | 2 +- > 8 files changed, 340 insertions(+), 394 deletions(-) > copy {linux-headers => include/standard-headers}/asm-x86/hyperv.h (97%) > > diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c > index 8e4bd56..46e0ad8 100644 > --- a/hw/pci/pcie_aer.c > +++ b/hw/pci/pcie_aer.c > @@ -827,10 +827,6 @@ typedef struct PCIEAERErrorName { > */ > static const struct PCIEAERErrorName pcie_aer_error_list[] = { > { > - .name = "UND", > - .val = PCI_ERR_UNC_UND, > - .correctable = false, > - }, { > .name = "DLP", > .val = PCI_ERR_UNC_DLP, > .correctable = false, > diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh > index 2f25e84..11076191 100755 > --- a/scripts/update-linux-headers.sh > +++ b/scripts/update-linux-headers.sh > @@ -61,7 +61,6 @@ cp_portable() { > ARCHLIST=$(cd "$linux/arch" && echo *) > > for arch in $ARCHLIST; do > - > # Discard anything which isn't a KVM-supporting architecture > if ! [ -e "$linux/arch/$arch/include/asm/kvm.h" ] && > ! [ -e "$linux/arch/$arch/include/uapi/asm/kvm.h" ] ; then Reviewed-by: Denis V. Lunev