From 3bf3eb13cb706482575bda9e7385e425d638aa59 Mon Sep 17 00:00:00 2001 From: Lepton Wu Date: Mon, 19 Apr 2021 14:18:58 -0700 Subject: [PATCH] virgl: move new added field to the end. This field was introduced 2 months ago and it breaks virgl compatibility between guest/host. Switch the new added field to the end. We will still have compatibility issue but the "bug window" is much smaller. Fixes: e778aceaae0 ("virgl: update headers") Signed-off-by: Lepton Wu Reviewed-by: Gert Wollny Part-of: (cherry picked from commit 5322572c7825f55e583ccc37a01c4b6f891c9821) --- .pick_status.json | 2 +- src/virtio/virtio-gpu/virgl_hw.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index efa1d6e2592..59651630e04 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -472,7 +472,7 @@ "description": "virgl: move new added field to the end.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "e778aceaae0505e4d3bc322f689338f18d662090" }, diff --git a/src/virtio/virtio-gpu/virgl_hw.h b/src/virtio/virtio-gpu/virgl_hw.h index a368ffa5e45..1286b48a880 100644 --- a/src/virtio/virtio-gpu/virgl_hw.h +++ b/src/virtio/virtio-gpu/virgl_hw.h @@ -593,8 +593,8 @@ struct virgl_caps_v2 { uint32_t host_feature_check_version; struct virgl_supported_format_mask supported_readback_formats; struct virgl_supported_format_mask scanout; - uint32_t max_video_memory; uint32_t capability_bits_v2; + uint32_t max_video_memory; }; union virgl_caps {