diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-02-08 08:47:06 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-02-08 08:47:06 -0500 |
| commit | 693270471d96a63897bd132df15e00da826fa84b (patch) | |
| tree | fc383f7526e1386ba7dedc1576e793039d302661 /virt | |
| parent | 047371968ffc470769f541d6933e262dc7085456 (diff) | |
| parent | db7d6fbc10447090bab8691a907a7c383ec66f58 (diff) | |
| download | linux-693270471d96a63897bd132df15e00da826fa84b.tar.gz | |
Merge branch 'kvm-uapi'
More cleanups of KVM's main header:
* remove thoroughly obsolete APIs
* move architecture-dependent stuff to uapi/asm/kvm.h
* small cleanups to __KVM_HAVE_* symbols
Diffstat (limited to 'virt')
| -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 184dab4ee871c..a11e9c80fac9c 100644 --- a/virt/kvm/Kconfig +++ b/virt/kvm/Kconfig @@ -55,6 +55,9 @@ config KVM_ASYNC_PF_SYNC config HAVE_KVM_MSI bool +config HAVE_KVM_READONLY_MEM + bool + config HAVE_KVM_CPU_RELAX_INTERCEPT bool diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 10bfc88a69f72..ff588677beb7d 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1614,7 +1614,7 @@ static int check_memory_region_flags(struct kvm *kvm, if (mem->flags & KVM_MEM_GUEST_MEMFD) valid_flags &= ~KVM_MEM_LOG_DIRTY_PAGES; -#ifdef __KVM_HAVE_READONLY_MEM +#ifdef CONFIG_HAVE_KVM_READONLY_MEM valid_flags |= KVM_MEM_READONLY; #endif |