diff options
author | Deng-Cheng Zhu <dengcheng.zhu@imgtec.com> | 2014-06-26 15:11:35 -0400 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-06-30 10:52:02 -0400 |
commit | 6ad78a5c75c5bcfdac4551f7d09b777b3dc3c19c (patch) | |
tree | 63b2a0178cc1e29a97b0df00255d63fe7e8a0e40 /arch/mips/kvm/kvm_mips_emul.c | |
parent | d116e812f9026e3cca46ce1009e577afec62916d (diff) |
MIPS: KVM: Use KVM internal logger
Replace printks with kvm_[err|info|debug].
Signed-off-by: Deng-Cheng Zhu <dengcheng.zhu@imgtec.com>
Reviewed-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/mips/kvm/kvm_mips_emul.c')
-rw-r--r-- | arch/mips/kvm/kvm_mips_emul.c | 107 |
1 files changed, 52 insertions, 55 deletions
diff --git a/arch/mips/kvm/kvm_mips_emul.c b/arch/mips/kvm/kvm_mips_emul.c index 9ec9f1d54b9b..bdd1421b78fc 100644 --- a/arch/mips/kvm/kvm_mips_emul.c +++ b/arch/mips/kvm/kvm_mips_emul.c | |||
@@ -183,18 +183,18 @@ unsigned long kvm_compute_return_epc(struct kvm_vcpu *vcpu, | |||
183 | 183 | ||
184 | /* And now the FPA/cp1 branch instructions. */ | 184 | /* And now the FPA/cp1 branch instructions. */ |
185 | case cop1_op: | 185 | case cop1_op: |
186 | printk("%s: unsupported cop1_op\n", __func__); | 186 | kvm_err("%s: unsupported cop1_op\n", __func__); |
187 | break; | 187 | break; |
188 | } | 188 | } |
189 | 189 | ||
190 | return nextpc; | 190 | return nextpc; |
191 | 191 | ||
192 | unaligned: | 192 | unaligned: |
193 | printk("%s: unaligned epc\n", __func__); | 193 | kvm_err("%s: unaligned epc\n", __func__); |
194 | return nextpc; | 194 | return nextpc; |
195 | 195 | ||
196 | sigill: | 196 | sigill: |
197 | printk("%s: DSP branch but not DSP ASE\n", __func__); | 197 | kvm_err("%s: DSP branch but not DSP ASE\n", __func__); |
198 | return nextpc; | 198 | return nextpc; |
199 | } | 199 | } |
200 | 200 | ||
@@ -751,8 +751,8 @@ enum emulation_result kvm_mips_emul_eret(struct kvm_vcpu *vcpu) | |||
751 | kvm_clear_c0_guest_status(cop0, ST0_ERL); | 751 | kvm_clear_c0_guest_status(cop0, ST0_ERL); |
752 | vcpu->arch.pc = kvm_read_c0_guest_errorepc(cop0); | 752 | vcpu->arch.pc = kvm_read_c0_guest_errorepc(cop0); |
753 | } else { | 753 | } else { |
754 | printk("[%#lx] ERET when MIPS_SR_EXL|MIPS_SR_ERL == 0\n", | 754 | kvm_err("[%#lx] ERET when MIPS_SR_EXL|MIPS_SR_ERL == 0\n", |
755 | vcpu->arch.pc); | 755 | vcpu->arch.pc); |
756 | er = EMULATE_FAIL; | 756 | er = EMULATE_FAIL; |
757 | } | 757 | } |
758 | 758 | ||
@@ -795,7 +795,7 @@ enum emulation_result kvm_mips_emul_tlbr(struct kvm_vcpu *vcpu) | |||
795 | enum emulation_result er = EMULATE_FAIL; | 795 | enum emulation_result er = EMULATE_FAIL; |
796 | uint32_t pc = vcpu->arch.pc; | 796 | uint32_t pc = vcpu->arch.pc; |
797 | 797 | ||
798 | printk("[%#x] COP0_TLBR [%ld]\n", pc, kvm_read_c0_guest_index(cop0)); | 798 | kvm_err("[%#x] COP0_TLBR [%ld]\n", pc, kvm_read_c0_guest_index(cop0)); |
799 | return er; | 799 | return er; |
800 | } | 800 | } |
801 | 801 | ||
@@ -809,13 +809,12 @@ enum emulation_result kvm_mips_emul_tlbwi(struct kvm_vcpu *vcpu) | |||
809 | uint32_t pc = vcpu->arch.pc; | 809 | uint32_t pc = vcpu->arch.pc; |
810 | 810 | ||
811 | if (index < 0 || index >= KVM_MIPS_GUEST_TLB_SIZE) { | 811 | if (index < 0 || index >= KVM_MIPS_GUEST_TLB_SIZE) { |
812 | printk("%s: illegal index: %d\n", __func__, index); | 812 | kvm_debug("%s: illegal index: %d\n", __func__, index); |
813 | printk | 813 | kvm_debug("[%#x] COP0_TLBWI [%d] (entryhi: %#lx, entrylo0: %#lx entrylo1: %#lx, mask: %#lx)\n", |
814 | ("[%#x] COP0_TLBWI [%d] (entryhi: %#lx, entrylo0: %#lx entrylo1: %#lx, mask: %#lx)\n", | 814 | pc, index, kvm_read_c0_guest_entryhi(cop0), |
815 | pc, index, kvm_read_c0_guest_entryhi(cop0), | 815 | kvm_read_c0_guest_entrylo0(cop0), |
816 | kvm_read_c0_guest_entrylo0(cop0), | 816 | kvm_read_c0_guest_entrylo1(cop0), |
817 | kvm_read_c0_guest_entrylo1(cop0), | 817 | kvm_read_c0_guest_pagemask(cop0)); |
818 | kvm_read_c0_guest_pagemask(cop0)); | ||
819 | index = (index & ~0x80000000) % KVM_MIPS_GUEST_TLB_SIZE; | 818 | index = (index & ~0x80000000) % KVM_MIPS_GUEST_TLB_SIZE; |
820 | } | 819 | } |
821 | 820 | ||
@@ -853,7 +852,7 @@ enum emulation_result kvm_mips_emul_tlbwr(struct kvm_vcpu *vcpu) | |||
853 | index &= (KVM_MIPS_GUEST_TLB_SIZE - 1); | 852 | index &= (KVM_MIPS_GUEST_TLB_SIZE - 1); |
854 | 853 | ||
855 | if (index < 0 || index >= KVM_MIPS_GUEST_TLB_SIZE) { | 854 | if (index < 0 || index >= KVM_MIPS_GUEST_TLB_SIZE) { |
856 | printk("%s: illegal index: %d\n", __func__, index); | 855 | kvm_err("%s: illegal index: %d\n", __func__, index); |
857 | return EMULATE_FAIL; | 856 | return EMULATE_FAIL; |
858 | } | 857 | } |
859 | 858 | ||
@@ -938,7 +937,7 @@ enum emulation_result kvm_mips_emulate_CP0(uint32_t inst, uint32_t *opc, | |||
938 | er = kvm_mips_emul_tlbp(vcpu); | 937 | er = kvm_mips_emul_tlbp(vcpu); |
939 | break; | 938 | break; |
940 | case rfe_op: | 939 | case rfe_op: |
941 | printk("!!!COP0_RFE!!!\n"); | 940 | kvm_err("!!!COP0_RFE!!!\n"); |
942 | break; | 941 | break; |
943 | case eret_op: | 942 | case eret_op: |
944 | er = kvm_mips_emul_eret(vcpu); | 943 | er = kvm_mips_emul_eret(vcpu); |
@@ -987,8 +986,8 @@ enum emulation_result kvm_mips_emulate_CP0(uint32_t inst, uint32_t *opc, | |||
987 | if ((rd == MIPS_CP0_TLB_INDEX) | 986 | if ((rd == MIPS_CP0_TLB_INDEX) |
988 | && (vcpu->arch.gprs[rt] >= | 987 | && (vcpu->arch.gprs[rt] >= |
989 | KVM_MIPS_GUEST_TLB_SIZE)) { | 988 | KVM_MIPS_GUEST_TLB_SIZE)) { |
990 | printk("Invalid TLB Index: %ld", | 989 | kvm_err("Invalid TLB Index: %ld", |
991 | vcpu->arch.gprs[rt]); | 990 | vcpu->arch.gprs[rt]); |
992 | er = EMULATE_FAIL; | 991 | er = EMULATE_FAIL; |
993 | break; | 992 | break; |
994 | } | 993 | } |
@@ -998,8 +997,8 @@ enum emulation_result kvm_mips_emulate_CP0(uint32_t inst, uint32_t *opc, | |||
998 | kvm_change_c0_guest_ebase(cop0, | 997 | kvm_change_c0_guest_ebase(cop0, |
999 | ~(C0_EBASE_CORE_MASK), | 998 | ~(C0_EBASE_CORE_MASK), |
1000 | vcpu->arch.gprs[rt]); | 999 | vcpu->arch.gprs[rt]); |
1001 | printk("MTCz, cop0->reg[EBASE]: %#lx\n", | 1000 | kvm_err("MTCz, cop0->reg[EBASE]: %#lx\n", |
1002 | kvm_read_c0_guest_ebase(cop0)); | 1001 | kvm_read_c0_guest_ebase(cop0)); |
1003 | } else if (rd == MIPS_CP0_TLB_HI && sel == 0) { | 1002 | } else if (rd == MIPS_CP0_TLB_HI && sel == 0) { |
1004 | uint32_t nasid = | 1003 | uint32_t nasid = |
1005 | vcpu->arch.gprs[rt] & ASID_MASK; | 1004 | vcpu->arch.gprs[rt] & ASID_MASK; |
@@ -1072,9 +1071,8 @@ enum emulation_result kvm_mips_emulate_CP0(uint32_t inst, uint32_t *opc, | |||
1072 | break; | 1071 | break; |
1073 | 1072 | ||
1074 | case dmtc_op: | 1073 | case dmtc_op: |
1075 | printk | 1074 | kvm_err("!!!!!!![%#lx]dmtc_op: rt: %d, rd: %d, sel: %d!!!!!!\n", |
1076 | ("!!!!!!![%#lx]dmtc_op: rt: %d, rd: %d, sel: %d!!!!!!\n", | 1075 | vcpu->arch.pc, rt, rd, sel); |
1077 | vcpu->arch.pc, rt, rd, sel); | ||
1078 | er = EMULATE_FAIL; | 1076 | er = EMULATE_FAIL; |
1079 | break; | 1077 | break; |
1080 | 1078 | ||
@@ -1119,9 +1117,8 @@ enum emulation_result kvm_mips_emulate_CP0(uint32_t inst, uint32_t *opc, | |||
1119 | } | 1117 | } |
1120 | break; | 1118 | break; |
1121 | default: | 1119 | default: |
1122 | printk | 1120 | kvm_err("[%#lx]MachEmulateCP0: unsupported COP0, copz: 0x%x\n", |
1123 | ("[%#lx]MachEmulateCP0: unsupported COP0, copz: 0x%x\n", | 1121 | vcpu->arch.pc, copz); |
1124 | vcpu->arch.pc, copz); | ||
1125 | er = EMULATE_FAIL; | 1122 | er = EMULATE_FAIL; |
1126 | break; | 1123 | break; |
1127 | } | 1124 | } |
@@ -1242,7 +1239,7 @@ enum emulation_result kvm_mips_emulate_store(uint32_t inst, uint32_t cause, | |||
1242 | break; | 1239 | break; |
1243 | 1240 | ||
1244 | default: | 1241 | default: |
1245 | printk("Store not yet supported"); | 1242 | kvm_err("Store not yet supported"); |
1246 | er = EMULATE_FAIL; | 1243 | er = EMULATE_FAIL; |
1247 | break; | 1244 | break; |
1248 | } | 1245 | } |
@@ -1351,7 +1348,7 @@ enum emulation_result kvm_mips_emulate_load(uint32_t inst, uint32_t cause, | |||
1351 | break; | 1348 | break; |
1352 | 1349 | ||
1353 | default: | 1350 | default: |
1354 | printk("Load not yet supported"); | 1351 | kvm_err("Load not yet supported"); |
1355 | er = EMULATE_FAIL; | 1352 | er = EMULATE_FAIL; |
1356 | break; | 1353 | break; |
1357 | } | 1354 | } |
@@ -1370,7 +1367,7 @@ int kvm_mips_sync_icache(unsigned long va, struct kvm_vcpu *vcpu) | |||
1370 | gfn = va >> PAGE_SHIFT; | 1367 | gfn = va >> PAGE_SHIFT; |
1371 | 1368 | ||
1372 | if (gfn >= kvm->arch.guest_pmap_npages) { | 1369 | if (gfn >= kvm->arch.guest_pmap_npages) { |
1373 | printk("%s: Invalid gfn: %#llx\n", __func__, gfn); | 1370 | kvm_err("%s: Invalid gfn: %#llx\n", __func__, gfn); |
1374 | kvm_mips_dump_host_tlbs(); | 1371 | kvm_mips_dump_host_tlbs(); |
1375 | kvm_arch_vcpu_dump_regs(vcpu); | 1372 | kvm_arch_vcpu_dump_regs(vcpu); |
1376 | return -1; | 1373 | return -1; |
@@ -1378,7 +1375,8 @@ int kvm_mips_sync_icache(unsigned long va, struct kvm_vcpu *vcpu) | |||
1378 | pfn = kvm->arch.guest_pmap[gfn]; | 1375 | pfn = kvm->arch.guest_pmap[gfn]; |
1379 | pa = (pfn << PAGE_SHIFT) | offset; | 1376 | pa = (pfn << PAGE_SHIFT) | offset; |
1380 | 1377 | ||
1381 | printk("%s: va: %#lx, unmapped: %#x\n", __func__, va, CKSEG0ADDR(pa)); | 1378 | kvm_debug("%s: va: %#lx, unmapped: %#x\n", __func__, va, |
1379 | CKSEG0ADDR(pa)); | ||
1382 | 1380 | ||
1383 | local_flush_icache_range(CKSEG0ADDR(pa), 32); | 1381 | local_flush_icache_range(CKSEG0ADDR(pa), 32); |
1384 | return 0; | 1382 | return 0; |
@@ -1444,8 +1442,8 @@ enum emulation_result kvm_mips_emulate_cache(uint32_t inst, uint32_t *opc, | |||
1444 | else if (cache == MIPS_CACHE_ICACHE) | 1442 | else if (cache == MIPS_CACHE_ICACHE) |
1445 | r4k_blast_icache(); | 1443 | r4k_blast_icache(); |
1446 | else { | 1444 | else { |
1447 | printk("%s: unsupported CACHE INDEX operation\n", | 1445 | kvm_err("%s: unsupported CACHE INDEX operation\n", |
1448 | __func__); | 1446 | __func__); |
1449 | return EMULATE_FAIL; | 1447 | return EMULATE_FAIL; |
1450 | } | 1448 | } |
1451 | 1449 | ||
@@ -1504,9 +1502,8 @@ enum emulation_result kvm_mips_emulate_cache(uint32_t inst, uint32_t *opc, | |||
1504 | } | 1502 | } |
1505 | } | 1503 | } |
1506 | } else { | 1504 | } else { |
1507 | printk | 1505 | kvm_err("INVALID CACHE INDEX/ADDRESS (cache: %#x, op: %#x, base[%d]: %#lx, offset: %#x\n", |
1508 | ("INVALID CACHE INDEX/ADDRESS (cache: %#x, op: %#x, base[%d]: %#lx, offset: %#x\n", | 1506 | cache, op, base, arch->gprs[base], offset); |
1509 | cache, op, base, arch->gprs[base], offset); | ||
1510 | er = EMULATE_FAIL; | 1507 | er = EMULATE_FAIL; |
1511 | preempt_enable(); | 1508 | preempt_enable(); |
1512 | goto dont_update_pc; | 1509 | goto dont_update_pc; |
@@ -1536,9 +1533,8 @@ skip_fault: | |||
1536 | kvm_mips_trans_cache_va(inst, opc, vcpu); | 1533 | kvm_mips_trans_cache_va(inst, opc, vcpu); |
1537 | #endif | 1534 | #endif |
1538 | } else { | 1535 | } else { |
1539 | printk | 1536 | kvm_err("NO-OP CACHE (cache: %#x, op: %#x, base[%d]: %#lx, offset: %#x\n", |
1540 | ("NO-OP CACHE (cache: %#x, op: %#x, base[%d]: %#lx, offset: %#x\n", | 1537 | cache, op, base, arch->gprs[base], offset); |
1541 | cache, op, base, arch->gprs[base], offset); | ||
1542 | er = EMULATE_FAIL; | 1538 | er = EMULATE_FAIL; |
1543 | preempt_enable(); | 1539 | preempt_enable(); |
1544 | goto dont_update_pc; | 1540 | goto dont_update_pc; |
@@ -1590,8 +1586,8 @@ enum emulation_result kvm_mips_emulate_inst(unsigned long cause, uint32_t *opc, | |||
1590 | break; | 1586 | break; |
1591 | 1587 | ||
1592 | default: | 1588 | default: |
1593 | printk("Instruction emulation not supported (%p/%#x)\n", opc, | 1589 | kvm_err("Instruction emulation not supported (%p/%#x)\n", opc, |
1594 | inst); | 1590 | inst); |
1595 | kvm_arch_vcpu_dump_regs(vcpu); | 1591 | kvm_arch_vcpu_dump_regs(vcpu); |
1596 | er = EMULATE_FAIL; | 1592 | er = EMULATE_FAIL; |
1597 | break; | 1593 | break; |
@@ -1628,7 +1624,7 @@ enum emulation_result kvm_mips_emulate_syscall(unsigned long cause, | |||
1628 | arch->pc = KVM_GUEST_KSEG0 + 0x180; | 1624 | arch->pc = KVM_GUEST_KSEG0 + 0x180; |
1629 | 1625 | ||
1630 | } else { | 1626 | } else { |
1631 | printk("Trying to deliver SYSCALL when EXL is already set\n"); | 1627 | kvm_err("Trying to deliver SYSCALL when EXL is already set\n"); |
1632 | er = EMULATE_FAIL; | 1628 | er = EMULATE_FAIL; |
1633 | } | 1629 | } |
1634 | 1630 | ||
@@ -1984,7 +1980,7 @@ enum emulation_result kvm_mips_emulate_bp_exc(unsigned long cause, | |||
1984 | arch->pc = KVM_GUEST_KSEG0 + 0x180; | 1980 | arch->pc = KVM_GUEST_KSEG0 + 0x180; |
1985 | 1981 | ||
1986 | } else { | 1982 | } else { |
1987 | printk("Trying to deliver BP when EXL is already set\n"); | 1983 | kvm_err("Trying to deliver BP when EXL is already set\n"); |
1988 | er = EMULATE_FAIL; | 1984 | er = EMULATE_FAIL; |
1989 | } | 1985 | } |
1990 | 1986 | ||
@@ -2032,7 +2028,7 @@ enum emulation_result kvm_mips_handle_ri(unsigned long cause, uint32_t *opc, | |||
2032 | inst = kvm_get_inst(opc, vcpu); | 2028 | inst = kvm_get_inst(opc, vcpu); |
2033 | 2029 | ||
2034 | if (inst == KVM_INVALID_INST) { | 2030 | if (inst == KVM_INVALID_INST) { |
2035 | printk("%s: Cannot get inst @ %p\n", __func__, opc); | 2031 | kvm_err("%s: Cannot get inst @ %p\n", __func__, opc); |
2036 | return EMULATE_FAIL; | 2032 | return EMULATE_FAIL; |
2037 | } | 2033 | } |
2038 | 2034 | ||
@@ -2099,7 +2095,7 @@ enum emulation_result kvm_mips_complete_mmio_load(struct kvm_vcpu *vcpu, | |||
2099 | unsigned long curr_pc; | 2095 | unsigned long curr_pc; |
2100 | 2096 | ||
2101 | if (run->mmio.len > sizeof(*gpr)) { | 2097 | if (run->mmio.len > sizeof(*gpr)) { |
2102 | printk("Bad MMIO length: %d", run->mmio.len); | 2098 | kvm_err("Bad MMIO length: %d", run->mmio.len); |
2103 | er = EMULATE_FAIL; | 2099 | er = EMULATE_FAIL; |
2104 | goto done; | 2100 | goto done; |
2105 | } | 2101 | } |
@@ -2173,7 +2169,7 @@ static enum emulation_result kvm_mips_emulate_exc(unsigned long cause, | |||
2173 | exccode, kvm_read_c0_guest_epc(cop0), | 2169 | exccode, kvm_read_c0_guest_epc(cop0), |
2174 | kvm_read_c0_guest_badvaddr(cop0)); | 2170 | kvm_read_c0_guest_badvaddr(cop0)); |
2175 | } else { | 2171 | } else { |
2176 | printk("Trying to deliver EXC when EXL is already set\n"); | 2172 | kvm_err("Trying to deliver EXC when EXL is already set\n"); |
2177 | er = EMULATE_FAIL; | 2173 | er = EMULATE_FAIL; |
2178 | } | 2174 | } |
2179 | 2175 | ||
@@ -2213,8 +2209,8 @@ enum emulation_result kvm_mips_check_privilege(unsigned long cause, | |||
2213 | * address error exception to the guest | 2209 | * address error exception to the guest |
2214 | */ | 2210 | */ |
2215 | if (badvaddr >= (unsigned long) KVM_GUEST_KSEG0) { | 2211 | if (badvaddr >= (unsigned long) KVM_GUEST_KSEG0) { |
2216 | printk("%s: LD MISS @ %#lx\n", __func__, | 2212 | kvm_debug("%s: LD MISS @ %#lx\n", __func__, |
2217 | badvaddr); | 2213 | badvaddr); |
2218 | cause &= ~0xff; | 2214 | cause &= ~0xff; |
2219 | cause |= (T_ADDR_ERR_LD << CAUSEB_EXCCODE); | 2215 | cause |= (T_ADDR_ERR_LD << CAUSEB_EXCCODE); |
2220 | er = EMULATE_PRIV_FAIL; | 2216 | er = EMULATE_PRIV_FAIL; |
@@ -2227,8 +2223,8 @@ enum emulation_result kvm_mips_check_privilege(unsigned long cause, | |||
2227 | * address error exception to the guest | 2223 | * address error exception to the guest |
2228 | */ | 2224 | */ |
2229 | if (badvaddr >= (unsigned long) KVM_GUEST_KSEG0) { | 2225 | if (badvaddr >= (unsigned long) KVM_GUEST_KSEG0) { |
2230 | printk("%s: ST MISS @ %#lx\n", __func__, | 2226 | kvm_debug("%s: ST MISS @ %#lx\n", __func__, |
2231 | badvaddr); | 2227 | badvaddr); |
2232 | cause &= ~0xff; | 2228 | cause &= ~0xff; |
2233 | cause |= (T_ADDR_ERR_ST << CAUSEB_EXCCODE); | 2229 | cause |= (T_ADDR_ERR_ST << CAUSEB_EXCCODE); |
2234 | er = EMULATE_PRIV_FAIL; | 2230 | er = EMULATE_PRIV_FAIL; |
@@ -2236,8 +2232,8 @@ enum emulation_result kvm_mips_check_privilege(unsigned long cause, | |||
2236 | break; | 2232 | break; |
2237 | 2233 | ||
2238 | case T_ADDR_ERR_ST: | 2234 | case T_ADDR_ERR_ST: |
2239 | printk("%s: address error ST @ %#lx\n", __func__, | 2235 | kvm_debug("%s: address error ST @ %#lx\n", __func__, |
2240 | badvaddr); | 2236 | badvaddr); |
2241 | if ((badvaddr & PAGE_MASK) == KVM_GUEST_COMMPAGE_ADDR) { | 2237 | if ((badvaddr & PAGE_MASK) == KVM_GUEST_COMMPAGE_ADDR) { |
2242 | cause &= ~0xff; | 2238 | cause &= ~0xff; |
2243 | cause |= (T_TLB_ST_MISS << CAUSEB_EXCCODE); | 2239 | cause |= (T_TLB_ST_MISS << CAUSEB_EXCCODE); |
@@ -2245,8 +2241,8 @@ enum emulation_result kvm_mips_check_privilege(unsigned long cause, | |||
2245 | er = EMULATE_PRIV_FAIL; | 2241 | er = EMULATE_PRIV_FAIL; |
2246 | break; | 2242 | break; |
2247 | case T_ADDR_ERR_LD: | 2243 | case T_ADDR_ERR_LD: |
2248 | printk("%s: address error LD @ %#lx\n", __func__, | 2244 | kvm_debug("%s: address error LD @ %#lx\n", __func__, |
2249 | badvaddr); | 2245 | badvaddr); |
2250 | if ((badvaddr & PAGE_MASK) == KVM_GUEST_COMMPAGE_ADDR) { | 2246 | if ((badvaddr & PAGE_MASK) == KVM_GUEST_COMMPAGE_ADDR) { |
2251 | cause &= ~0xff; | 2247 | cause &= ~0xff; |
2252 | cause |= (T_TLB_LD_MISS << CAUSEB_EXCCODE); | 2248 | cause |= (T_TLB_LD_MISS << CAUSEB_EXCCODE); |
@@ -2301,7 +2297,8 @@ enum emulation_result kvm_mips_handle_tlbmiss(unsigned long cause, | |||
2301 | } else if (exccode == T_TLB_ST_MISS) { | 2297 | } else if (exccode == T_TLB_ST_MISS) { |
2302 | er = kvm_mips_emulate_tlbmiss_st(cause, opc, run, vcpu); | 2298 | er = kvm_mips_emulate_tlbmiss_st(cause, opc, run, vcpu); |
2303 | } else { | 2299 | } else { |
2304 | printk("%s: invalid exc code: %d\n", __func__, exccode); | 2300 | kvm_err("%s: invalid exc code: %d\n", __func__, |
2301 | exccode); | ||
2305 | er = EMULATE_FAIL; | 2302 | er = EMULATE_FAIL; |
2306 | } | 2303 | } |
2307 | } else { | 2304 | } else { |
@@ -2319,8 +2316,8 @@ enum emulation_result kvm_mips_handle_tlbmiss(unsigned long cause, | |||
2319 | er = kvm_mips_emulate_tlbinv_st(cause, opc, run, | 2316 | er = kvm_mips_emulate_tlbinv_st(cause, opc, run, |
2320 | vcpu); | 2317 | vcpu); |
2321 | } else { | 2318 | } else { |
2322 | printk("%s: invalid exc code: %d\n", __func__, | 2319 | kvm_err("%s: invalid exc code: %d\n", __func__, |
2323 | exccode); | 2320 | exccode); |
2324 | er = EMULATE_FAIL; | 2321 | er = EMULATE_FAIL; |
2325 | } | 2322 | } |
2326 | } else { | 2323 | } else { |