diff options
Diffstat (limited to 'arch/x86/kvm/kvm_svm.h')
| -rw-r--r-- | arch/x86/kvm/kvm_svm.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/arch/x86/kvm/kvm_svm.h b/arch/x86/kvm/kvm_svm.h index ed66e4c078dc..65ef0fc2c036 100644 --- a/arch/x86/kvm/kvm_svm.h +++ b/arch/x86/kvm/kvm_svm.h @@ -7,7 +7,7 @@ #include <linux/kvm_host.h> #include <asm/msr.h> -#include <asm/svm.h> +#include "svm.h" static const u32 host_save_user_msrs[] = { #ifdef CONFIG_X86_64 @@ -18,6 +18,7 @@ static const u32 host_save_user_msrs[] = { }; #define NR_HOST_SAVE_USER_MSRS ARRAY_SIZE(host_save_user_msrs) +#define NUM_DB_REGS 4 struct kvm_vcpu; @@ -28,23 +29,18 @@ struct vcpu_svm { struct svm_cpu_data *svm_data; uint64_t asid_generation; + unsigned long db_regs[NUM_DB_REGS]; + u64 next_rip; u64 host_user_msrs[NR_HOST_SAVE_USER_MSRS]; u64 host_gs_base; unsigned long host_cr2; + unsigned long host_db_regs[NUM_DB_REGS]; + unsigned long host_dr6; + unsigned long host_dr7; u32 *msrpm; - struct vmcb *hsave; - u64 hsave_msr; - - u64 nested_vmcb; - - /* These are the merged vectors */ - u32 *nested_msrpm; - - /* gpa pointers to the real vectors */ - u64 nested_vmcb_msrpm; }; #endif |