From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LsXEW-0004MK-Cs
	for qemu-devel@nongnu.org; Sat, 11 Apr 2009 03:02:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LsXEU-0004Lz-O0
	for qemu-devel@nongnu.org; Sat, 11 Apr 2009 03:02:31 -0400
Received: from [199.232.76.173] (port=57734 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LsXEU-0004Lw-Iy
	for qemu-devel@nongnu.org; Sat, 11 Apr 2009 03:02:30 -0400
Received: from savannah.gnu.org ([199.232.41.3]:47814 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 <aurelien@aurel32.net>)
	id 1LsXET-0001iY-PM
	for qemu-devel@nongnu.org; Sat, 11 Apr 2009 03:02:29 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <aurelien@aurel32.net>) id 1LsXEQ-000697-Po
	for qemu-devel@nongnu.org; Sat, 11 Apr 2009 07:02:26 +0000
Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <aurel32@savannah.gnu.org>) id 1LsXEQ-00068t-DR
	for qemu-devel@nongnu.org; Sat, 11 Apr 2009 07:02:26 +0000
MIME-Version: 1.0
Errors-To: aurel32
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Aurelien Jarno <aurelien@aurel32.net>
Message-Id: <E1LsXEQ-00068t-DR@cvs.savannah.gnu.org>
Date: Sat, 11 Apr 2009 07:02:26 +0000
Subject: [Qemu-devel] [7079] mips malta: fix commit 7064
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: 7079
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7079
Author:   aurel32
Date:     2009-04-11 07:02:25 +0000 (Sat, 11 Apr 2009)
Log Message:
-----------
mips malta: fix commit 7064

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

Modified Paths:
--------------
    trunk/hw/mips_malta.c

Modified: trunk/hw/mips_malta.c
===================================================================
--- trunk/hw/mips_malta.c	2009-04-10 21:56:32 UTC (rev 7078)
+++ trunk/hw/mips_malta.c	2009-04-11 07:02:25 UTC (rev 7079)
@@ -679,13 +679,13 @@
     }
 
     table_addr = ENVP_ADDR + sizeof(int32_t) * ENVP_NB_ENTRIES
-                 + index * ENVP_ENTRY_SIZE + VIRT_TO_PHYS_ADDEND;
-    stl_raw(p, table_addr);
+                 + index * ENVP_ENTRY_SIZE;
+    stl_phys(p, table_addr);
 
     va_start(ap, string);
     vsnprintf(buf, ENVP_ENTRY_SIZE, string, ap);
     va_end(ap);
-    pstrcpy_targphys(table_addr, ENVP_ENTRY_SIZE, buf);
+    pstrcpy_targphys(table_addr + VIRT_TO_PHYS_ADDEND, ENVP_ENTRY_SIZE, buf);
 }
 
 /* Kernel */