Module Name: src
Committed By: maxv
Date: Tue Sep 8 16:58:38 UTC 2020
Modified Files:
src/sys/dev/nvmm: nvmm.c nvmm_ioctl.h
src/sys/dev/nvmm/x86: nvmm_x86.c nvmm_x86_svm.c
Log Message:
nvmm: cosmetic changes
- Style.
- Explicitly include ioccom.h.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/nvmm/nvmm.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/nvmm/nvmm_ioctl.h
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/nvmm/x86/nvmm_x86.c
cvs rdiff -u -r1.79 -r1.80 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.c
diff -u src/sys/dev/nvmm/nvmm.c:1.40 src/sys/dev/nvmm/nvmm.c:1.41
--- src/sys/dev/nvmm/nvmm.c:1.40 Sat Sep 5 16:30:11 2020
+++ src/sys/dev/nvmm/nvmm.c Tue Sep 8 16:58:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm.c,v 1.40 2020/09/05 16:30:11 riastradh Exp $ */
+/* $NetBSD: nvmm.c,v 1.41 2020/09/08 16:58:38 maxv Exp $ */
/*
* Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.40 2020/09/05 16:30:11 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.41 2020/09/08 16:58:38 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1085,7 +1085,7 @@ nvmm_close(file_t *fp)
}
fp->f_data = NULL;
- return 0;
+ return 0;
}
static int
Index: src/sys/dev/nvmm/nvmm_ioctl.h
diff -u src/sys/dev/nvmm/nvmm_ioctl.h:1.11 src/sys/dev/nvmm/nvmm_ioctl.h:1.12
--- src/sys/dev/nvmm/nvmm_ioctl.h:1.11 Sat Sep 5 07:22:25 2020
+++ src/sys/dev/nvmm/nvmm_ioctl.h Tue Sep 8 16:58:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_ioctl.h,v 1.11 2020/09/05 07:22:25 maxv Exp $ */
+/* $NetBSD: nvmm_ioctl.h,v 1.12 2020/09/08 16:58:38 maxv Exp $ */
/*
* Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net
@@ -31,6 +31,7 @@
#ifndef _NVMM_IOCTL_H_
#define _NVMM_IOCTL_H_
+#include <sys/ioccom.h>
#include <dev/nvmm/nvmm.h>
struct nvmm_ioc_capability {
Index: src/sys/dev/nvmm/x86/nvmm_x86.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86.c:1.20 src/sys/dev/nvmm/x86/nvmm_x86.c:1.21
--- src/sys/dev/nvmm/x86/nvmm_x86.c:1.20 Sun Sep 6 02:18:53 2020
+++ src/sys/dev/nvmm/x86/nvmm_x86.c Tue Sep 8 16:58:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86.c,v 1.20 2020/09/06 02:18:53 riastradh Exp $ */
+/* $NetBSD: nvmm_x86.c,v 1.21 2020/09/08 16:58:38 maxv Exp $ */
/*
* Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86.c,v 1.20 2020/09/06 02:18:53 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86.c,v 1.21 2020/09/08 16:58:38 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -405,7 +405,7 @@ const struct nvmm_x86_cpuid_mask nvmm_cp
CPUID_MPC |
CPUID_XD |
CPUID_MMXX |
- CPUID_MMX |
+ CPUID_MMX |
CPUID_FXSR |
CPUID_FFXSR |
CPUID_PAGE1GB |
Index: src/sys/dev/nvmm/x86/nvmm_x86_svm.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.79 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.80
--- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.79 Sun Sep 6 02:18:53 2020
+++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c Tue Sep 8 16:58:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_svm.c,v 1.79 2020/09/06 02:18:53 riastradh Exp $ */
+/* $NetBSD: nvmm_x86_svm.c,v 1.80 2020/09/08 16:58:38 maxv Exp $ */
/*
* Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.79 2020/09/06 02:18:53 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.80 2020/09/08 16:58:38 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -787,7 +787,7 @@ svm_inject_gp(struct nvmm_cpu *vcpu)
KASSERT(ret == 0);
}
-static inline int
+static inline int
svm_vcpu_event_commit(struct nvmm_cpu *vcpu)
{
if (__predict_true(!vcpu->comm->event_commit)) {
