From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1J50JA-00018d-QL
	for qemu-devel@nongnu.org; Wed, 19 Dec 2007 09:54:04 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1J50J9-00017B-Aj
	for qemu-devel@nongnu.org; Wed, 19 Dec 2007 09:54:04 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1J50J8-00016u-Tb
	for qemu-devel@nongnu.org; Wed, 19 Dec 2007 09:54:02 -0500
Received: from owa.c2.net ([207.235.78.2] helo=email.c2.net)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <thayne@c2.net>) id 1J50J8-000734-Ee
	for qemu-devel@nongnu.org; Wed, 19 Dec 2007 09:54:02 -0500
From: Thayne Harbaugh <thayne@c2.net>
Content-Type: multipart/mixed; boundary="=-VEl4r4MiEowkoLSS2zs3"
Date: Wed, 19 Dec 2007 07:45:02 -0700
Message-Id: <1198075502.17701.2.camel@phantasm.home.enterpriseandprosperity.com>
Mime-Version: 1.0
Subject: [Qemu-devel] [BUG][PATCH] DEBUG_REMAP
Reply-To: thayne@c2.net, 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


--=-VEl4r4MiEowkoLSS2zs3
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

This fixes a compile error for a variable that wasn't changed (it was
previously renamed to make the variable more descriptive).  It also adds
"#include <stdlib>" for prototypes of malloc() and free().

--=-VEl4r4MiEowkoLSS2zs3
Content-Disposition: attachment; filename=12_debug_remap.patch
Content-Type: text/x-patch; name=12_debug_remap.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: qemu/linux-user/qemu.h
===================================================================
--- qemu.orig/linux-user/qemu.h	2007-12-18 09:11:41.000000000 -0700
+++ qemu/linux-user/qemu.h	2007-12-18 09:26:26.000000000 -0700
@@ -7,6 +7,11 @@
 
 #include "cpu.h"
 
+#undef DEBUG_REMAP
+#ifdef DEBUG_REMAP
+#include <stdlib.h>
+#endif /* DEBUG_REMAP */
+
 #ifdef TARGET_ABI32
 typedef uint32_t abi_ulong;
 typedef int32_t abi_long;
@@ -374,7 +379,7 @@
     if (host_ptr == g2h(guest_addr))
         return;
     if (len > 0)
-        memcpy(g2h(guest_ptr), host_ptr, len);
+        memcpy(g2h(guest_addr), host_ptr, len);
     free(host_ptr);
 #endif
 }

--=-VEl4r4MiEowkoLSS2zs3--