From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33250) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rjqav-0003h6-G7 for qemu-devel@nongnu.org; Sun, 08 Jan 2012 06:07:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rjqau-0004pM-JZ for qemu-devel@nongnu.org; Sun, 08 Jan 2012 06:07:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:9313) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rjqau-0004pA-AA for qemu-devel@nongnu.org; Sun, 08 Jan 2012 06:07:20 -0500 Message-ID: <4F0978E4.5080004@redhat.com> Date: Sun, 08 Jan 2012 13:07:16 +0200 From: Avi Kivity MIME-Version: 1.0 References: <1325934826-23870-1-git-send-email-sw@weilnetz.de> In-Reply-To: <1325934826-23870-1-git-send-email-sw@weilnetz.de> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] memory: Fix assertion for flash devices List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Weil Cc: qemu-devel@nongnu.org On 01/07/2012 01:13 PM, Stefan Weil wrote: > There is a regression since commit c5705a7728b4a6bc9e4f2d35911adbaf28042b25 > or some other recent change. > > System emulation with a flash device raises an assertion in function > qemu_ram_set_idstr because no new_block is found at the requested addr. > > The address of the memory region (mr->ram_addr) is set by > memory_region_init_rom_device: > > mr->ram_addr = qemu_ram_alloc(size, mr); > mr->ram_addr |= cpu_register_io_memory(mr); > > The 2nd line adds a small offset to mr->ram_addr, and this offset > makes ram_set_idstr fail with an assertion. > > Masking mr->ram_addr with the target's page mask removes the small > offset and makes flash devices work again. > > > diff --git a/memory.c b/memory.c > index 394cbab..1b2f9e8 100644 > --- a/memory.c > +++ b/memory.c > @@ -1386,7 +1386,7 @@ void memory_region_set_alias_offset(MemoryRegion *mr, target_phys_addr_t offset) > > ram_addr_t memory_region_get_ram_addr(MemoryRegion *mr) > { > - return mr->ram_addr; > + return mr->ram_addr & TARGET_PAGE_MASK; > } > This makes get_ram_addr() lie about the return value - it's no longer the ram_addr. Doesn't matter much since it's temporary, but I patched vmstate_register_ram() instead. -- error compiling committee.c: too many arguments to function