[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/6] virtio-gpu-3d: Define VIRTIO_GPU_CAPSET_VIRGL2
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 1/6] virtio-gpu-3d: Define VIRTIO_GPU_CAPSET_VIRGL2 elsewhere |
Date: |
Fri, 25 May 2018 14:27:50 +0100 |
From: Alex Williamson <address@hidden>
Commit 5643cc94ac1c ("virtio-gpu-3d: add support for second capability
set (v4)") updated virtio_gpu.h with a define that does not yet(?)
exist upstream resulting in build breakage every time Linux headers
are updated via the standard update script. Conditionally define this
within QEMU code instead to avoid future breakage.
Cc: Dave Airlie <address@hidden>
Cc: Gerd Hoffmann <address@hidden>
Fixes: 5643cc94ac1c ("virtio-gpu-3d: add support for second capability set
(v4)")
Signed-off-by: Alex Williamson <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
include/hw/virtio/virtio-gpu.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
index 79bb3fb3dd..d6ba61f2f1 100644
--- a/include/hw/virtio/virtio-gpu.h
+++ b/include/hw/virtio/virtio-gpu.h
@@ -21,6 +21,12 @@
#include "qemu/log.h"
#include "standard-headers/linux/virtio_gpu.h"
+
+/* Not yet(?) defined in standard-headers, remove when possible */
+#ifndef VIRTIO_GPU_CAPSET_VIRGL2
+#define VIRTIO_GPU_CAPSET_VIRGL2 2
+#endif
+
#define TYPE_VIRTIO_GPU "virtio-gpu-device"
#define VIRTIO_GPU(obj) \
OBJECT_CHECK(VirtIOGPU, (obj), TYPE_VIRTIO_GPU)
--
2.17.0
- [Qemu-devel] [PATCH 0/6] Update Linux headers to 4.17-rc6, Peter Maydell, 2018/05/25
- [Qemu-devel] [PATCH 2/6] scripts/update-linux-headers: Handle __aligned_u64, Peter Maydell, 2018/05/25
- [Qemu-devel] [PATCH 4/6] target/i386/kvm.c: Handle renaming of KVM_HINTS_DEDICATED, Peter Maydell, 2018/05/25
- [Qemu-devel] [PATCH 3/6] scripts/update-linux-headers: Handle kernel license no longer being one file, Peter Maydell, 2018/05/25
- [Qemu-devel] [PATCH 6/6] target/i386/kvm.c: Remove compatibility shim for KVM_HINTS_REALTIME, Peter Maydell, 2018/05/25
- [Qemu-devel] [PATCH 1/6] virtio-gpu-3d: Define VIRTIO_GPU_CAPSET_VIRGL2 elsewhere,
Peter Maydell <=
- [Qemu-devel] [PATCH 5/6] Update Linux headers to 4.17-rc6, Peter Maydell, 2018/05/25
- Re: [Qemu-devel] [PATCH 0/6] Update Linux headers to 4.17-rc6, Michael S. Tsirkin, 2018/05/25
- Re: [Qemu-devel] [PATCH 0/6] Update Linux headers to 4.17-rc6, no-reply, 2018/05/26