Module Name: src
Committed By: maxv
Date: Fri Jul 3 16:09:55 UTC 2020
Modified Files:
src/sys/dev/nvmm: nvmm.c nvmm_internal.h
src/sys/dev/nvmm/x86: nvmm_x86_svm.c nvmm_x86_vmx.c
Log Message:
Print the backend name when attaching.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/nvmm/nvmm.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/nvmm/nvmm_internal.h
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/nvmm/x86/nvmm_x86_svm.c
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/nvmm/x86/nvmm_x86_vmx.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.31 src/sys/dev/nvmm/nvmm.c:1.32
--- src/sys/dev/nvmm/nvmm.c:1.31 Thu Jun 25 17:01:19 2020
+++ src/sys/dev/nvmm/nvmm.c Fri Jul 3 16:09:54 2020
@@ -1,7 +1,7 @@
-/* $NetBSD: nvmm.c,v 1.31 2020/06/25 17:01:19 maxv Exp $ */
+/* $NetBSD: nvmm.c,v 1.32 2020/07/03 16:09:54 maxv Exp $ */
/*
- * Copyright (c) 2018-2019 The NetBSD Foundation, Inc.
+ * Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.31 2020/06/25 17:01:19 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.32 2020/07/03 16:09:54 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1209,7 +1209,8 @@ nvmm_attach(device_t parent, device_t se
error = nvmm_init();
if (error)
panic("%s: impossible", __func__);
- aprint_normal_dev(self, "attached\n");
+ aprint_normal_dev(self, "attached, using backend %s\n",
+ nvmm_impl->name);
}
static int
Index: src/sys/dev/nvmm/nvmm_internal.h
diff -u src/sys/dev/nvmm/nvmm_internal.h:1.15 src/sys/dev/nvmm/nvmm_internal.h:1.16
--- src/sys/dev/nvmm/nvmm_internal.h:1.15 Sun May 24 08:08:49 2020
+++ src/sys/dev/nvmm/nvmm_internal.h Fri Jul 3 16:09:54 2020
@@ -1,7 +1,7 @@
-/* $NetBSD: nvmm_internal.h,v 1.15 2020/05/24 08:08:49 maxv Exp $ */
+/* $NetBSD: nvmm_internal.h,v 1.16 2020/07/03 16:09:54 maxv Exp $ */
/*
- * Copyright (c) 2018-2019 The NetBSD Foundation, Inc.
+ * Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -91,6 +91,7 @@ struct nvmm_machine {
};
struct nvmm_impl {
+ const char *name;
bool (*ident)(void);
void (*init)(void);
void (*fini)(void);
Index: src/sys/dev/nvmm/x86/nvmm_x86_svm.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.62 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.63
--- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.62 Sun May 24 08:08:49 2020
+++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c Fri Jul 3 16:09:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_svm.c,v 1.62 2020/05/24 08:08:49 maxv Exp $ */
+/* $NetBSD: nvmm_x86_svm.c,v 1.63 2020/07/03 16:09:54 maxv Exp $ */
/*
* Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.62 2020/05/24 08:08:49 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.63 2020/07/03 16:09:54 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2430,6 +2430,7 @@ svm_capability(struct nvmm_capability *c
}
const struct nvmm_impl nvmm_x86_svm = {
+ .name = "x86-svm",
.ident = svm_ident,
.init = svm_init,
.fini = svm_fini,
Index: src/sys/dev/nvmm/x86/nvmm_x86_vmx.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.60 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.61
--- src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.60 Thu Jun 18 16:31:15 2020
+++ src/sys/dev/nvmm/x86/nvmm_x86_vmx.c Fri Jul 3 16:09:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_vmx.c,v 1.60 2020/06/18 16:31:15 maxv Exp $ */
+/* $NetBSD: nvmm_x86_vmx.c,v 1.61 2020/07/03 16:09:54 maxv Exp $ */
/*
* Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.60 2020/06/18 16:31:15 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.61 2020/07/03 16:09:54 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -3392,6 +3392,7 @@ vmx_capability(struct nvmm_capability *c
}
const struct nvmm_impl nvmm_x86_vmx = {
+ .name = "x86-vmx",
.ident = vmx_ident,
.init = vmx_init,
.fini = vmx_fini,
