qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Alex Williamson <alex.williamson@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>,
	Dave Airlie <airlied@redhat.com>,
	mst@redhat.com
Subject: [Qemu-devel] [PATCH 0/3] Update linux-headers to v4.17-rc3
Date: Tue, 01 May 2018 10:25:30 -0600	[thread overview]
Message-ID: <20180501161509.28517.344.stgit@gimli.home> (raw)

This series is based on Michael's series moving kvm_para.h out to
standard headers, which resolves the conflict in definitions of
KVM_HINTS_DEDICATED between QEMU and kernel.

Additionally, this series moves the definition of
VIRTIO_GPU_CAPSET_VIRGL2 into QEMU code as the definition does not
exist in the upstream header and it seems unreasonable to expect
anyone wanting to update headers should manually resolve this
conflict.

Finally, vmw_pvrdma-abi.h converted to a number of __aligned_u64
entries, which our current script happily converts to an
__aligned_uint64_t, which doesn't exist, while the original
__aligned_u64 does seem to exist.  Add a sed line to undo the
conversion.

I've split these patches from the vfio series requiring the
updates including in v4.17-rc for better review converage, but
the intention would be to include them in the same pull request
as the vfio consumer.

Please let me know if there are any comments or objections to
the approaches taken here, especially cross platform issues with
handling __aligned_u64.  Thanks,

Alex

---

Alex Williamson (3):
      virtio-gpu-3d: Define VIRTIO_GPU_CAPSET_VIRGL2 elsewhere
      scripts/update-linux-headers: Update handling of __aligned_u64
      linux-headers: Update to v4.17-rc3


 include/hw/virtio/virtio-gpu.h                  |    6 
 include/standard-headers/linux/ethtool.h        |   36 ++
 include/standard-headers/linux/input.h          |    4 
 include/standard-headers/linux/pci_regs.h       |    7 
 include/standard-headers/linux/virtio_balloon.h |   19 +
 include/standard-headers/linux/virtio_gpu.h     |    1 
 include/standard-headers/rdma/vmw_pvrdma-abi.h  |   49 ++-
 linux-headers/COPYING                           |  358 +----------------------
 linux-headers/asm-arm/kvm.h                     |   15 +
 linux-headers/asm-arm64/kvm.h                   |    6 
 linux-headers/asm-s390/unistd_32.h              |    1 
 linux-headers/asm-s390/unistd_64.h              |    1 
 linux-headers/asm-x86/kvm.h                     |   19 +
 linux-headers/linux/kvm.h                       |   30 ++
 linux-headers/linux/vfio.h                      |   27 ++
 scripts/update-linux-headers.sh                 |    1 
 16 files changed, 193 insertions(+), 387 deletions(-)

             reply	other threads:[~2018-05-01 16:25 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-01 16:25 Alex Williamson [this message]
2018-05-01 16:25 ` [Qemu-devel] [PATCH 1/3] virtio-gpu-3d: Define VIRTIO_GPU_CAPSET_VIRGL2 elsewhere Alex Williamson
2018-05-01 16:25 ` [Qemu-devel] [PATCH 2/3] scripts/update-linux-headers: Update handling of __aligned_u64 Alex Williamson
2018-05-01 16:26 ` [Qemu-devel] [PATCH 3/3] linux-headers: Update to v4.17-rc3 Alex Williamson
2018-05-01 20:25 ` [Qemu-devel] [PATCH 0/3] Update linux-headers " David Airlie
2018-05-02 17:42   ` Alex Williamson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180501161509.28517.344.stgit@gimli.home \
    --to=alex.williamson@redhat.com \
    --cc=airlied@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).