diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2009-07-16 17:17:37 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-08-05 13:59:46 +0300 |
| commit | d3bc2f91b4761a8d9f96bea167fef2f8c00dea54 (patch) | |
| tree | dced4891f47175b6a394201410d3685805b4b730 /arch/s390/kvm | |
| parent | 263799a3616242201e20fd2025fe84047b1379b1 (diff) | |
| download | kernel_samsung_smdk4412-d3bc2f91b4761a8d9f96bea167fef2f8c00dea54.zip kernel_samsung_smdk4412-d3bc2f91b4761a8d9f96bea167fef2f8c00dea54.tar.gz kernel_samsung_smdk4412-d3bc2f91b4761a8d9f96bea167fef2f8c00dea54.tar.bz2 | |
KVM: s390: fix wait_queue handling
There are two waitqueues in kvm for wait handling:
vcpu->wq for virt/kvm/kvm_main.c and
vpcu->arch.local_int.wq for the s390 specific wait code.
the wait handling in kvm_s390_handle_wait was broken by using different
wait_queues for add_wait queue and remove_wait_queue.
There are two options to fix the problem:
o move all the s390 specific code to vcpu->wq and remove
vcpu->arch.local_int.wq
o move all the s390 specific code to vcpu->arch.local_int.wq
This patch chooses the 2nd variant for two reasons:
o s390 does not use kvm_vcpu_block but implements its own enabled wait
handling.
Having a separate wait_queue make it clear, that our wait mechanism is
different
o the patch is much smaller
Report-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/s390/kvm')
| -rw-r--r-- | arch/s390/kvm/interrupt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index f04f530..4d61341 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c @@ -386,7 +386,7 @@ no_timer: } __unset_cpu_idle(vcpu); __set_current_state(TASK_RUNNING); - remove_wait_queue(&vcpu->wq, &wait); + remove_wait_queue(&vcpu->arch.local_int.wq, &wait); spin_unlock_bh(&vcpu->arch.local_int.lock); spin_unlock(&vcpu->arch.local_int.float_int->lock); hrtimer_try_to_cancel(&vcpu->arch.ckc_timer); |