aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/kvm/kvm_main.c
diff options
context:
space:
mode:
authorHollis Blanchard <hollisb@us.ibm.com>2007-12-03 16:15:26 -0600
committerAvi Kivity <avi@qumranet.com>2008-01-30 17:53:17 +0200
commit53e0aa7b65ec0d66e34e4d356a641c725cc2e519 (patch)
tree3964471dba10c506407370aefacdfce2cab3086f /drivers/kvm/kvm_main.c
parentKVM: Portability: Stop including x86-specific headers in kvm_main.c (diff)
downloadlinux-dev-53e0aa7b65ec0d66e34e4d356a641c725cc2e519.tar.xz
linux-dev-53e0aa7b65ec0d66e34e4d356a641c725cc2e519.zip
KVM: Portability: Create kvm_arch_vcpu_runnable() function
This abstracts the detail of x86 hlt and INIT modes into a function. Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com> Acked-by: Carsten Otte <cotte@de.ibm.com> Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm/kvm_main.c')
-rw-r--r--drivers/kvm/kvm_main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index 0f11046b94fa..70664f020849 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -643,8 +643,7 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu)
*/
while (!kvm_cpu_has_interrupt(vcpu)
&& !signal_pending(current)
- && vcpu->mp_state != VCPU_MP_STATE_RUNNABLE
- && vcpu->mp_state != VCPU_MP_STATE_SIPI_RECEIVED) {
+ && !kvm_arch_vcpu_runnable(vcpu)) {
set_current_state(TASK_INTERRUPTIBLE);
vcpu_put(vcpu);
schedule();