diff options
| author | David Hildenbrand | 2014-05-13 16:54:32 +0200 |
|---|---|---|
| committer | Christian Borntraeger | 2014-07-21 13:22:16 +0200 |
| commit | 0759d0681cae279e77ebb4b76175e330360b01d9 (patch) | |
| tree | 42ce3eb00b2041e40441f2faf7382fd0805adbfe /arch/s390/kvm/kvm-s390.c | |
| parent | KVM: s390: implement KVM_(S|G)ET_MP_STATE for user space state control (diff) | |
| download | kernel-qcow2-linux-0759d0681cae279e77ebb4b76175e330360b01d9.tar.gz kernel-qcow2-linux-0759d0681cae279e77ebb4b76175e330360b01d9.tar.xz kernel-qcow2-linux-0759d0681cae279e77ebb4b76175e330360b01d9.zip | |
KVM: s390: cleanup handle_wait by reusing kvm_vcpu_block
This patch cleans up the code in handle_wait by reusing the common code
function kvm_vcpu_block.
signal_pending(), kvm_cpu_has_pending_timer() and kvm_arch_vcpu_runnable() are
sufficient for checking if we need to wake-up that VCPU. kvm_vcpu_block
uses these functions, so no checks are lost.
The flag "timer_due" can be removed - kvm_cpu_has_pending_timer() tests whether
the timer is pending, thus the vcpu is correctly woken up.
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'arch/s390/kvm/kvm-s390.c')
| -rw-r--r-- | arch/s390/kvm/kvm-s390.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index fdf88f7a539c..ecb135702313 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -1068,6 +1068,9 @@ retry: goto retry; } + /* nothing to do, just clear the request */ + clear_bit(KVM_REQ_UNHALT, &vcpu->requests); + return 0; } |