[PATCH 6/8] env->exception_index is not used by kvm code.

[Gleb Natapov]

Signed-off-by: Gleb Natapov <g...@redhat.com>
---
 qemu-kvm-ia64.c |    2 --
 qemu-kvm-x86.c  |    2 --
 qemu-kvm.c      |    1 -
 3 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/qemu-kvm-ia64.c b/qemu-kvm-ia64.c
index 234602c..477d24c 100644
--- a/qemu-kvm-ia64.c
+++ b/qemu-kvm-ia64.c
@@ -35,7 +35,6 @@ int kvm_arch_halt(void *opaque, kvm_vcpu_context_t vcpu)
 {
     CPUState *env = cpu_single_env;
     env->hflags |= HF_HALTED_MASK;
-    env->exception_index = EXCP_HLT;
     return 1;
 }
 
@@ -135,7 +134,6 @@ void kvm_arch_cpu_reset(CPUState *env)
     } else {
        env->interrupt_request &= ~CPU_INTERRUPT_HARD;
        env->halted = 1;
-       env->exception_index = EXCP_HLT;
     }
 }
 
diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index 8e6fb75..6865385 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -611,7 +611,6 @@ int kvm_arch_halt(void *opaque, kvm_vcpu_context_t vcpu)
          (env->eflags & IF_MASK)) &&
        !(env->interrupt_request & CPU_INTERRUPT_NMI)) {
             env->halted = 1;
-           env->exception_index = EXCP_HLT;
     }
     return 1;
 }
@@ -707,7 +706,6 @@ void kvm_arch_cpu_reset(CPUState *env)
        } else {
            env->interrupt_request &= ~CPU_INTERRUPT_HARD;
            env->halted = 1;
-           env->exception_index = EXCP_HLT;
        }
     }
 }
diff --git a/qemu-kvm.c b/qemu-kvm.c
index 3ae4b45..2930a1d 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -442,7 +442,6 @@ static int kvm_main_loop_cpu(CPUState *env)
        if (!env->halted || kvm_irqchip_in_kernel(kvm_context))
            kvm_cpu_exec(env);
        env->exit_request = 0;
-        env->exception_index = EXCP_INTERRUPT;
        kvm_main_loop_wait(env, 0);
     }
     pthread_mutex_unlock(&qemu_mutex);
-- 
1.6.2.1

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html