Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e72dbe1 authored by Paul Mackerras's avatar Paul Mackerras Committed by Avi Kivity
Browse files

KVM: PPC: Make wakeups work again for Book3S HV guests 



When commit f43fdc15fa ("KVM: PPC: booke: Improve timer register
emulation") factored out some code in arch/powerpc/kvm/powerpc.c
into a new helper function, kvm_vcpu_kick(), an error crept in
which causes Book3s HV guest vcpus to stall.  This fixes it.
On POWER7 machines, guest vcpus are grouped together into virtual
CPU cores that share a single waitqueue, so it's important to use
vcpu->arch.wqp rather than &vcpu->wq.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent befdc0a6

arch/powerpc/kvm/powerpc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -562,7 +562,7 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu) 
	int cpu = vcpu->cpu;

	int cpu = vcpu->cpu;





	me = get_cpu();

	me = get_cpu();

	if (waitqueue_active(&vcpu->wq)) {

	if (waitqueue_active(vcpu->arch.wqp)) {

		wake_up_interruptible(vcpu->arch.wqp);

		wake_up_interruptible(vcpu->arch.wqp);

		vcpu->stat.halt_wakeup++;

		vcpu->stat.halt_wakeup++;

	} else if (cpu != me && cpu != -1) {

	} else if (cpu != me && cpu != -1) {