From a5b30b2eea40719a9b3c578dc12f4834643fb499 Mon Sep 17 00:00:00 2001
From: Alistair Delva <adelva@google.com>
Date: Fri, 25 Sep 2020 15:29:56 -0700
Subject: [PATCH] devices: gpu: fix 64/32 compat issue with blob

Bug: b/169430664

Cq-Depend: chromium:2437134
Change-Id: I4b9fa7fe3f985abe803878a4b974e33214ff5fcb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2436998
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Alistair Delva <adelva@google.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org>
---
 devices/src/virtio/gpu/protocol.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devices/src/virtio/gpu/protocol.rs b/devices/src/virtio/gpu/protocol.rs
index 6e95ab7459..d89e56634e 100644
--- a/devices/src/virtio/gpu/protocol.rs
+++ b/devices/src/virtio/gpu/protocol.rs
@@ -509,9 +509,9 @@ pub struct virtio_gpu_resource_create_blob {
     pub resource_id: Le32,
     pub blob_mem: Le32,
     pub blob_flags: Le32,
+    pub nr_entries: Le32,
     pub blob_id: Le64,
     pub size: Le64,
-    pub nr_entries: Le32,
 }
 
 unsafe impl DataInit for virtio_gpu_resource_create_blob {}