[src/trunk]: src/sys/dev/nvmm/x86 Don't forget to advance the RIP after an XS...

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

details:   https://anonhg.NetBSD.org/src/rev/3f97eec86045
branches:  trunk
changeset: 995270:3f97eec86045
user:      maxv <maxv%NetBSD.org@localhost>
date:      Thu Dec 13 16:28:10 2018 +0000

description:
Don't forget to advance the RIP after an XSETBV emulation.

diffstat:

 sys/dev/nvmm/x86/nvmm_x86_svm.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 654f82419c77 -r 3f97eec86045 sys/dev/nvmm/x86/nvmm_x86_svm.c
--- a/sys/dev/nvmm/x86/nvmm_x86_svm.c   Thu Dec 13 16:23:34 2018 +0000
+++ b/sys/dev/nvmm/x86/nvmm_x86_svm.c   Thu Dec 13 16:28:10 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nvmm_x86_svm.c,v 1.6 2018/11/25 14:09:57 maxv Exp $    */
+/*     $NetBSD: nvmm_x86_svm.c,v 1.7 2018/12/13 16:28:10 maxv Exp $    */
 
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.6 2018/11/25 14:09:57 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.7 2018/12/13 16:28:10 maxv Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -963,6 +963,7 @@
 
        state->crs[NVMM_X64_CR_XCR0] = val;
 
+       cpudata->vmcb->state.rip = cpudata->vmcb->ctrl.nrip;
        return;
 
 error: