From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Fri, 21 Jan 2011 20:48:10 +0000 (+0100)
Subject: kvm: x86: Prepare kvm_get_mp_state for in-kernel irqchip
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c14750e8ad4a9d8d7621e2594abda34df19a6eff;p=qemu.git

kvm: x86: Prepare kvm_get_mp_state for in-kernel irqchip

This code path will not yet be taken as we still lack in-kernel irqchip
support. But qemu-kvm can already make use of it and drop its own
mp_state access services.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 9bb34abc5b..531b69e68a 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -1198,6 +1198,9 @@ static int kvm_get_mp_state(CPUState *env)
         return ret;
     }
     env->mp_state = mp_state.mp_state;
+    if (kvm_irqchip_in_kernel()) {
+        env->halted = (mp_state.mp_state == KVM_MP_STATE_HALTED);
+    }
     return 0;
 }