| From fdeecaddce9b3ae1547493d8f9b64d98427bd8da Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 4 Mar 2022 08:10:32 -0800 |
| Subject: KVM: SVM: Fix kvm_cache_regs.h inclusions for is_guest_mode() |
| |
| From: Peter Gonda <pgonda@google.com> |
| |
| [ Upstream commit 4a9e7b9ea252842bc8b14d495706ac6317fafd5d ] |
| |
| Include kvm_cache_regs.h to pick up the definition of is_guest_mode(), |
| which is referenced by nested_svm_virtualize_tpr() in svm.h. Remove |
| include from svm_onhpyerv.c which was done only because of lack of |
| include in svm.h. |
| |
| Fixes: 883b0a91f41ab ("KVM: SVM: Move Nested SVM Implementation to nested.c") |
| Cc: Paolo Bonzini <pbonzini@redhat.com> |
| Cc: Sean Christopherson <seanjc@google.com> |
| Cc: kvm@vger.kernel.org |
| Cc: linux-kernel@vger.kernel.org |
| Signed-off-by: Peter Gonda <pgonda@google.com> |
| Message-Id: <20220304161032.2270688-1-pgonda@google.com> |
| Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/x86/kvm/svm/svm.h | 2 ++ |
| arch/x86/kvm/svm/svm_onhyperv.c | 1 - |
| 2 files changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h |
| index 1b460e539926..01d35efaa646 100644 |
| --- a/arch/x86/kvm/svm/svm.h |
| +++ b/arch/x86/kvm/svm/svm.h |
| @@ -22,6 +22,8 @@ |
| #include <asm/svm.h> |
| #include <asm/sev-common.h> |
| |
| +#include "kvm_cache_regs.h" |
| + |
| #define __sme_page_pa(x) __sme_set(page_to_pfn(x) << PAGE_SHIFT) |
| |
| #define IOPM_SIZE PAGE_SIZE * 3 |
| diff --git a/arch/x86/kvm/svm/svm_onhyperv.c b/arch/x86/kvm/svm/svm_onhyperv.c |
| index 98aa981c04ec..8cdc62c74a96 100644 |
| --- a/arch/x86/kvm/svm/svm_onhyperv.c |
| +++ b/arch/x86/kvm/svm/svm_onhyperv.c |
| @@ -4,7 +4,6 @@ |
| */ |
| |
| #include <linux/kvm_host.h> |
| -#include "kvm_cache_regs.h" |
| |
| #include <asm/mshyperv.h> |
| |
| -- |
| 2.35.1 |
| |