From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=58526 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q6kpQ-0003WB-Fs for qemu-devel@nongnu.org; Mon, 04 Apr 2011 10:32:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q6kpO-00036a-La for qemu-devel@nongnu.org; Mon, 04 Apr 2011 10:32:27 -0400 Received: from cantor2.suse.de ([195.135.220.15]:37647 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q6kpO-000366-E7 for qemu-devel@nongnu.org; Mon, 04 Apr 2011 10:32:26 -0400 From: Alexander Graf Date: Mon, 4 Apr 2011 16:32:14 +0200 Message-Id: <1301927544-32767-6-git-send-email-agraf@suse.de> In-Reply-To: <1301927544-32767-1-git-send-email-agraf@suse.de> References: <1301927544-32767-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 05/15] s390x: Enable s390x-softmmu target List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU-devel Developers Cc: peter.maydell@linaro.org, Aurelien Jarno , Richard Henderson This patch adds some code paths for running s390x guest OSs without the need for KVM. Signed-off-by: Alexander Graf --- cpu-exec.c | 8 ++++++++ target-s390x/exec.h | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/cpu-exec.c b/cpu-exec.c index 5cc9379..ebc8cba 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -343,6 +343,8 @@ int cpu_exec(CPUState *env1) do_interrupt(env); #elif defined(TARGET_M68K) do_interrupt(0); +#elif defined(TARGET_S390X) + do_interrupt(env); #endif env->exception_index = -1; #endif @@ -551,6 +553,12 @@ int cpu_exec(CPUState *env1) do_interrupt(1); next_tb = 0; } +#elif defined(TARGET_S390X) && !defined(CONFIG_USER_ONLY) + if ((interrupt_request & CPU_INTERRUPT_HARD) && + (env->psw.mask & PSW_MASK_EXT)) { + do_interrupt(env); + next_tb = 0; + } #endif /* Don't use the cached interupt_request value, do_interrupt may have updated the EXITTB flag. */ diff --git a/target-s390x/exec.h b/target-s390x/exec.h index f7893f3..6fe64a6 100644 --- a/target-s390x/exec.h +++ b/target-s390x/exec.h @@ -34,6 +34,26 @@ static inline int cpu_has_work(CPUState *env) return env->interrupt_request & CPU_INTERRUPT_HARD; // guess } +static inline void regs_to_env(void) +{ +} + +static inline void env_to_regs(void) +{ +} + +static inline int cpu_halted(CPUState *env) +{ + if (!env->halted) { + return 0; + } + if (cpu_has_work(env)) { + env->halted = 0; + return 0; + } + return EXCP_HALTED; +} + static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock* tb) { env->psw.addr = tb->pc; -- 1.6.0.2