From patchwork Wed Jan 2 19:56:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Seay X-Patchwork-Id: 209139 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7A4AA2C008D for ; Thu, 3 Jan 2013 06:56:33 +1100 (EST) Received: from localhost ([::1]:37215 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TqUQR-0004VZ-4y for incoming@patchwork.ozlabs.org; Wed, 02 Jan 2013 14:56:31 -0500 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 Received: from mail-ie0-f169.google.com ([209.85.223.169]:42791) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TqUQE-0003fd-HP; Wed, 02 Jan 2013 14:56:18 -0500 Received: by mail-ie0-f169.google.com with SMTP id c14so17293284ieb.14 for ; Wed, 02 Jan 2013 11:56:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=GsUBo4JRxNWxsB8niYYygjnaPc7etngYF5fLcCqNoys=; b=X+gKg6gkDfxrFcTcmnYgrkULmI0auC4lQ55lq7nNiExJCXykasWbARThRZu6j5DsmL 9bm5OY+shTLNqa0ZIT+A3CIafgFEA/ewW9pgVYRqYFzguyyLQr/zTaxKPDRcbNW3G/oF 1bScGANGeivW/AN7C9fIAvHLfykRhSO1UBaly7qzarSRIiNQKXuIKCPrd7lwMd6j5llV z9Oo1bNhtCIzw2SRW4blBsguBcqesvTYZHX6HEHB9KNZh9kP82fZOzzSg1EEhr/WY9Cv LuLNjLI8MDGvNakoJ6w2WXurKK+1h3kR7R/2Tr/n3E7yB33HS82+f6MTJfTF8zIjWebH qdDw== X-Received: by 10.50.149.131 with SMTP id ua3mr41354539igb.5.1357156577869; Wed, 02 Jan 2013 11:56:17 -0800 (PST) Received: from localhost.localdomain ([71.46.230.154]) by mx.google.com with ESMTPS id gs6sm39139006igc.11.2013.01.02.11.56.16 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 02 Jan 2013 11:56:17 -0800 (PST) From: Samuel Seay To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Date: Wed, 2 Jan 2013 11:56:06 -0800 Message-Id: <1357156566-38368-1-git-send-email-LightningTH@GMail.com> X-Mailer: git-send-email 1.7.9.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.223.169 Cc: Samuel Seay Subject: [Qemu-devel] [PATCH v2] Modifications to fix PowerPC on 64bit host, bug #1052857 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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;