cirrus_vga fix save/restore endian incompatibility

CS 97e3066c43477c79b56f4afeb08c330fc2c244b7 on unstable.

diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 69885f51c855b2002a3d275396d76f691b1e223c..ff5076a1c05cf9f3a3c35b75497d6d058283f4f1 100644 (file)
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -3080,12 +3080,12 @@ static void cirrus_vga_save(QEMUFile *f, void *opaque)
 
     vga_acc = (!!s->map_addr);
     qemu_put_8s(f, &vga_acc);
-    qemu_put_be32(f, s->lfb_addr);
     /* XXX old versions saved rubbish here, keeping for compatibility */
     qemu_put_be32(f, 0xffffffff);
-    qemu_put_be32(f, s->lfb_end);
+    qemu_put_be32(f, s->lfb_addr);
     /* XXX old versions saved rubbish here, keeping for compatibility */
     qemu_put_be32(f, 0xffffffff);
+    qemu_put_be32(f, s->lfb_end);
     qemu_put_be64s(f, &s->stolen_vram_addr);
     if (!s->stolen_vram_addr && !vga_acc)
         /* Old guest: VRAM is not mapped, we have to save it ourselves */
@@ -3142,12 +3142,12 @@ static int cirrus_vga_load(QEMUFile *f, void *opaque, int version_id)
     qemu_get_be32s(f, &s->hw_cursor_y);
 
     qemu_get_8s(f, &vga_acc);
-    qemu_get_be32s(f, &s->lfb_addr);
     /* XXX throwing away 32 bits */
     qemu_get_be32(f);
-    qemu_get_be32s(f, &s->lfb_end);
+    qemu_get_be32s(f, &s->lfb_addr);
     /* XXX throwing away 32 bits */
     qemu_get_be32(f);
+    qemu_get_be32s(f, &s->lfb_end);
     video_ram_size = s->lfb_end - s->lfb_addr;
     if (version_id >= 3) {
         qemu_get_be64s(f, &s->stolen_vram_addr);