Module Name: src
Committed By: maxv
Date: Thu Jul 26 15:46:09 UTC 2018
Modified Files:
src/sys/arch/amd64/conf: ALL
src/sys/arch/i386/conf: ALL
src/sys/arch/xen/include: xenfunc.h
src/sys/arch/xen/x86: x86_xpmap.c
Log Message:
Retire XENDEBUG_LOW, and switch its only user to XENDEBUG.
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.443 -r1.444 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/xen/include/xenfunc.h
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/xen/x86/x86_xpmap.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/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.94 src/sys/arch/amd64/conf/ALL:1.95
--- src/sys/arch/amd64/conf/ALL:1.94 Fri Jul 13 09:37:32 2018
+++ src/sys/arch/amd64/conf/ALL Thu Jul 26 15:46:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.94 2018/07/13 09:37:32 maxv Exp $
+# $NetBSD: ALL,v 1.95 2018/07/26 15:46:09 maxv Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.94 $"
+#ident "ALL-$Revision: 1.95 $"
maxusers 64 # estimated number of users
@@ -2381,7 +2381,6 @@ options XDC_DEBUG
options XDDEBUG
options XDEBUG
options XENDEBUG
-options XENDEBUG_LOW
options XENDEBUG_NET
options XENDEBUG_VBD
options XENNET_DEBUG
@@ -2389,7 +2388,6 @@ options XENNET_DEBUG_DUMP
options XEN_CLOCK_DEBUG
options XE_DEBUG
options XHCI_DEBUG
-options XXXXENDEBUG_LOW
options XYC_DEBUG
options ZSKBD_DEBUG
options ZSMACDEBUG
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.443 src/sys/arch/i386/conf/ALL:1.444
--- src/sys/arch/i386/conf/ALL:1.443 Fri Jul 13 09:37:32 2018
+++ src/sys/arch/i386/conf/ALL Thu Jul 26 15:46:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.443 2018/07/13 09:37:32 maxv Exp $
+# $NetBSD: ALL,v 1.444 2018/07/26 15:46:09 maxv Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.443 $"
+#ident "ALL-$Revision: 1.444 $"
maxusers 64 # estimated number of users
@@ -2525,7 +2525,6 @@ options XDC_DEBUG
options XDDEBUG
options XDEBUG
options XENDEBUG
-options XENDEBUG_LOW
options XENDEBUG_NET
options XENDEBUG_VBD
options XENNET_DEBUG
@@ -2533,7 +2532,6 @@ options XENNET_DEBUG_DUMP
options XEN_CLOCK_DEBUG
options XE_DEBUG
options XHCI_DEBUG
-options XXXXENDEBUG_LOW
options XYC_DEBUG
options ZSKBD_DEBUG
options ZSMACDEBUG
Index: src/sys/arch/xen/include/xenfunc.h
diff -u src/sys/arch/xen/include/xenfunc.h:1.15 src/sys/arch/xen/include/xenfunc.h:1.16
--- src/sys/arch/xen/include/xenfunc.h:1.15 Fri Oct 23 02:32:33 2009
+++ src/sys/arch/xen/include/xenfunc.h Thu Jul 26 15:46:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xenfunc.h,v 1.15 2009/10/23 02:32:33 snj Exp $ */
+/* $NetBSD: xenfunc.h,v 1.16 2018/07/26 15:46:09 maxv Exp $ */
/*
*
@@ -36,11 +36,5 @@
#include <xen/xenpmap.h>
#include <machine/pte.h>
-#ifdef XENDEBUG_LOW
-#define __PRINTK(x) printk x
-#else
-#define __PRINTK(x)
-#endif
-
void xen_set_ldt(vaddr_t, uint32_t);
#endif /* _XEN_XENFUNC_H_ */
Index: src/sys/arch/xen/x86/x86_xpmap.c
diff -u src/sys/arch/xen/x86/x86_xpmap.c:1.77 src/sys/arch/xen/x86/x86_xpmap.c:1.78
--- src/sys/arch/xen/x86/x86_xpmap.c:1.77 Thu Jul 26 08:18:25 2018
+++ src/sys/arch/xen/x86/x86_xpmap.c Thu Jul 26 15:46:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_xpmap.c,v 1.77 2018/07/26 08:18:25 maxv Exp $ */
+/* $NetBSD: x86_xpmap.c,v 1.78 2018/07/26 15:46:09 maxv Exp $ */
/*
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -95,7 +95,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.77 2018/07/26 08:18:25 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.78 2018/07/26 15:46:09 maxv Exp $");
#include "opt_xen.h"
#include "opt_ddb.h"
@@ -115,12 +115,10 @@ __KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,
#include <dev/isa/isareg.h>
#include <machine/isa_machdep.h>
-#undef XENDEBUG
-
#ifdef XENDEBUG
-#define XENPRINTF(x) printf x
+#define __PRINTK(x) printk x
#else
-#define XENPRINTF(x)
+#define __PRINTK(x)
#endif
/* Xen requires the start_info struct to be page aligned */
@@ -182,8 +180,6 @@ xen_set_ldt(vaddr_t base, uint32_t entri
for (va = base; va < end; va += PAGE_SIZE) {
KASSERT(va >= VM_MIN_KERNEL_ADDRESS);
ptp = kvtopte(va);
- XENPRINTF(("xen_set_ldt %#" PRIxVADDR " %d %p\n",
- base, entries, ptp));
pmap_pte_clearbits(ptp, PG_RW);
}
s = splvm(); /* XXXSMP */
