Module Name: src
Committed By: maxv
Date: Thu Dec 13 16:28:10 UTC 2018
Modified Files:
src/sys/dev/nvmm/x86: nvmm_x86_svm.c
Log Message:
Don't forget to advance the RIP after an XSETBV emulation.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/nvmm/x86/nvmm_x86_svm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/nvmm/x86/nvmm_x86_svm.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.6 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.7
--- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.6 Sun Nov 25 14:09:57 2018
+++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c Thu Dec 13 16:28:10 2018
@@ -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 @@ svm_exit_xsetbv(struct nvmm_machine *mac
state->crs[NVMM_X64_CR_XCR0] = val;
+ cpudata->vmcb->state.rip = cpudata->vmcb->ctrl.nrip;
return;
error:
