Patchwork [10/19] s390x: Enable s390x-softmmu target

login
register
mail settings
Submitter Alexander Graf
Date March 29, 2011, 1:29 p.m.
Message ID <1301405386-25738-11-git-send-email-agraf@suse.de>
Download mbox | patch
Permalink /patch/88782/
State New
Headers show

Comments

Alexander Graf - March 29, 2011, 1:29 p.m.
This patch adds some code paths for running s390x guest OSs without the
need for KVM.

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 cpu-exec.c          |    8 ++++++++
 target-s390x/exec.h |   20 ++++++++++++++++++++
 2 files changed, 28 insertions(+), 0 deletions(-)

Patch

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;