CVS commit: src/sys/dev/nvmm/x86

[Maxime Villard]

Module Name:    src
Committed By:   maxv
Date:           Sun Nov 25 14:09:57 UTC 2018

Modified Files:
        src/sys/dev/nvmm/x86: nvmm_x86.h nvmm_x86_svm.c

Log Message:
Add RFLAGS in the exitstate.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/nvmm/x86/nvmm_x86.h
cvs rdiff -u -r1.5 -r1.6 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.h
diff -u src/sys/dev/nvmm/x86/nvmm_x86.h:1.1 src/sys/dev/nvmm/x86/nvmm_x86.h:1.2
--- src/sys/dev/nvmm/x86/nvmm_x86.h:1.1	Wed Nov  7 07:43:08 2018
+++ src/sys/dev/nvmm/x86/nvmm_x86.h	Sun Nov 25 14:09:57 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvmm_x86.h,v 1.1 2018/11/07 07:43:08 maxv Exp $	*/
+/*	$NetBSD: nvmm_x86.h,v 1.2 2018/11/25 14:09:57 maxv Exp $	*/
 
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -123,7 +123,8 @@ struct nvmm_x64_state_seg {
 };
 
 /* VM exit state indexes. */
-#define NVMM_X64_EXITSTATE_CR8	0
+#define NVMM_X64_EXITSTATE_CR8		0
+#define NVMM_X64_EXITSTATE_RFLAGS	1
 
 /* Flags. */
 #define NVMM_X64_STATE_SEGS	0x01

Index: src/sys/dev/nvmm/x86/nvmm_x86_svm.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.5 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.6
--- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.5	Thu Nov 22 07:37:12 2018
+++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c	Sun Nov 25 14:09:57 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvmm_x86_svm.c,v 1.5 2018/11/22 07:37:12 maxv Exp $	*/
+/*	$NetBSD: nvmm_x86_svm.c,v 1.6 2018/11/25 14:09:57 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.5 2018/11/22 07:37:12 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.6 2018/11/25 14:09:57 maxv Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1205,6 +1205,7 @@ svm_vcpu_run(struct nvmm_machine *mach, 
 
 	exit->exitstate[NVMM_X64_EXITSTATE_CR8] = __SHIFTOUT(vmcb->ctrl.v,
 	    VMCB_CTRL_V_TPR);
+	exit->exitstate[NVMM_X64_EXITSTATE_RFLAGS] = vmcb->state.rflags;
 
 	return 0;
 }