From patchwork Fri Aug 28 09:09:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 511821 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5E3A414018C for ; Fri, 28 Aug 2015 19:10:10 +1000 (AEST) Received: from localhost ([::1]:46888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZVFfk-0006sU-Kd for incoming@patchwork.ozlabs.org; Fri, 28 Aug 2015 05:10:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZVFf4-00062O-8p for qemu-devel@nongnu.org; Fri, 28 Aug 2015 05:09:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZVFf0-0001B3-61 for qemu-devel@nongnu.org; Fri, 28 Aug 2015 05:09:26 -0400 Received: from smtp4-g21.free.fr ([2a01:e0c:1:1599::13]:25533) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZVFf0-0001As-1G for qemu-devel@nongnu.org; Fri, 28 Aug 2015 05:09:22 -0400 Received: from Quad.localdomain (unknown [78.238.229.36]) by smtp4-g21.free.fr (Postfix) with ESMTPS id E34814C8057; Fri, 28 Aug 2015 11:09:18 +0200 (CEST) From: Laurent Vivier To: cornelia.huck@de.ibm.com Date: Fri, 28 Aug 2015 11:09:05 +0200 Message-Id: <1440752945-4514-1-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.4.3 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:e0c:1:1599::13 Cc: qemu-devel@nongnu.org, peter.maydell@linaro.org, Laurent Vivier , Alexander Graf , Richard Henderson Subject: [Qemu-devel] [PATCH] s390: fix softmmu compilation 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 guest_base must be used only in linux-user mode. Signed-off-by: Laurent Vivier --- tcg/s390/tcg-target.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tcg/s390/tcg-target.c b/tcg/s390/tcg-target.c index ee2e58d..2122744 100644 --- a/tcg/s390/tcg-target.c +++ b/tcg/s390/tcg-target.c @@ -2344,10 +2344,12 @@ static void tcg_target_qemu_prologue(TCGContext *s) TCG_STATIC_CALL_ARGS_SIZE + TCG_TARGET_CALL_STACK_OFFSET, CPU_TEMP_BUF_NLONGS * sizeof(long)); +#ifndef CONFIG_SOFTMMU if (guest_base >= 0x80000) { tcg_out_movi(s, TCG_TYPE_PTR, TCG_GUEST_BASE_REG, guest_base); tcg_regset_set_reg(s->reserved_regs, TCG_GUEST_BASE_REG); } +#endif tcg_out_mov(s, TCG_TYPE_PTR, TCG_AREG0, tcg_target_call_iarg_regs[0]); /* br %r3 (go to TB) */