Re: [Qemu-devel] [PATCH 1/2] update Linux headers to 4.2

[Cornelia Huck]

On Wed,  9 Sep 2015 15:25:51 +0200
Paolo Bonzini <address@hidden> wrote:

> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
>  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