diff options
| author | Hollis Blanchard <hollisb@us.ibm.com> | 2007-12-03 16:15:26 -0600 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2008-01-30 17:53:17 +0200 |
| commit | 53e0aa7b65ec0d66e34e4d356a641c725cc2e519 (patch) | |
| tree | 3964471dba10c506407370aefacdfce2cab3086f | |
| parent | e01a1b570f66ad318239517adbcc2cbe368d0a46 (diff) | |
| download | op-kernel-dev-53e0aa7b65ec0d66e34e4d356a641c725cc2e519.zip op-kernel-dev-53e0aa7b65ec0d66e34e4d356a641c725cc2e519.tar.gz | |
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>
| -rw-r--r-- | drivers/kvm/kvm_main.c | 3 | ||||
| -rw-r--r-- | drivers/kvm/x86.h | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c index 0f11046..70664f0 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(); diff --git a/drivers/kvm/x86.h b/drivers/kvm/x86.h index 4b7acc7..eed7964 100644 --- a/drivers/kvm/x86.h +++ b/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 |
