Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35cc7f97 authored by Avi Kivity's avatar Avi Kivity
Browse files

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



No meat in that file.

Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent e38aea3e

drivers/kvm/kvm_vmx.h

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
#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

drivers/kvm/vmx.c

+6 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 


#include "kvm.h"

#include "vmx.h"

#include "kvm_vmx.h"

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/mm.h>
@@ -81,8 +80,14 @@ static const u32 vmx_msr_index[] = { 
#ifdef CONFIG_X86_64

static unsigned msr_offset_kernel_gs_base;

#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

#define NR_64BIT_MSRS 0

#define NR_BAD_MSRS 0

#endif



static inline int is_page_fault(u32 intr_info)