[Qemu-devel] [PATCH v3 0/2] update-linux-headers changes

[Paolo Bonzini]

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
-- 
2.4.3