diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2021-11-16 08:08:19 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-11-18 02:11:57 -0500 |
| commit | 817506df9dbaacf360e518d9ef26ca4075bbbacd (patch) | |
| tree | 28a60fdbb779419d9f0e74380fd78dbceb2049ca /arch/x86/kvm/svm/svm.h | |
| parent | Merge branch 'kvm-selftest' into kvm-master (diff) | |
| parent | KVM: SEV: Fix typo in and tweak name of cmd_allowed_from_miror() (diff) | |
| download | linux-dev-817506df9dbaacf360e518d9ef26ca4075bbbacd.tar.xz linux-dev-817506df9dbaacf360e518d9ef26ca4075bbbacd.zip | |
Merge branch 'kvm-5.16-fixes' into kvm-master
* Fixes for Xen emulation
* Kill kvm_map_gfn() / kvm_unmap_gfn() and broken gfn_to_pfn_cache
* Fixes for migration of 32-bit nested guests on 64-bit hypervisor
* Compilation fixes
* More SEV cleanups
Diffstat (limited to 'arch/x86/kvm/svm/svm.h')
| -rw-r--r-- | arch/x86/kvm/svm/svm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index 437e68504e66..5faad3dc10e2 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -247,7 +247,7 @@ static __always_inline bool sev_es_guest(struct kvm *kvm) #ifdef CONFIG_KVM_AMD_SEV struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info; - return sev_guest(kvm) && sev->es_active; + return sev->es_active && !WARN_ON_ONCE(!sev->active); #else return false; #endif |