From 7626e20e3f1724211d3cae03704f33ec839984ee Mon Sep 17 00:00:00 2001 From: nayden Date: Wed, 11 Jul 2018 18:04:18 +0000 Subject: [PATCH] adding __func__ identifier to panic() calls in vmm.c for amd64 and i386 ok mlarkin@ --- sys/arch/amd64/amd64/vmm.c | 14 +++++++------- sys/arch/i386/i386/vmm.c | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sys/arch/amd64/amd64/vmm.c b/sys/arch/amd64/amd64/vmm.c index a5f780be96a..1b67245908e 100644 --- a/sys/arch/amd64/amd64/vmm.c +++ b/sys/arch/amd64/amd64/vmm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmm.c,v 1.213 2018/07/11 13:19:42 mlarkin Exp $ */ +/* $OpenBSD: vmm.c,v 1.214 2018/07/11 18:04:18 nayden Exp $ */ /* * Copyright (c) 2014 Mike Larkin * @@ -1287,7 +1287,7 @@ vm_impl_init(struct vm *vm, struct proc *p) vmm_softc->mode == VMM_MODE_RVI) return vm_impl_init_svm(vm, p); else - panic("unknown vmm mode"); + panic("%s: unknown vmm mode: %d", __func__, vmm_softc->mode); } /* @@ -1336,7 +1336,7 @@ vm_impl_deinit(struct vm *vm) vmm_softc->mode == VMM_MODE_RVI) vm_impl_deinit_svm(vm); else - panic("unknown vmm mode"); + panic("%s: unknown vmm mode: %d", __func__, vmm_softc->mode); } /* @@ -3023,7 +3023,7 @@ vcpu_reset_regs(struct vcpu *vcpu, struct vcpu_reg_state *vrs) vmm_softc->mode == VMM_MODE_RVI) ret = vcpu_reset_regs_svm(vcpu, vrs); else - panic("unknown vmm mode"); + panic("%s: unknown vmm mode: %d", __func__, vmm_softc->mode); return (ret); } @@ -3169,7 +3169,7 @@ vcpu_init(struct vcpu *vcpu) vmm_softc->mode == VMM_MODE_RVI) ret = vcpu_init_svm(vcpu); else - panic("unknown vmm mode"); + panic("%s: unknown vmm mode: %d", __func__, vmm_softc->mode); return (ret); } @@ -3247,7 +3247,7 @@ vcpu_deinit(struct vcpu *vcpu) vmm_softc->mode == VMM_MODE_RVI) vcpu_deinit_svm(vcpu); else - panic("unknown vmm mode"); + panic("%s: unknown vmm mode: %d", __func__, vmm_softc->mode); } /* @@ -4762,7 +4762,7 @@ vmm_get_guest_faulttype(void) else if (vmm_softc->mode == VMM_MODE_RVI) return vmx_get_guest_faulttype(); else - panic("unknown vmm mode"); + panic("%s: unknown vmm mode: %d", __func__, vmm_softc->mode); } /* diff --git a/sys/arch/i386/i386/vmm.c b/sys/arch/i386/i386/vmm.c index c6083019b0a..e271cb424c3 100644 --- a/sys/arch/i386/i386/vmm.c +++ b/sys/arch/i386/i386/vmm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmm.c,v 1.39 2018/05/24 07:27:41 mlarkin Exp $ */ +/* $OpenBSD: vmm.c,v 1.40 2018/07/11 18:04:18 nayden Exp $ */ /* * Copyright (c) 2014 Mike Larkin * @@ -669,7 +669,7 @@ vm_rwregs(struct vm_rwregs_params *vrwp, int dir) vcpu_readregs_svm(vcpu, vrwp->vrwp_mask, vrs) : vcpu_writeregs_svm(vcpu, vrwp->vrwp_mask, vrs); else - panic("unknown vmm mode"); + panic("%s: unknown vmm mode: %d", __func__, vmm_softc->mode); } /* @@ -1236,7 +1236,7 @@ vm_impl_init(struct vm *vm, struct proc *p) vmm_softc->mode == VMM_MODE_RVI) return vm_impl_init_svm(vm, p); else - panic("unknown vmm mode"); + panic("%s: unknown vmm mode: %d", __func__, vmm_softc->mode); } /* @@ -1276,7 +1276,7 @@ vm_impl_deinit(struct vm *vm) vmm_softc->mode == VMM_MODE_RVI) vm_impl_deinit_svm(vm); else - panic("unknown vmm mode"); + panic("%s: unknown vmm mode: %d", __func__, vmm_softc->mode); } /* @@ -2592,7 +2592,7 @@ vcpu_reset_regs(struct vcpu *vcpu, struct vcpu_reg_state *vrs) vmm_softc->mode == VMM_MODE_RVI) ret = vcpu_reset_regs_svm(vcpu, vrs); else - panic("unknown vmm mode"); + panic("%s: unknown vmm mode: %d", __func__, vmm_softc->mode); return (ret); } @@ -2737,7 +2737,7 @@ vcpu_init(struct vcpu *vcpu) vmm_softc->mode == VMM_MODE_RVI) ret = vcpu_init_svm(vcpu); else - panic("unknown vmm mode"); + panic("%s: unknown vmm mode: %d", __func__, vmm_softc->mode); return (ret); } @@ -2810,7 +2810,7 @@ vcpu_deinit(struct vcpu *vcpu) vmm_softc->mode == VMM_MODE_RVI) vcpu_deinit_svm(vcpu); else - panic("unknown vmm mode"); + panic("%s: unknown vmm mode: %d", __func__, vmm_softc->mode); } /* @@ -3885,7 +3885,7 @@ vmm_get_guest_faulttype(void) else if (vmm_softc->mode == VMM_MODE_RVI) return vmx_get_guest_faulttype(); else - panic("unknown vmm mode"); + panic("%s: unknown vmm mode: %d", __func__, vmm_softc->mode); } /* -- 2.20.1