Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-10 07:10:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MIPS: KVM: Simplify functions by removing redundancy

Browse Source 
No logic changes inside.

Reviewed-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Deng-Cheng Zhu <dengcheng.zhu@imgtec.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Deng-Cheng Zhu 2014-06-26 12:11:36 -07:00 committed by Paolo Bonzini
parent 6ad78a5c75
commit d98403a525
5 changed files with 17 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -764,7 +764,7 @@ extern int kvm_mips_trans_mtc0(uint32_t inst, uint32_t *opc,
struct kvm_vcpu *vcpu); struct kvm_vcpu *vcpu);
/* Misc */ /* Misc */
extern int kvm_mips_dump_stats(struct kvm_vcpu *vcpu); extern void kvm_mips_dump_stats(struct kvm_vcpu *vcpu);
extern unsigned long kvm_mips_get_ramsize(struct kvm *kvm); extern unsigned long kvm_mips_get_ramsize(struct kvm *kvm);

18
arch/mips/kvm/kvm_mips.c
View File

@ -97,9 +97,7 @@ void kvm_arch_hardware_unsetup(void)
void kvm_arch_check_processor_compat(void *rtn) void kvm_arch_check_processor_compat(void *rtn)
{ {
int *r = (int *)rtn; *(int *)rtn = 0;
*r = 0;
return;
} }
static void kvm_mips_init_tlbs(struct kvm *kvm) static void kvm_mips_init_tlbs(struct kvm *kvm)
@ -225,7 +223,7 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,
enum kvm_mr_change change) enum kvm_mr_change change)
{ {
unsigned long npages = 0; unsigned long npages = 0;
int i, err = 0; int i;
kvm_debug("%s: kvm: %p slot: %d, GPA: %llx, size: %llx, QVA: %llx\n", kvm_debug("%s: kvm: %p slot: %d, GPA: %llx, size: %llx, QVA: %llx\n",
__func__, kvm, mem->slot, mem->guest_phys_addr, __func__, kvm, mem->slot, mem->guest_phys_addr,
@ -243,8 +241,7 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,
if (!kvm->arch.guest_pmap) { if (!kvm->arch.guest_pmap) {
kvm_err("Failed to allocate guest PMAP"); kvm_err("Failed to allocate guest PMAP");
err = -ENOMEM; return;
goto out;
} }
kvm_debug("Allocated space for Guest PMAP Table (%ld pages) @ %p\n", kvm_debug("Allocated space for Guest PMAP Table (%ld pages) @ %p\n",
@ -255,8 +252,6 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,
kvm->arch.guest_pmap[i] = KVM_INVALID_PAGE; kvm->arch.guest_pmap[i] = KVM_INVALID_PAGE;
} }
} }
out:
return;
} }
void kvm_arch_flush_shadow_all(struct kvm *kvm) void kvm_arch_flush_shadow_all(struct kvm *kvm)
@ -845,16 +840,12 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
int kvm_arch_init(void *opaque) int kvm_arch_init(void *opaque)
{ {
int ret;
if (kvm_mips_callbacks) { if (kvm_mips_callbacks) {
kvm_err("kvm: module already exists\n"); kvm_err("kvm: module already exists\n");
return -EEXIST; return -EEXIST;
} }
ret = kvm_mips_emulation_init(&kvm_mips_callbacks); return kvm_mips_emulation_init(&kvm_mips_callbacks);
return ret;
} }
void kvm_arch_exit(void) void kvm_arch_exit(void)
@ -1008,7 +999,6 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu)
{ {
return;
} }
int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,

2
arch/mips/kvm/kvm_mips_commpage.c
View File

@ -33,6 +33,4 @@ void kvm_mips_commpage_init(struct kvm_vcpu *vcpu)
/* Specific init values for fields */ /* Specific init values for fields */
vcpu->arch.cop0 = &page->cop0; vcpu->arch.cop0 = &page->cop0;
memset(vcpu->arch.cop0, 0, sizeof(struct mips_coproc)); memset(vcpu->arch.cop0, 0, sizeof(struct mips_coproc));
return;
} }

34
arch/mips/kvm/kvm_mips_emul.c
View File

@ -761,8 +761,6 @@ enum emulation_result kvm_mips_emul_eret(struct kvm_vcpu *vcpu)
enum emulation_result kvm_mips_emul_wait(struct kvm_vcpu *vcpu) enum emulation_result kvm_mips_emul_wait(struct kvm_vcpu *vcpu)
{ {
enum emulation_result er = EMULATE_DONE;
kvm_debug("[%#lx] !!!WAIT!!! (%#lx)\n", vcpu->arch.pc, kvm_debug("[%#lx] !!!WAIT!!! (%#lx)\n", vcpu->arch.pc,
vcpu->arch.pending_exceptions); vcpu->arch.pending_exceptions);
@ -782,7 +780,7 @@ enum emulation_result kvm_mips_emul_wait(struct kvm_vcpu *vcpu)
} }
} }
return er; return EMULATE_DONE;
} }
/* /*
@ -792,11 +790,10 @@ enum emulation_result kvm_mips_emul_wait(struct kvm_vcpu *vcpu)
enum emulation_result kvm_mips_emul_tlbr(struct kvm_vcpu *vcpu) enum emulation_result kvm_mips_emul_tlbr(struct kvm_vcpu *vcpu)
{ {
struct mips_coproc *cop0 = vcpu->arch.cop0; struct mips_coproc *cop0 = vcpu->arch.cop0;
enum emulation_result er = EMULATE_FAIL;
uint32_t pc = vcpu->arch.pc; uint32_t pc = vcpu->arch.pc;
kvm_err("[%#x] COP0_TLBR [%ld]\n", pc, kvm_read_c0_guest_index(cop0)); kvm_err("[%#x] COP0_TLBR [%ld]\n", pc, kvm_read_c0_guest_index(cop0));
return er; return EMULATE_FAIL;
} }
/* Write Guest TLB Entry @ Index */ /* Write Guest TLB Entry @ Index */
@ -804,7 +801,6 @@ enum emulation_result kvm_mips_emul_tlbwi(struct kvm_vcpu *vcpu)
{ {
struct mips_coproc *cop0 = vcpu->arch.cop0; struct mips_coproc *cop0 = vcpu->arch.cop0;
int index = kvm_read_c0_guest_index(cop0); int index = kvm_read_c0_guest_index(cop0);
enum emulation_result er = EMULATE_DONE;
struct kvm_mips_tlb *tlb = NULL; struct kvm_mips_tlb *tlb = NULL;
uint32_t pc = vcpu->arch.pc; uint32_t pc = vcpu->arch.pc;
@ -836,14 +832,13 @@ enum emulation_result kvm_mips_emul_tlbwi(struct kvm_vcpu *vcpu)
kvm_read_c0_guest_entrylo1(cop0), kvm_read_c0_guest_entrylo1(cop0),
kvm_read_c0_guest_pagemask(cop0)); kvm_read_c0_guest_pagemask(cop0));
return er; return EMULATE_DONE;
} }
/* Write Guest TLB Entry @ Random Index */ /* Write Guest TLB Entry @ Random Index */
enum emulation_result kvm_mips_emul_tlbwr(struct kvm_vcpu *vcpu) enum emulation_result kvm_mips_emul_tlbwr(struct kvm_vcpu *vcpu)
{ {
struct mips_coproc *cop0 = vcpu->arch.cop0; struct mips_coproc *cop0 = vcpu->arch.cop0;
enum emulation_result er = EMULATE_DONE;
struct kvm_mips_tlb *tlb = NULL; struct kvm_mips_tlb *tlb = NULL;
uint32_t pc = vcpu->arch.pc; uint32_t pc = vcpu->arch.pc;
int index; int index;
@ -874,14 +869,13 @@ enum emulation_result kvm_mips_emul_tlbwr(struct kvm_vcpu *vcpu)
kvm_read_c0_guest_entrylo0(cop0), kvm_read_c0_guest_entrylo0(cop0),
kvm_read_c0_guest_entrylo1(cop0)); kvm_read_c0_guest_entrylo1(cop0));
return er; return EMULATE_DONE;
} }
enum emulation_result kvm_mips_emul_tlbp(struct kvm_vcpu *vcpu) enum emulation_result kvm_mips_emul_tlbp(struct kvm_vcpu *vcpu)
{ {
struct mips_coproc *cop0 = vcpu->arch.cop0; struct mips_coproc *cop0 = vcpu->arch.cop0;
long entryhi = kvm_read_c0_guest_entryhi(cop0); long entryhi = kvm_read_c0_guest_entryhi(cop0);
enum emulation_result er = EMULATE_DONE;
uint32_t pc = vcpu->arch.pc; uint32_t pc = vcpu->arch.pc;
int index = -1; int index = -1;
@ -892,7 +886,7 @@ enum emulation_result kvm_mips_emul_tlbp(struct kvm_vcpu *vcpu)
kvm_debug("[%#x] COP0_TLBP (entryhi: %#lx), index: %d\n", pc, entryhi, kvm_debug("[%#x] COP0_TLBP (entryhi: %#lx), index: %d\n", pc, entryhi,
index); index);
return er; return EMULATE_DONE;
} }
enum emulation_result kvm_mips_emulate_CP0(uint32_t inst, uint32_t *opc, enum emulation_result kvm_mips_emulate_CP0(uint32_t inst, uint32_t *opc,
@ -1638,7 +1632,6 @@ enum emulation_result kvm_mips_emulate_tlbmiss_ld(unsigned long cause,
{ {
struct mips_coproc *cop0 = vcpu->arch.cop0; struct mips_coproc *cop0 = vcpu->arch.cop0;
struct kvm_vcpu_arch *arch = &vcpu->arch; struct kvm_vcpu_arch *arch = &vcpu->arch;
enum emulation_result er = EMULATE_DONE;
unsigned long entryhi = (vcpu->arch. host_cp0_badvaddr & VPN2_MASK) | unsigned long entryhi = (vcpu->arch. host_cp0_badvaddr & VPN2_MASK) |
(kvm_read_c0_guest_entryhi(cop0) & ASID_MASK); (kvm_read_c0_guest_entryhi(cop0) & ASID_MASK);
@ -1675,7 +1668,7 @@ enum emulation_result kvm_mips_emulate_tlbmiss_ld(unsigned long cause,
/* Blow away the shadow host TLBs */ /* Blow away the shadow host TLBs */
kvm_mips_flush_host_tlb(1); kvm_mips_flush_host_tlb(1);
return er; return EMULATE_DONE;
} }
enum emulation_result kvm_mips_emulate_tlbinv_ld(unsigned long cause, enum emulation_result kvm_mips_emulate_tlbinv_ld(unsigned long cause,
@ -1685,7 +1678,6 @@ enum emulation_result kvm_mips_emulate_tlbinv_ld(unsigned long cause,
{ {
struct mips_coproc *cop0 = vcpu->arch.cop0; struct mips_coproc *cop0 = vcpu->arch.cop0;
struct kvm_vcpu_arch *arch = &vcpu->arch; struct kvm_vcpu_arch *arch = &vcpu->arch;
enum emulation_result er = EMULATE_DONE;
unsigned long entryhi = unsigned long entryhi =
(vcpu->arch.host_cp0_badvaddr & VPN2_MASK) | (vcpu->arch.host_cp0_badvaddr & VPN2_MASK) |
(kvm_read_c0_guest_entryhi(cop0) & ASID_MASK); (kvm_read_c0_guest_entryhi(cop0) & ASID_MASK);
@ -1722,7 +1714,7 @@ enum emulation_result kvm_mips_emulate_tlbinv_ld(unsigned long cause,
/* Blow away the shadow host TLBs */ /* Blow away the shadow host TLBs */
kvm_mips_flush_host_tlb(1); kvm_mips_flush_host_tlb(1);
return er; return EMULATE_DONE;
} }
enum emulation_result kvm_mips_emulate_tlbmiss_st(unsigned long cause, enum emulation_result kvm_mips_emulate_tlbmiss_st(unsigned long cause,
@ -1732,7 +1724,6 @@ enum emulation_result kvm_mips_emulate_tlbmiss_st(unsigned long cause,
{ {
struct mips_coproc *cop0 = vcpu->arch.cop0; struct mips_coproc *cop0 = vcpu->arch.cop0;
struct kvm_vcpu_arch *arch = &vcpu->arch; struct kvm_vcpu_arch *arch = &vcpu->arch;
enum emulation_result er = EMULATE_DONE;
unsigned long entryhi = (vcpu->arch.host_cp0_badvaddr & VPN2_MASK) | unsigned long entryhi = (vcpu->arch.host_cp0_badvaddr & VPN2_MASK) |
(kvm_read_c0_guest_entryhi(cop0) & ASID_MASK); (kvm_read_c0_guest_entryhi(cop0) & ASID_MASK);
@ -1767,7 +1758,7 @@ enum emulation_result kvm_mips_emulate_tlbmiss_st(unsigned long cause,
/* Blow away the shadow host TLBs */ /* Blow away the shadow host TLBs */
kvm_mips_flush_host_tlb(1); kvm_mips_flush_host_tlb(1);
return er; return EMULATE_DONE;
} }
enum emulation_result kvm_mips_emulate_tlbinv_st(unsigned long cause, enum emulation_result kvm_mips_emulate_tlbinv_st(unsigned long cause,
@ -1777,7 +1768,6 @@ enum emulation_result kvm_mips_emulate_tlbinv_st(unsigned long cause,
{ {
struct mips_coproc *cop0 = vcpu->arch.cop0; struct mips_coproc *cop0 = vcpu->arch.cop0;
struct kvm_vcpu_arch *arch = &vcpu->arch; struct kvm_vcpu_arch *arch = &vcpu->arch;
enum emulation_result er = EMULATE_DONE;
unsigned long entryhi = (vcpu->arch.host_cp0_badvaddr & VPN2_MASK) | unsigned long entryhi = (vcpu->arch.host_cp0_badvaddr & VPN2_MASK) |
(kvm_read_c0_guest_entryhi(cop0) & ASID_MASK); (kvm_read_c0_guest_entryhi(cop0) & ASID_MASK);
@ -1812,7 +1802,7 @@ enum emulation_result kvm_mips_emulate_tlbinv_st(unsigned long cause,
/* Blow away the shadow host TLBs */ /* Blow away the shadow host TLBs */
kvm_mips_flush_host_tlb(1); kvm_mips_flush_host_tlb(1);
return er; return EMULATE_DONE;
} }
/* TLBMOD: store into address matching TLB with Dirty bit off */ /* TLBMOD: store into address matching TLB with Dirty bit off */
@ -1853,7 +1843,6 @@ enum emulation_result kvm_mips_emulate_tlbmod(unsigned long cause,
unsigned long entryhi = (vcpu->arch.host_cp0_badvaddr & VPN2_MASK) | unsigned long entryhi = (vcpu->arch.host_cp0_badvaddr & VPN2_MASK) |
(kvm_read_c0_guest_entryhi(cop0) & ASID_MASK); (kvm_read_c0_guest_entryhi(cop0) & ASID_MASK);
struct kvm_vcpu_arch *arch = &vcpu->arch; struct kvm_vcpu_arch *arch = &vcpu->arch;
enum emulation_result er = EMULATE_DONE;
if ((kvm_read_c0_guest_status(cop0) & ST0_EXL) == 0) { if ((kvm_read_c0_guest_status(cop0) & ST0_EXL) == 0) {
/* save old pc */ /* save old pc */
@ -1884,7 +1873,7 @@ enum emulation_result kvm_mips_emulate_tlbmod(unsigned long cause,
/* Blow away the shadow host TLBs */ /* Blow away the shadow host TLBs */
kvm_mips_flush_host_tlb(1); kvm_mips_flush_host_tlb(1);
return er; return EMULATE_DONE;
} }
enum emulation_result kvm_mips_emulate_fpu_exc(unsigned long cause, enum emulation_result kvm_mips_emulate_fpu_exc(unsigned long cause,
@ -1894,7 +1883,6 @@ enum emulation_result kvm_mips_emulate_fpu_exc(unsigned long cause,
{ {
struct mips_coproc *cop0 = vcpu->arch.cop0; struct mips_coproc *cop0 = vcpu->arch.cop0;
struct kvm_vcpu_arch *arch = &vcpu->arch; struct kvm_vcpu_arch *arch = &vcpu->arch;
enum emulation_result er = EMULATE_DONE;
if ((kvm_read_c0_guest_status(cop0) & ST0_EXL) == 0) { if ((kvm_read_c0_guest_status(cop0) & ST0_EXL) == 0) {
/* save old pc */ /* save old pc */
@ -1914,7 +1902,7 @@ enum emulation_result kvm_mips_emulate_fpu_exc(unsigned long cause,
(T_COP_UNUSABLE << CAUSEB_EXCCODE)); (T_COP_UNUSABLE << CAUSEB_EXCCODE));
kvm_change_c0_guest_cause(cop0, (CAUSEF_CE), (0x1 << CAUSEB_CE)); kvm_change_c0_guest_cause(cop0, (CAUSEF_CE), (0x1 << CAUSEB_CE));
return er; return EMULATE_DONE;
} }
enum emulation_result kvm_mips_emulate_ri_exc(unsigned long cause, enum emulation_result kvm_mips_emulate_ri_exc(unsigned long cause,

4
arch/mips/kvm/kvm_mips_stats.c
View File

@ -63,7 +63,7 @@ char *kvm_cop0_str[N_MIPS_COPROC_REGS] = {
"DESAVE" "DESAVE"
}; };
int kvm_mips_dump_stats(struct kvm_vcpu *vcpu) void kvm_mips_dump_stats(struct kvm_vcpu *vcpu)
{ {
#ifdef CONFIG_KVM_MIPS_DEBUG_COP0_COUNTERS #ifdef CONFIG_KVM_MIPS_DEBUG_COP0_COUNTERS
int i, j; int i, j;
@ -77,6 +77,4 @@ int kvm_mips_dump_stats(struct kvm_vcpu *vcpu)
} }
} }
#endif #endif
return 0;
} }