[02/10] qemu-kvm: Remove remaining s390 fragments

Commit Message

Jan Kiszka May 20, 2011, 5:12 p.m. UTC

qemu-kvm is not used with s390, only upstream works theses days. So
remove any conditionals related to this arch.

Signed-off-by: Jan Kiszka <[e-mail]>
---
 qemu-kvm.c |   12 ------------
 qemu-kvm.h |   10 +---------
 2 files changed, 1 insertions(+), 21 deletions(-)

Patch

diff --git a/qemu-kvm.c b/qemu-kvm.c
index c9ff5fe..19ede6e 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -307,11 +307,9 @@  static int kvm_run(CPUState *env)
         env->kvm_vcpu_dirty = 0;
     }
     push_nmi();
-#if !defined(__s390__)
     if (!kvm_state->irqchip_in_kernel) {
         run->request_interrupt_window = kvm_arch_try_push_interrupts(env);
     }
-#endif
 
     r = pre_kvm_run(env);
     if (r) {
@@ -334,11 +332,9 @@  static int kvm_run(CPUState *env)
 
     kvm_flush_coalesced_mmio_buffer();
 
-#if !defined(__s390__)
     if (r == -1) {
         return 1;
     }
-#endif
     if (1) {
         switch (run->exit_reason) {
         case KVM_EXIT_UNKNOWN:
@@ -372,14 +368,6 @@  static int kvm_run(CPUState *env)
         case KVM_EXIT_SHUTDOWN:
             r = handle_shutdown(env);
             break;
-#if defined(__s390__)
-        case KVM_EXIT_S390_SIEIC:
-            r = kvm_s390_handle_intercept(kvm, env, run);
-            break;
-        case KVM_EXIT_S390_RESET:
-            r = kvm_s390_handle_reset(kvm, env, run);
-            break;
-#endif
 	case KVM_EXIT_INTERNAL_ERROR:
             r = kvm_handle_internal_error(env, run);
 	    break;
diff --git a/qemu-kvm.h b/qemu-kvm.h
index b552e1e..8ff773a 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -15,10 +15,6 @@ 
 
 #ifdef CONFIG_KVM
 
-#if defined(__s390__)
-#include <asm/ptrace.h>
-#endif
-
 #include <stdint.h>
 
 #ifndef __user
@@ -31,11 +27,7 @@ 
 
 /* FIXME: share this number with kvm */
 /* FIXME: or dynamically alloc/realloc regions */
-#ifdef __s390__
-#define KVM_MAX_NUM_MEM_REGIONS 1u
-#define MAX_VCPUS 64
-#define LIBKVM_S390_ORIGIN (0UL)
-#elif defined(__ia64__)
+#if defined(__ia64__)
 #define KVM_MAX_NUM_MEM_REGIONS 32u
 #define MAX_VCPUS 256
 #else