Date: Thu, 23 Jul 2015 18:22:28 GMT From: mihai@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r288704 - in soc2015/mihai/bhyve-on-arm-head: sys/arm/vmm usr.sbin/bhyvearm Message-ID: <201507231822.t6NIMSLe059823@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mihai Date: Thu Jul 23 18:22:28 2015 New Revision: 288704 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288704 Log: soc2015: mihai: bhyve: remove some debug printfs Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/vmm.c soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/vmm_instruction_emul.c soc2015/mihai/bhyve-on-arm-head/usr.sbin/bhyvearm/bhyverun.c Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c Thu Jul 23 18:08:09 2015 (r288703) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c Thu Jul 23 18:22:28 2015 (r288704) @@ -373,9 +373,9 @@ vmexit->u.inst_emul.vie.dir = HSR_ISS_WnR(hsr_iss); vmexit->u.inst_emul.vie.reg = get_vm_reg_name(HSR_ISS_SRT(hsr_iss), vmexit->u.hyp.mode); - printf("%s:%d gpa: %llx, as: %d, se: %d, dir: %d, reg: %d\n",__func__, __LINE__, - vmexit->u.inst_emul.gpa, vmexit->u.inst_emul.vie.access_size, vmexit->u.inst_emul.vie.sign_extend, - vmexit->u.inst_emul.vie.dir, vmexit->u.inst_emul.vie.reg); +// printf("%s:%d gpa: %llx, as: %d, se: %d, dir: %d, reg: %d\n",__func__, __LINE__, +// vmexit->u.inst_emul.gpa, vmexit->u.inst_emul.vie.access_size, vmexit->u.inst_emul.vie.sign_extend, +// vmexit->u.inst_emul.vie.dir, vmexit->u.inst_emul.vie.reg); } else { printf("%s:%d DABT from guest at address %x witho a stage-2 fault != translation\n", @@ -420,10 +420,10 @@ case EXCEPTION_PABT: case EXCEPTION_DABT: case EXCEPTION_HVC: - printf("%s PABT/DABT/HYP exception\n",__func__); - printf("%s HSR: %x, HIFAR: %x, HDFAR: %x, HPFAR: %x\n", __func__, - vmexit->u.hyp.hsr, vmexit->u.hyp.hifar, - vmexit->u.hyp.hdfar, vmexit->u.hyp.hpfar); +// printf("%s PABT/DABT/HYP exception\n",__func__); +// printf("%s HSR: %x, HIFAR: %x, HDFAR: %x, HPFAR: %x\n", __func__, +// vmexit->u.hyp.hsr, vmexit->u.hyp.hifar, +// vmexit->u.hyp.hdfar, vmexit->u.hyp.hpfar); vmexit->exitcode = VM_EXITCODE_HYP; handled = hyp_handle_exception(vmexit); @@ -471,17 +471,14 @@ vmexit->pc = hypctx->regs.r_pc; vmexit->u.hyp.exception_nr = rc; + vmexit->inst_length = HSR_IL(hypctx->exit_info.hsr) ? 4 : 2; + vmexit->u.hyp.hsr = hypctx->exit_info.hsr; vmexit->u.hyp.hifar = hypctx->exit_info.hifar; vmexit->u.hyp.hdfar = hypctx->exit_info.hdfar; vmexit->u.hyp.hpfar = hypctx->exit_info.hpfar; vmexit->u.hyp.mode = hypctx->regs.r_cpsr & PSR_MODE; - if (HSR_IL(vmexit->u.hyp.hsr)) - vmexit->inst_length = 4; - else - vmexit->inst_length = 2; - handled = hyp_exit_process(hyp, vcpu, vmexit); } while(handled); Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/vmm.c ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/vmm.c Thu Jul 23 18:08:09 2015 (r288703) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/vmm.c Thu Jul 23 18:22:28 2015 (r288704) @@ -287,14 +287,14 @@ vcpu = &vm->vcpu[vcpuid]; vme = &vcpu->exitinfo; - printf("%s vcpuid: %d, nextpc: %x\n",__func__, vcpuid, pc); +// printf("%s vcpuid: %d, nextpc: %x\n",__func__, vcpuid, pc); restart: critical_enter(); error = VMRUN(vm->cookie, vcpuid, pc, NULL, rptr, sptr); - printf("%s VMRUN error: %d\n",__func__, error); +// printf("%s VMRUN error: %d\n",__func__, error); critical_exit(); Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/vmm_instruction_emul.c ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/vmm_instruction_emul.c Thu Jul 23 18:08:09 2015 (r288703) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/vmm_instruction_emul.c Thu Jul 23 18:22:28 2015 (r288704) @@ -31,15 +31,12 @@ uint64_t val; if(vie->dir) { - printf("%s write\n",__func__); error = vm_get_register(vm, vcpuid, vie->reg, &val); if (error) goto out; error = memwrite(vm, vcpuid, gpa, val, vie->access_size, memarg); } else { - printf("%s read\n",__func__); - error = memread(vm, vcpuid, gpa, &val, vie->access_size, memarg); if (error) goto out; Modified: soc2015/mihai/bhyve-on-arm-head/usr.sbin/bhyvearm/bhyverun.c ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/usr.sbin/bhyvearm/bhyverun.c Thu Jul 23 18:08:09 2015 (r288703) +++ soc2015/mihai/bhyve-on-arm-head/usr.sbin/bhyvearm/bhyverun.c Thu Jul 23 18:22:28 2015 (r288704) @@ -67,7 +67,6 @@ int guest_ncpus; static int pincpu = -1; -static int guest_vmexit_on_hlt, guest_vmexit_on_pause; static int foundcpus; @@ -114,20 +113,6 @@ return (vm_map_gpa(ctx, gaddr, len)); } -int -fbsdrun_vmexit_on_pause(void) -{ - - return (guest_vmexit_on_pause); -} - -int -fbsdrun_vmexit_on_hlt(void) -{ - - return (guest_vmexit_on_hlt); -} - static void * fbsdrun_start_thread(void *param) { @@ -141,10 +126,7 @@ snprintf(tname, sizeof(tname), "%s vcpu %d", vmname, vcpu); pthread_set_name_np(mtp->mt_thr, tname); - printf("%s %s\n",__func__, tname); - vm_loop(mtp->mt_ctx, vcpu, vmexit[vcpu].pc); - printf("%s %s aftervm_loop\n",__func__, tname); /* not reached */ exit(1); @@ -258,12 +240,9 @@ sizeof(mask), &mask); assert(error == 0); } - printf("%s\n",__func__); while (1) { - printf("%s 2\n",__func__); error = vm_run(ctx, vcpu, pc, &vmexit[vcpu]); - printf("%s 3\n",__func__); if (error != 0) { /* @@ -338,12 +317,6 @@ case 'c': guest_ncpus = atoi(optarg); break; - case 'H': - guest_vmexit_on_hlt = 1; - break; - case 'P': - guest_vmexit_on_pause = 1; - break; case 'h': usage(0); default: @@ -378,7 +351,6 @@ error = vm_get_register(ctx, BSP, VM_REG_GUEST_PC, &pc); assert(error == 0); - printf("%s pc: %llx\n",__func__, pc); /* * Add CPU 0 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507231822.t6NIMSLe059823>