| Message ID | 20180501161509.28517.344.stgit@gimli.home |
|---|---|
| Headers | show |
| Series | Update linux-headers to v4.17-rc3 | expand |
On Wed, May 2, 2018 at 2:25 AM, Alex Williamson <alex.williamson@redhat.com> wrote: > 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. > I thought the headers went qemu->linux which is why I never pushed this to Linux. Happy to have a patch in the kernel that adds this. Dave.
On Wed, 2 May 2018 06:25:16 +1000 David Airlie <airlied@redhat.com> wrote: > On Wed, May 2, 2018 at 2:25 AM, Alex Williamson <alex.williamson@redhat.com> > wrote: > > > 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. > > > > I thought the headers went qemu->linux which is why I never pushed this to > Linux. > > Happy to have a patch in the kernel that adds this. Yea, it's the other direction, the file in QEMU is updated from the uapi header in the kernel. I'd submit a kernel patch, but I have no idea what VIRTIO_GPU_CAPSET_VIRGL2 signifies, so it's probably best that it be submitted by someone who can write a meaningful commitlog. Thanks, Alex
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(-)