summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/x86.c
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2011-04-20 15:43:05 +0300
committerAvi Kivity <avi@redhat.com>2011-05-22 08:39:17 -0400
commit6c3287f7c5050076b554145f11bdba058de287d1 (patch)
treea2acca73938e6937cbad6cc34bd8586e91973030 /arch/x86/kvm/x86.c
parent3cb16fe78ce91991a876c74fc5dc99419b737b7a (diff)
downloadblackbird-op-linux-6c3287f7c5050076b554145f11bdba058de287d1.tar.gz
blackbird-op-linux-6c3287f7c5050076b554145f11bdba058de287d1.zip
KVM: x86 emulator: add new ->halt() callback
Instead of reaching into vcpu internals. Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
-rw-r--r--arch/x86/kvm/x86.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 8af49b3df675..2246cf1a4ee0 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -4351,6 +4351,11 @@ static int emulator_set_msr(struct x86_emulate_ctxt *ctxt,
return kvm_set_msr(emul_to_vcpu(ctxt), msr_index, data);
}
+static void emulator_halt(struct x86_emulate_ctxt *ctxt)
+{
+ emul_to_vcpu(ctxt)->arch.halt_request = 1;
+}
+
static void emulator_get_fpu(struct x86_emulate_ctxt *ctxt)
{
preempt_disable();
@@ -4400,6 +4405,7 @@ static struct x86_emulate_ops emulate_ops = {
.set_dr = emulator_set_dr,
.set_msr = emulator_set_msr,
.get_msr = emulator_get_msr,
+ .halt = emulator_halt,
.get_fpu = emulator_get_fpu,
.put_fpu = emulator_put_fpu,
.intercept = emulator_intercept,
OpenPOWER on IntegriCloud