* [Qemu-devel] [PATCH v2] s390: fix softmmu compilation
@ 2015-08-28 10:23 Laurent Vivier
2015-08-28 10:53 ` Cornelia Huck
2015-08-28 15:35 ` Peter Maydell
0 siblings, 2 replies; 3+ messages in thread
From: Laurent Vivier @ 2015-08-28 10:23 UTC (permalink / raw)
To: cornelia.huck, agraf, rth, peter.maydell; +Cc: qemu-devel, Laurent Vivier
guest_base must be used only in linux-user mode.
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
v2: minor cleanup, drop TCG_GUEST_BASE_REG if CONFIG_SOFTMMU
tcg/s390/tcg-target.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tcg/s390/tcg-target.c b/tcg/s390/tcg-target.c
index ee2e58d..fbf97bb 100644
--- a/tcg/s390/tcg-target.c
+++ b/tcg/s390/tcg-target.c
@@ -53,8 +53,6 @@
#ifndef CONFIG_SOFTMMU
#define TCG_GUEST_BASE_REG TCG_REG_R13
-#else
-#define TCG_GUEST_BASE_REG TCG_REG_R0
#endif
/* All of the following instructions are prefixed with their instruction
@@ -2344,10 +2342,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) */
--
2.4.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH v2] s390: fix softmmu compilation
2015-08-28 10:23 [Qemu-devel] [PATCH v2] s390: fix softmmu compilation Laurent Vivier
@ 2015-08-28 10:53 ` Cornelia Huck
2015-08-28 15:35 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Cornelia Huck @ 2015-08-28 10:53 UTC (permalink / raw)
To: Laurent Vivier; +Cc: qemu-devel, peter.maydell, agraf, rth
On Fri, 28 Aug 2015 12:23:41 +0200
Laurent Vivier <laurent@vivier.eu> wrote:
> guest_base must be used only in linux-user mode.
>
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
> v2: minor cleanup, drop TCG_GUEST_BASE_REG if CONFIG_SOFTMMU
> tcg/s390/tcg-target.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
Still builds for me on s390 :)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH v2] s390: fix softmmu compilation
2015-08-28 10:23 [Qemu-devel] [PATCH v2] s390: fix softmmu compilation Laurent Vivier
2015-08-28 10:53 ` Cornelia Huck
@ 2015-08-28 15:35 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2015-08-28 15:35 UTC (permalink / raw)
To: Laurent Vivier
Cc: Cornelia Huck, QEMU Developers, Alexander Graf, Richard Henderson
On 28 August 2015 at 11:23, Laurent Vivier <laurent@vivier.eu> wrote:
> guest_base must be used only in linux-user mode.
>
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
> v2: minor cleanup, drop TCG_GUEST_BASE_REG if CONFIG_SOFTMMU
> tcg/s390/tcg-target.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Thanks; applied to master as a buildfix.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-08-28 15:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-28 10:23 [Qemu-devel] [PATCH v2] s390: fix softmmu compilation Laurent Vivier
2015-08-28 10:53 ` Cornelia Huck
2015-08-28 15:35 ` Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).