summaryrefslogtreecommitdiff
path: root/kvm_x86.c
diff options
context:
space:
mode:
authorBryan Cantrill <bryan@joyent.com>2011-04-21 17:37:52 -0700
committerBryan Cantrill <bryan@joyent.com>2011-04-21 17:37:52 -0700
commit3746648fba87c9fc33d00e5b31587b3fd9db9e3c (patch)
tree1e02ad75263ee0e879cde1db5ce4eadcc5e51068 /kvm_x86.c
parent54f1bf425595840d35bdf7f25e614dfe91b87fbc (diff)
downloadillumos-kvm-3746648fba87c9fc33d00e5b31587b3fd9db9e3c.tar.gz
HVM-112 Need something for kvm_vcpu_block (cstyle)
Diffstat (limited to 'kvm_x86.c')
-rw-r--r--kvm_x86.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/kvm_x86.c b/kvm_x86.c
index 1fc41b3..a051a04 100644
--- a/kvm_x86.c
+++ b/kvm_x86.c
@@ -4713,10 +4713,8 @@ out:
int
kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu)
{
- return (vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE
- || vcpu->arch.mp_state == KVM_MP_STATE_SIPI_RECEIVED
- || vcpu->arch.nmi_pending ||
- (kvm_arch_interrupt_allowed(vcpu) &&
- kvm_cpu_has_interrupt(vcpu)));
+ return (vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE ||
+ vcpu->arch.mp_state == KVM_MP_STATE_SIPI_RECEIVED ||
+ vcpu->arch.nmi_pending ||
+ (kvm_arch_interrupt_allowed(vcpu) && kvm_cpu_has_interrupt(vcpu)));
}
-