From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 27 Nov 2008 11:31:06 +0000 (+0000)
Subject: cirrus_vga fix save/restore endian incompatibility
X-Git-Tag: xen-3.3.1-rc1~1
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e8ad63359a887e419e92b82f52c67860a749c046;p=qemu-xen-3.3-testing.git

cirrus_vga fix save/restore endian incompatibility

This patch fixes the cirrus_vga save/restore functions to keep
compatibility with older ioemu statefiles.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
(cherry picked from commit 97e3066c43477c79b56f4afeb08c330fc2c244b7)

Conflicts:
        hw/cirrus_vga.c
---

diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index fb437769..eae8f2df 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -3245,8 +3245,12 @@ static void cirrus_vga_save(QEMUFile *f, void *opaque)
 
     vga_acc = (!!s->map_addr);
     qemu_put_8s(f, &vga_acc);
-    qemu_put_be64s(f, (uint64_t*)&s->lfb_addr);
-    qemu_put_be64s(f, (uint64_t*)&s->lfb_end);
+    /* XXX old versions saved rubbish here, keeping for compatibility */
+    qemu_put_be32(f, 0xffffffff);
+    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_buffer(f, s->vram_ptr, VGA_RAM_SIZE);
 }
 
@@ -3300,8 +3304,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_be64s(f, (uint64_t*)&s->lfb_addr);
-    qemu_get_be64s(f, (uint64_t*)&s->lfb_end);
+    /* XXX throwing away 32 bits */
+    qemu_get_be32(f);
+    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_buffer(f, s->vram_ptr, VGA_RAM_SIZE);
     if (vga_acc){
         cirrus_restart_acc(s);