lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: Fold drivers/kvm/kvm_vmx.h into drivers/kvm/vmx.c

Browse Source 
No meat in that file.

Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
Avi Kivity
2007-04-19 13:26:39 +03:00
parent e38aea3e93
commit 35cc7f9711
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/kvm/kvm_vmx.h
View File

@@ -1,14 +0,0 @@
#ifndef __KVM_VMX_H
#define __KVM_VMX_H
#ifdef CONFIG_X86_64
/*
* avoid save/load MSR_SYSCALL_MASK and MSR_LSTAR by std vt
* mechanism (cpu bug AA24)
*/
#define NR_BAD_MSRS 2
#else
#define NR_BAD_MSRS 0
#endif
#endif

7
drivers/kvm/vmx.c
View File

@@ -17,7 +17,6 @@
#include "kvm.h" #include "kvm.h"
#include "vmx.h" #include "vmx.h"
#include "kvm_vmx.h"
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mm.h> #include <linux/mm.h>
@@ -81,8 +80,14 @@ static const u32 vmx_msr_index[] = {
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
static unsigned msr_offset_kernel_gs_base; static unsigned msr_offset_kernel_gs_base;
#define NR_64BIT_MSRS 4 #define NR_64BIT_MSRS 4
/*
* avoid save/load MSR_SYSCALL_MASK and MSR_LSTAR by std vt
* mechanism (cpu bug AA24)
*/
#define NR_BAD_MSRS 2
#else #else
#define NR_64BIT_MSRS 0 #define NR_64BIT_MSRS 0
#define NR_BAD_MSRS 0
#endif #endif
static inline int is_page_fault(u32 intr_info) static inline int is_page_fault(u32 intr_info)