Module Name: src
Committed By: maxv
Date: Sat Jan 26 15:12:20 UTC 2019
Modified Files:
src/sys/dev/nvmm: nvmm.h
src/sys/dev/nvmm/x86: nvmm_x86_svm.c
Log Message:
Remove nvmm_exit_memory.npc, useless.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/nvmm/nvmm.h
cvs rdiff -u -r1.17 -r1.18 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/nvmm.h
diff -u src/sys/dev/nvmm/nvmm.h:1.3 src/sys/dev/nvmm/nvmm.h:1.4
--- src/sys/dev/nvmm/nvmm.h:1.3 Thu Jan 24 13:05:59 2019
+++ src/sys/dev/nvmm/nvmm.h Sat Jan 26 15:12:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm.h,v 1.3 2019/01/24 13:05:59 maxv Exp $ */
+/* $NetBSD: nvmm.h,v 1.4 2019/01/26 15:12:20 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -75,7 +75,6 @@ struct nvmm_exit_memory {
gpaddr_t gpa;
uint8_t inst_len;
uint8_t inst_bytes[15];
- uint64_t npc;
};
enum nvmm_exit_io_type {
Index: src/sys/dev/nvmm/x86/nvmm_x86_svm.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.17 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.18
--- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.17 Thu Jan 24 13:05:59 2019
+++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c Sat Jan 26 15:12:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_svm.c,v 1.17 2019/01/24 13:05:59 maxv Exp $ */
+/* $NetBSD: nvmm_x86_svm.c,v 1.18 2019/01/26 15:12:20 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.17 2019/01/24 13:05:59 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.18 2019/01/26 15:12:20 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1051,7 +1051,6 @@ svm_exit_npf(struct nvmm_machine *mach,
exit->u.mem.inst_len = cpudata->vmcb->ctrl.inst_len;
memcpy(exit->u.mem.inst_bytes, cpudata->vmcb->ctrl.inst_bytes,
sizeof(exit->u.mem.inst_bytes));
- exit->u.mem.npc = cpudata->vmcb->ctrl.nrip;
} else {
exit->reason = NVMM_EXIT_NONE;
}
