KVM: x86: Move kvm_emulate.h into KVM's private directory
Now that the emulation context is dynamically allocated and not embedded in struct kvm_vcpu, move its header, kvm_emulate.h, out of the public asm directory and into KVM's private x86 directory. Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:

committed by
Paolo Bonzini

parent
c9b8b07cde
commit
2f728d66e8
@@ -185,7 +185,10 @@ enum exit_fastpath_completion {
|
|||||||
EXIT_FASTPATH_SKIP_EMUL_INS,
|
EXIT_FASTPATH_SKIP_EMUL_INS,
|
||||||
};
|
};
|
||||||
|
|
||||||
#include <asm/kvm_emulate.h>
|
struct x86_emulate_ctxt;
|
||||||
|
struct x86_exception;
|
||||||
|
enum x86_intercept;
|
||||||
|
enum x86_intercept_stage;
|
||||||
|
|
||||||
#define KVM_NR_MEM_OBJS 40
|
#define KVM_NR_MEM_OBJS 40
|
||||||
|
|
||||||
@@ -1418,8 +1421,6 @@ int kvm_set_msr(struct kvm_vcpu *vcpu, u32 index, u64 data);
|
|||||||
int kvm_emulate_rdmsr(struct kvm_vcpu *vcpu);
|
int kvm_emulate_rdmsr(struct kvm_vcpu *vcpu);
|
||||||
int kvm_emulate_wrmsr(struct kvm_vcpu *vcpu);
|
int kvm_emulate_wrmsr(struct kvm_vcpu *vcpu);
|
||||||
|
|
||||||
struct x86_emulate_ctxt;
|
|
||||||
|
|
||||||
int kvm_fast_pio(struct kvm_vcpu *vcpu, int size, unsigned short port, int in);
|
int kvm_fast_pio(struct kvm_vcpu *vcpu, int size, unsigned short port, int in);
|
||||||
int kvm_emulate_cpuid(struct kvm_vcpu *vcpu);
|
int kvm_emulate_cpuid(struct kvm_vcpu *vcpu);
|
||||||
int kvm_emulate_halt(struct kvm_vcpu *vcpu);
|
int kvm_emulate_halt(struct kvm_vcpu *vcpu);
|
||||||
|
@@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
#include <linux/kvm_host.h>
|
#include <linux/kvm_host.h>
|
||||||
#include "kvm_cache_regs.h"
|
#include "kvm_cache_regs.h"
|
||||||
#include <asm/kvm_emulate.h>
|
#include "kvm_emulate.h"
|
||||||
#include <linux/stringify.h>
|
#include <linux/stringify.h>
|
||||||
#include <asm/fpu/api.h>
|
#include <asm/fpu/api.h>
|
||||||
#include <asm/debugreg.h>
|
#include <asm/debugreg.h>
|
||||||
|
@@ -19,6 +19,7 @@
|
|||||||
#include "mmu.h"
|
#include "mmu.h"
|
||||||
#include "x86.h"
|
#include "x86.h"
|
||||||
#include "kvm_cache_regs.h"
|
#include "kvm_cache_regs.h"
|
||||||
|
#include "kvm_emulate.h"
|
||||||
#include "cpuid.h"
|
#include "cpuid.h"
|
||||||
|
|
||||||
#include <linux/kvm_host.h>
|
#include <linux/kvm_host.h>
|
||||||
|
@@ -22,6 +22,7 @@
|
|||||||
#include "i8254.h"
|
#include "i8254.h"
|
||||||
#include "tss.h"
|
#include "tss.h"
|
||||||
#include "kvm_cache_regs.h"
|
#include "kvm_cache_regs.h"
|
||||||
|
#include "kvm_emulate.h"
|
||||||
#include "x86.h"
|
#include "x86.h"
|
||||||
#include "cpuid.h"
|
#include "cpuid.h"
|
||||||
#include "pmu.h"
|
#include "pmu.h"
|
||||||
|
@@ -5,6 +5,7 @@
|
|||||||
#include <linux/kvm_host.h>
|
#include <linux/kvm_host.h>
|
||||||
#include <asm/pvclock.h>
|
#include <asm/pvclock.h>
|
||||||
#include "kvm_cache_regs.h"
|
#include "kvm_cache_regs.h"
|
||||||
|
#include "kvm_emulate.h"
|
||||||
|
|
||||||
#define KVM_DEFAULT_PLE_GAP 128
|
#define KVM_DEFAULT_PLE_GAP 128
|
||||||
#define KVM_VMX_DEFAULT_PLE_WINDOW 4096
|
#define KVM_VMX_DEFAULT_PLE_WINDOW 4096
|
||||||
|
Reference in New Issue
Block a user