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

Commit 56e82318 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: Rename x86_emulate.c to emulate.c 



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

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent c0c7c04b

arch/x86/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ enum { 
	VCPU_SREG_LDTR,

};



#include <asm/kvm_x86_emulate.h>

#include <asm/kvm_emulate.h>



#define KVM_NR_MEM_OBJS 40

arch/x86/kvm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ kvm-y += $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \ 
				coalesced_mmio.o irq_comm.o eventfd.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

kvm-intel-y		+= vmx.o

kvm-amd-y		+= svm.o

arch/x86/kvm/x86_emulate.c→arch/x86/kvm/emulate.c

+2 −2
Original line number Diff line number Diff line 
/******************************************************************************

 * x86_emulate.c

 * emulate.c

 *

 * Generic x86 (32-bit and 64-bit) instruction decoder and emulator.

 *
@@ -30,7 +30,7 @@ 
#define DPRINTF(x...) do {} while (0)

#endif

#include <linux/module.h>

#include <asm/kvm_x86_emulate.h>

#include <asm/kvm_emulate.h>



#include "mmu.h"		/* for is_long_mode() */

arch/x86/kvm/x86.c

+1 −1
Original line number Diff line number Diff line
@@ -2759,7 +2759,7 @@ int emulate_instruction(struct kvm_vcpu *vcpu, 
	kvm_clear_exception_queue(vcpu);

	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

	 * on Intel for instructions that don't read/change RSP, for

	 * for example.