summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2021-05-25 10:41:17 -0300
committerPaolo Bonzini <pbonzini@redhat.com>2021-05-27 07:57:38 -0400
commit084071d5e9226add45a6031928bf10e6afc855fd (patch)
treec1040ef834d5c56942c4de40912244e6c78cc52d /virt
parent57ab87947abfc4e0b0b9864dc4717326a1c28a39 (diff)
downloadlinux-084071d5e9226add45a6031928bf10e6afc855fd.tar.gz
linux-084071d5e9226add45a6031928bf10e6afc855fd.tar.bz2
linux-084071d5e9226add45a6031928bf10e6afc855fd.zip
KVM: rename KVM_REQ_PENDING_TIMER to KVM_REQ_UNBLOCK
KVM_REQ_UNBLOCK will be used to exit a vcpu from its inner vcpu halt emulation loop. Rename KVM_REQ_PENDING_TIMER to KVM_REQ_UNBLOCK, switch PowerPC to arch specific request bit. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Message-Id: <20210525134321.303768132@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/kvm_main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 5f40725144f5..37a2d500a148 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2929,6 +2929,8 @@ static int kvm_vcpu_check_block(struct kvm_vcpu *vcpu)
goto out;
if (signal_pending(current))
goto out;
+ if (kvm_check_request(KVM_REQ_UNBLOCK, vcpu))
+ goto out;
ret = 0;
out: