diff options
| author |  Babu Moger <babu.moger@amd.com>
| 2020-09-11 14:28:20 -0500 |
|---|---|---|
| committer |  Paolo Bonzini <pbonzini@redhat.com>
| 2020-09-28 07:57:14 -0400 |
| commit | 9780d51dc2af1c02bed9687822ba0d6df955c302 (patch) | |
| tree | ad858472943944e0891f3d33502217c9522eb8fd /arch/x86/include/asm/svm.h | |
| parent | KVM: SVM: Change intercept_dr to generic intercepts (diff) | |
| download | linux-9780d51dc2af1c02bed9687822ba0d6df955c302.tar.gz linux-9780d51dc2af1c02bed9687822ba0d6df955c302.tar.bz2 linux-9780d51dc2af1c02bed9687822ba0d6df955c302.zip | |
KVM: SVM: Modify intercept_exceptions to generic intercepts
Modify intercept_exceptions to generic intercepts in vmcb_control_area. Use
the generic vmcb_set_intercept, vmcb_clr_intercept and vmcb_is_intercept to
set/clear/test the intercept_exceptions bits.
Signed-off-by: Babu Moger <babu.moger@amd.com>
Reviewed-by: Jim Mattson <jmattson@google.com>
Message-Id: <159985250037.11252.1361972528657052410.stgit@bmoger-ubuntu>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/include/asm/svm.h')
| -rw-r--r-- | arch/x86/include/asm/svm.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h index 80a4db25e424..caf7a63d65aa 100644 --- a/arch/x86/include/asm/svm.h +++ b/arch/x86/include/asm/svm.h @@ -3,6 +3,7 @@ #define __SVM_H #include <uapi/asm/svm.h> +#include <uapi/asm/kvm.h> /* * 32-bit intercept words in the VMCB Control Area, starting @@ -12,6 +13,7 @@ enum intercept_words { INTERCEPT_CR = 0, INTERCEPT_DR, + INTERCEPT_EXCEPTION, MAX_INTERCEPT, }; @@ -42,6 +44,8 @@ enum { INTERCEPT_DR5_WRITE, INTERCEPT_DR6_WRITE, INTERCEPT_DR7_WRITE, + /* Byte offset 008h (word 2) */ + INTERCEPT_EXCEPTION_OFFSET = 64, }; enum { @@ -97,7 +101,6 @@ enum { struct __attribute__ ((__packed__)) vmcb_control_area { u32 intercepts[MAX_INTERCEPT]; - u32 intercept_exceptions; u64 intercept; u8 reserved_1[40]; u16 pause_filter_thresh; |