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

KVM: Rename x86_emulate.c to emulate.c

Browse Source 
We're in arch/x86, what could we possibly be emulating?

Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity
2009-08-12 15:04:37 +03:00
parent c0c7c04b87
commit 56e8231841
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
arch/x86/include/asm/kvm_x86_emulate.h → arch/x86/include/asm/kvm_emulate.h
View File

2
arch/x86/include/asm/kvm_host.h
View File

@@ -138,7 +138,7 @@ enum {
VCPU_SREG_LDTR, VCPU_SREG_LDTR,
}; };
#include <asm/kvm_x86_emulate.h> #include <asm/kvm_emulate.h>
#define KVM_NR_MEM_OBJS 40 #define KVM_NR_MEM_OBJS 40

2
arch/x86/kvm/Makefile
View File

@@ -9,7 +9,7 @@ kvm-y += $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \
coalesced_mmio.o irq_comm.o eventfd.o) coalesced_mmio.o irq_comm.o eventfd.o)
kvm-$(CONFIG_IOMMU_API) += $(addprefix ../../../virt/kvm/, iommu.o) kvm-$(CONFIG_IOMMU_API) += $(addprefix ../../../virt/kvm/, iommu.o)
kvm-y += x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o \ kvm-y += x86.o mmu.o emulate.o i8259.o irq.o lapic.o \
i8254.o timer.o i8254.o timer.o
kvm-intel-y += vmx.o kvm-intel-y += vmx.o
kvm-amd-y += svm.o kvm-amd-y += svm.o

4
arch/x86/kvm/x86_emulate.c → arch/x86/kvm/emulate.c
View File

@@ -1,5 +1,5 @@
/****************************************************************************** /******************************************************************************
* x86_emulate.c * emulate.c
* *
* Generic x86 (32-bit and 64-bit) instruction decoder and emulator. * Generic x86 (32-bit and 64-bit) instruction decoder and emulator.
* *
@@ -30,7 +30,7 @@
#define DPRINTF(x...) do {} while (0) #define DPRINTF(x...) do {} while (0)
#endif #endif
#include <linux/module.h> #include <linux/module.h>
#include <asm/kvm_x86_emulate.h> #include <asm/kvm_emulate.h>
#include "mmu.h" /* for is_long_mode() */ #include "mmu.h" /* for is_long_mode() */

2
arch/x86/kvm/x86.c
View File

@@ -2759,7 +2759,7 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
kvm_clear_exception_queue(vcpu); kvm_clear_exception_queue(vcpu);
vcpu->arch.mmio_fault_cr2 = cr2; vcpu->arch.mmio_fault_cr2 = cr2;
/* /*
* TODO: fix x86_emulate.c to use guest_read/write_register * TODO: fix emulate.c to use guest_read/write_register
* instead of direct ->regs accesses, can save hundred cycles * instead of direct ->regs accesses, can save hundred cycles
* on Intel for instructions that don't read/change RSP, for * on Intel for instructions that don't read/change RSP, for
* for example. * for example.