From: Avi Kivity <avi@redhat.com>
Date: Sun, 8 Jan 2012 11:18:19 +0000 (+0200)
Subject: Fix vmstate_register_ram() for rom/device regions
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1ddde08780f6862a98505f9fb9ea10305638783f;p=qemu.git

Fix vmstate_register_ram() for rom/device regions

rom/device regions have a ram_addr that is composed of both an I/O handler
(low bits) and RAM region (high bits); but qemu_ram_set_idstr() expects just
a RAM region.  Mask the I/O handler to make it happy.

Tested-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Avi Kivity <avi@redhat.com>
---

diff --git a/savevm.c b/savevm.c
index 88c4bd8ea2..80be1ff063 100644
--- a/savevm.c
+++ b/savevm.c
@@ -2284,7 +2284,7 @@ void do_info_snapshots(Monitor *mon)
 
 void vmstate_register_ram(MemoryRegion *mr, DeviceState *dev)
 {
-    qemu_ram_set_idstr(memory_region_get_ram_addr(mr),
+    qemu_ram_set_idstr(memory_region_get_ram_addr(mr) & TARGET_PAGE_MASK,
                        memory_region_name(mr), dev);
 }