diff options
author | Avi Kivity <avi@qumranet.com> | 2007-06-05 08:53:05 -0400 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2007-07-16 05:05:46 -0400 |
commit | d3bef15f84f91c73a5515ad4c6a1749f8f63afcf (patch) | |
tree | 3349c121f16a5fe0e1c30d4370573c2a9ed88bb9 /drivers/kvm/svm.c | |
parent | ef9254df0b3aeba729e26a062803ee7d90437b5e (diff) |
KVM: Move duplicate halt handling code into kvm_main.c
Will soon have a thid user.
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm/svm.c')
-rw-r--r-- | drivers/kvm/svm.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/kvm/svm.c b/drivers/kvm/svm.c index ec040e2f8c58..70f386e04cbe 100644 --- a/drivers/kvm/svm.c +++ b/drivers/kvm/svm.c | |||
@@ -1115,12 +1115,7 @@ static int halt_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) | |||
1115 | { | 1115 | { |
1116 | vcpu->svm->next_rip = vcpu->svm->vmcb->save.rip + 1; | 1116 | vcpu->svm->next_rip = vcpu->svm->vmcb->save.rip + 1; |
1117 | skip_emulated_instruction(vcpu); | 1117 | skip_emulated_instruction(vcpu); |
1118 | if (vcpu->irq_summary) | 1118 | return kvm_emulate_halt(vcpu); |
1119 | return 1; | ||
1120 | |||
1121 | kvm_run->exit_reason = KVM_EXIT_HLT; | ||
1122 | ++vcpu->stat.halt_exits; | ||
1123 | return 0; | ||
1124 | } | 1119 | } |
1125 | 1120 | ||
1126 | static int vmmcall_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) | 1121 | static int vmmcall_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) |