From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59680) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TqUQH-0004Uc-83 for qemu-devel@nongnu.org; Wed, 02 Jan 2013 14:56:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TqUQE-0003fu-Lv for qemu-devel@nongnu.org; Wed, 02 Jan 2013 14:56:21 -0500 From: Samuel Seay Date: Wed, 2 Jan 2013 11:56:06 -0800 Message-Id: <1357156566-38368-1-git-send-email-LightningTH@GMail.com> Subject: [Qemu-devel] [PATCH v2] Modifications to fix PowerPC on 64bit host, bug #1052857 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: Samuel Seay Removed h2g() macro around the ka->_sa_handler due to _sa_handler being a guest value Changed the __put_user macro as it was attempting to put a value to a guest memory location without converting to the guest area Signed-off-by: Samuel Seay --- linux-user/signal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index 95e2ffa..d0d24fc 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -4584,7 +4584,7 @@ static void setup_frame(int sig, struct target_sigaction *ka, signal = current_exec_domain_sig(sig); - err |= __put_user(h2g(ka->_sa_handler), &sc->handler); + err |= __put_user(ka->_sa_handler, &sc->handler); err |= __put_user(set->sig[0], &sc->oldmask); #if defined(TARGET_PPC64) err |= __put_user(set->sig[0] >> 32, &sc->_unused[3]); @@ -4606,7 +4606,7 @@ static void setup_frame(int sig, struct target_sigaction *ka, /* Create a stack frame for the caller of the handler. */ newsp = frame_addr - SIGNAL_FRAMESIZE; - err |= __put_user(env->gpr[1], (target_ulong *)(uintptr_t) newsp); + err |= put_user(env->gpr[1], (target_ulong)(uintptr_t) newsp, target_ulong); if (err) goto sigsegv; -- 1.7.9.5