summaryrefslogtreecommitdiff
path: root/arch/powerpc/kvm
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2011-12-09 15:20:46 +0100
committerAvi Kivity <avi@redhat.com>2012-03-05 14:52:30 +0200
commitae21216bece0a623d09980c120b9c98790a860b9 (patch)
tree0025f86a16c8cff37fecc01f7565c929102061bc /arch/powerpc/kvm
parent468a12c2b53776721ff83517d4a195b85c5fce54 (diff)
KVM: PPC: align vcpu_kick with x86
Our vcpu kick implementation differs a bit from x86 which resulted in us not disabling preemption during the kick. Get it a bit closer to what x86 does. Signed-off-by: Alexander Graf <agraf@suse.de> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/powerpc/kvm')
-rw-r--r--arch/powerpc/kvm/powerpc.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index fd8d3b16eaf3..e1ef4d6d972a 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -558,12 +558,17 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
void kvm_vcpu_kick(struct kvm_vcpu *vcpu)
{
+ int me;
+ int cpu = vcpu->cpu;
+
+ me = get_cpu();
if (waitqueue_active(&vcpu->wq)) {
wake_up_interruptible(vcpu->arch.wqp);
vcpu->stat.halt_wakeup++;
- } else if (vcpu->cpu != -1) {
+ } else if (cpu != me && cpu != -1) {
smp_send_reschedule(vcpu->cpu);
}
+ put_cpu();
}
int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, struct kvm_interrupt *irq)