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 /include | |
| parent | kvm: move KVM_CAP_NR_MEMSLOTS to common code (diff) | |
| parent | KVM: s390: vsie: Return correct values for Invalid CRYCB format (diff) | |
| download | linux-da8f0d97b2a02ebc98eb380d9e59c7fb653d4ad8.tar.xz 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 'include')
| -rw-r--r-- | include/linux/kvm_host.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 640a03642766..43f87ad83ff4 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1307,6 +1307,16 @@ static inline bool vcpu_valid_wakeup(struct kvm_vcpu *vcpu) } #endif /* CONFIG_HAVE_KVM_INVALID_WAKEUPS */ +#ifdef CONFIG_HAVE_KVM_NO_POLL +/* Callback that tells if we must not poll */ +bool kvm_arch_no_poll(struct kvm_vcpu *vcpu); +#else +static inline bool kvm_arch_no_poll(struct kvm_vcpu *vcpu) +{ + return false; +} +#endif /* CONFIG_HAVE_KVM_NO_POLL */ + #ifdef CONFIG_HAVE_KVM_VCPU_ASYNC_IOCTL long kvm_arch_vcpu_async_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg); |