diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c index d4fc81f31e..f46e34619f 100644 --- a/xen/arch/x86/hvm/svm/nestedsvm.c +++ b/xen/arch/x86/hvm/svm/nestedsvm.c @@ -1406,6 +1406,8 @@ nestedsvm_check_intercepts(struct vcpu *v, struct cpu_user_regs *regs, /* Always let the guest handle VMMCALL/VMCALL */ return NESTEDHVM_VMEXIT_INJECT; default: + gprintk(XENLOG_ERR, "Unexpected nested vmexit: reason %#"PRIx64"\n", + exitcode); break; } diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 07e971801d..178adc56b4 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2833,10 +2833,9 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) default: unexpected_exit_type: - gdprintk(XENLOG_ERR, "unexpected VMEXIT: exit reason = %#"PRIx64", " - "exitinfo1 = %#"PRIx64", exitinfo2 = %#"PRIx64"\n", - exit_reason, - (u64)vmcb->exitinfo1, (u64)vmcb->exitinfo2); + gprintk(XENLOG_ERR, "Unexpected vmexit: reason %#"PRIx64", " + "exitinfo1 %#"PRIx64", exitinfo2 %#"PRIx64"\n", + exit_reason, vmcb->exitinfo1, vmcb->exitinfo2); svm_crash_or_fault(v); break; } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f8d3c17600..c8ef18a686 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -4106,7 +4106,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) /* fall through */ default: exit_and_crash: - gdprintk(XENLOG_WARNING, "Bad vmexit (reason %#lx)\n", exit_reason); + gprintk(XENLOG_ERR, "Unexpected vmexit: reason %lu\n", exit_reason); if ( vmx_get_cpl() ) hvm_inject_hw_exception(TRAP_invalid_op, diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 936feb6a21..3560faec6d 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -2550,8 +2550,8 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, nvcpu->nv_vmexit_pending = 1; break; default: - gdprintk(XENLOG_WARNING, "Unknown nested vmexit reason %x.\n", - exit_reason); + gprintk(XENLOG_ERR, "Unexpected nested vmexit: reason %u\n", + exit_reason); } return ( nvcpu->nv_vmexit_pending == 1 );