[src/netbsd-9]: src/sys/dev/nvmm/x86 Pull up following revision(s) (requested...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/532a799e1772
branches:  netbsd-9
changeset: 454671:532a799e1772
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Sep 24 18:14:59 2019 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #239):

        sys/dev/nvmm/x86/nvmm_x86_vmx.c: revision 1.37

Always set hwcode on error. Useful for debugging.

diffstat:

 sys/dev/nvmm/x86/nvmm_x86_vmx.c |  22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diffs (64 lines):

diff -r bc71c30d9870 -r 532a799e1772 sys/dev/nvmm/x86/nvmm_x86_vmx.c
--- a/sys/dev/nvmm/x86/nvmm_x86_vmx.c   Tue Sep 24 03:11:58 2019 +0000
+++ b/sys/dev/nvmm/x86/nvmm_x86_vmx.c   Tue Sep 24 18:14:59 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nvmm_x86_vmx.c,v 1.36 2019/06/16 18:30:31 maxv Exp $   */
+/*     $NetBSD: nvmm_x86_vmx.c,v 1.36.2.1 2019/09/24 18:14:59 martin Exp $     */
 
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.36 2019/06/16 18:30:31 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.36.2.1 2019/09/24 18:14:59 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1106,6 +1106,13 @@
 }
 
 static void
+vmx_exit_invalid(struct nvmm_exit *exit, uint64_t code)
+{
+       exit->u.inv.hwcode = code;
+       exit->reason = NVMM_EXIT_INVALID;
+}
+
+static void
 vmx_exit_exc_nmi(struct nvmm_machine *mach, struct nvmm_cpu *vcpu,
     struct nvmm_exit *exit)
 {
@@ -1124,7 +1131,7 @@
        return;
 
 error:
-       exit->reason = NVMM_EXIT_INVALID;
+       vmx_exit_invalid(exit, VMCS_EXITCODE_EXC_NMI);
 }
 
 static void
@@ -1689,13 +1696,6 @@
            NVMM_X64_STATE_CRS | NVMM_X64_STATE_MSRS);
 }
 
-static void
-vmx_exit_invalid(struct nvmm_exit *exit, uint64_t code)
-{
-       exit->u.inv.hwcode = code;
-       exit->reason = NVMM_EXIT_INVALID;
-}
-
 /* -------------------------------------------------------------------------- */
 
 static void
@@ -1940,7 +1940,7 @@
                splx(s);
 
                if (__predict_false(ret != 0)) {
-                       exit->reason = NVMM_EXIT_INVALID;
+                       vmx_exit_invalid(exit, -1);
                        break;
                }
                vmx_exit_evt(cpudata);