diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-04-30 21:29:14 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-04-30 21:29:14 +0200 |
| commit | da8f0d97b2a02ebc98eb380d9e59c7fb653d4ad8 (patch) | |
| tree | 6f357846ce6e69463973e2e902be2c0d6afbdabd /virt/kvm | |
| parent | c110ae578ca0a10064dfbda3d786d6a733b9fe69 (diff) | |
| parent | b2d0371d2e374facd45e115d3668086df13730ff (diff) | |
| download | linux-da8f0d97b2a02ebc98eb380d9e59c7fb653d4ad8.tar.gz linux-da8f0d97b2a02ebc98eb380d9e59c7fb653d4ad8.tar.bz2 linux-da8f0d97b2a02ebc98eb380d9e59c7fb653d4ad8.zip | |
Merge tag 'kvm-s390-next-5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
KVM: s390: Features and fixes for 5.2
- VSIE crypto fixes
- new guest features for gen15
- disable halt polling for nested virtualization with overcommit
Diffstat (limited to 'virt/kvm')
| -rw-r--r-- | virt/kvm/Kconfig | 3 | ||||
| -rw-r--r-- | virt/kvm/kvm_main.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/virt/kvm/Kconfig b/virt/kvm/Kconfig index ea434ddc8499..aad9284c043a 100644 --- a/virt/kvm/Kconfig +++ b/virt/kvm/Kconfig @@ -57,3 +57,6 @@ config HAVE_KVM_VCPU_ASYNC_IOCTL config HAVE_KVM_VCPU_RUN_PID_CHANGE bool + +config HAVE_KVM_NO_POLL + bool diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 684b67252cd5..71ac0de892dc 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2253,7 +2253,7 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu) u64 block_ns; start = cur = ktime_get(); - if (vcpu->halt_poll_ns) { + if (vcpu->halt_poll_ns && !kvm_arch_no_poll(vcpu)) { ktime_t stop = ktime_add_ns(ktime_get(), vcpu->halt_poll_ns); ++vcpu->stat.halt_attempted_poll; |