From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LbafK-0001qQ-EQ
	for qemu-devel@nongnu.org; Mon, 23 Feb 2009 08:16:10 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LbafJ-0001qC-Mc
	for qemu-devel@nongnu.org; Mon, 23 Feb 2009 08:16:09 -0500
Received: from [199.232.76.173] (port=40809 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LbafJ-0001q9-FH
	for qemu-devel@nongnu.org; Mon, 23 Feb 2009 08:16:09 -0500
Received: from savannah.gnu.org ([199.232.41.3]:39550 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LbafI-0005uV-T7
	for qemu-devel@nongnu.org; Mon, 23 Feb 2009 08:16:09 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LbafI-0006lE-8Y
	for qemu-devel@nongnu.org; Mon, 23 Feb 2009 13:16:08 +0000
Received: from pbrook by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <pbrook@savannah.gnu.org>) id 1LbafH-0006lA-SU
	for qemu-devel@nongnu.org; Mon, 23 Feb 2009 13:16:08 +0000
MIME-Version: 1.0
Errors-To: pbrook
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Paul Brook <paul@nowt.org>
Message-Id: <E1LbafH-0006lA-SU@cvs.savannah.gnu.org>
Date: Mon, 23 Feb 2009 13:16:07 +0000
Subject: [Qemu-devel] [6639] Fix unassigned region offsets.
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6639
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6639
Author:   pbrook
Date:     2009-02-23 13:16:07 +0000 (Mon, 23 Feb 2009)

Log Message:
-----------
Fix unassigned region offsets.

Modified Paths:
--------------
    trunk/exec.c

Modified: trunk/exec.c
===================================================================
--- trunk/exec.c	2009-02-22 11:59:59 UTC (rev 6638)
+++ trunk/exec.c	2009-02-23 13:16:07 UTC (rev 6639)
@@ -368,8 +368,10 @@
             return NULL;
         pd = qemu_vmalloc(sizeof(PhysPageDesc) * L2_SIZE);
         *lp = pd;
-        for (i = 0; i < L2_SIZE; i++)
+        for (i = 0; i < L2_SIZE; i++) {
           pd[i].phys_offset = IO_MEM_UNASSIGNED;
+          pd[i].region_offset = (index + i) << TARGET_PAGE_BITS;
+        }
     }
     return ((PhysPageDesc *)pd) + (index & (L2_SIZE - 1));
 }
@@ -2280,6 +2282,9 @@
     if (kvm_enabled())
         kvm_set_phys_mem(start_addr, size, phys_offset);
 
+    if (phys_offset == IO_MEM_UNASSIGNED) {
+        region_offset = start_addr;
+    }
     region_offset &= TARGET_PAGE_MASK;
     size = (size + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK;
     end_addr = start_addr + (target_phys_addr_t)size;
@@ -2327,7 +2332,7 @@
                 if (need_subpage || phys_offset & IO_MEM_SUBWIDTH) {
                     subpage = subpage_init((addr & TARGET_PAGE_MASK),
                                            &p->phys_offset, IO_MEM_UNASSIGNED,
-                                           0);
+                                           addr & TARGET_PAGE_MASK);
                     subpage_register(subpage, start_addr2, end_addr2,
                                      phys_offset, region_offset);
                     p->region_offset = 0;