From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:33240)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jljusten@gmail.com>) id 1Rjl53-00005B-NH
	for qemu-devel@nongnu.org; Sun, 08 Jan 2012 00:14:06 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jljusten@gmail.com>) id 1Rjl52-0004et-Kn
	for qemu-devel@nongnu.org; Sun, 08 Jan 2012 00:14:05 -0500
Received: from mail-gy0-f173.google.com ([209.85.160.173]:56190)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jljusten@gmail.com>) id 1Rjl52-0004ek-HE
	for qemu-devel@nongnu.org; Sun, 08 Jan 2012 00:14:04 -0500
Received: by ghbg16 with SMTP id g16so1389237ghb.4
	for <qemu-devel@nongnu.org>; Sat, 07 Jan 2012 21:14:03 -0800 (PST)
MIME-Version: 1.0
In-Reply-To: <1324389914-12246-3-git-send-email-avi@redhat.com>
References: <1324389914-12246-1-git-send-email-avi@redhat.com>
	<1324389914-12246-3-git-send-email-avi@redhat.com>
Date: Sat, 7 Jan 2012 21:14:03 -0800
Message-ID: <CAFe8ug9EvDZkTLrCpQDYsi2rTHXEPRGKyCWc+jpHq3o4r2njVQ@mail.gmail.com>
From: Jordan Justen <jljusten@gmail.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH 2/2] vmstate,
 memory: decouple vmstate from memory API
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Avi Kivity <avi@redhat.com>
Cc: qemu-devel@nongnu.org, quintela@redhat.com

On Tue, Dec 20, 2011 at 06:05, Avi Kivity <avi@redhat.com> wrote:
> +void qemu_ram_set_idstr(ram_addr_t addr, const char *name, DeviceState *=
dev)
> =A0{
> =A0 =A0 RAMBlock *new_block, *block;
>
> - =A0 =A0size =3D TARGET_PAGE_ALIGN(size);
> - =A0 =A0new_block =3D g_malloc0(sizeof(*new_block));
> + =A0 =A0new_block =3D NULL;
> + =A0 =A0QLIST_FOREACH(block, &ram_list.blocks, next) {
> + =A0 =A0 =A0 =A0if (block->offset =3D=3D addr) {
> + =A0 =A0 =A0 =A0 =A0 =A0new_block =3D block;
> + =A0 =A0 =A0 =A0 =A0 =A0break;
> + =A0 =A0 =A0 =A0}
> + =A0 =A0}
> + =A0 =A0assert(new_block);
> + =A0 =A0assert(!new_block->idstr[0]);

Avi,

When using pflash_cfi01, I hit the assert(new_block) added above.  It
seemed to be caused by the low bits of addr being 0x7.  This seems to
be come from cpu_register_io_memory in memory_region_init_rom_device.

Would this patch be an appropriate fix for this?

diff --git a/exec.c b/exec.c
index b1d6602..b3ebc91 100644
--- a/exec.c
+++ b/exec.c
@@ -2777,7 +2777,7 @@ void qemu_ram_set_idstr(ram_addr_t addr, const char *=
name,

     new_block =3D NULL;
     QLIST_FOREACH(block, &ram_list.blocks, next) {
-        if (block->offset =3D=3D addr) {
+        if (block->offset =3D=3D (addr & TARGET_PAGE_MASK)) {
             new_block =3D block;
             break;
         }

-Jordan