From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:42682) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RjsM6-0002ne-SM for qemu-devel@nongnu.org; Sun, 08 Jan 2012 08:00:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RjsM4-0003sH-9r for qemu-devel@nongnu.org; Sun, 08 Jan 2012 08:00:10 -0500 Received: from v220110690675601.yourvserver.net ([78.47.199.172]:53763) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RjsM3-0003qG-P8 for qemu-devel@nongnu.org; Sun, 08 Jan 2012 08:00:07 -0500 Message-ID: <4F099354.9010204@weilnetz.de> Date: Sun, 08 Jan 2012 14:00:04 +0100 From: Stefan Weil MIME-Version: 1.0 References: <1326025876-13241-1-git-send-email-avi@redhat.com> In-Reply-To: <1326025876-13241-1-git-send-email-avi@redhat.com> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] Fix vmstate_register_ram() for rom/device regions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity Cc: qemu-devel@nongnu.org, Aurelien Jarno Am 08.01.2012 13:31, schrieb Avi Kivity: > 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() > excepts just > a RAM region. Mask the I/O handler to make it happy. > > Signed-off-by: Avi Kivity > --- > savevm.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/savevm.c b/savevm.c > index 88c4bd8..80be1ff 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); > } > This patch fixes the assertion with flash memory (for example Mips Malta). Tested-by: Stefan Weil