From d02315aba8875fcc93e8c5db0df857e3d2475432 Mon Sep 17 00:00:00 2001 From: Hollis Blanchard Date: Mon, 3 Dec 2007 16:15:26 -0600 Subject: [PATCH] --- yaml --- r: 80807 b: refs/heads/master c: 53e0aa7b65ec0d66e34e4d356a641c725cc2e519 h: refs/heads/master i: 80805: d4fbdb4e377172a3475a2eb22d8e81161538b82e 80803: 3f1260de0e1fe81a579ba9742a7cf4e4d3be50b8 80799: cdf5cabdae0607b2875cc440ca85548c361c7c3a v: v3 --- [refs] | 2 +- trunk/drivers/kvm/kvm_main.c | 3 +-- trunk/drivers/kvm/x86.h | 7 +++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0f9a7ec49e8d..e31c880225ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e01a1b570f66ad318239517adbcc2cbe368d0a46 +refs/heads/master: 53e0aa7b65ec0d66e34e4d356a641c725cc2e519 diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c index 0f11046b94fa..70664f020849 100644 --- a/trunk/drivers/kvm/kvm_main.c +++ b/trunk/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(); diff --git a/trunk/drivers/kvm/x86.h b/trunk/drivers/kvm/x86.h index 4b7acc76bb34..eed796402e3b 100644 --- a/trunk/drivers/kvm/x86.h +++ b/trunk/drivers/kvm/x86.h @@ -471,4 +471,11 @@ static inline u32 get_rdx_init_val(void) #define TSS_IOPB_SIZE (65536 / 8) #define TSS_REDIRECTION_SIZE (256 / 8) #define RMODE_TSS_SIZE (TSS_BASE_SIZE + TSS_REDIRECTION_SIZE + TSS_IOPB_SIZE + 1) + +static inline int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu) +{ + return vcpu->mp_state == VCPU_MP_STATE_RUNNABLE + || vcpu->mp_state == VCPU_MP_STATE_SIPI_RECEIVED; +} + #endif