[src/trunk]: src/sys/arch Retire XENDEBUG_LOW, and switch its only user to XE...

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7497c9372d50
branches:  trunk
changeset: 834083:7497c9372d50
user:      maxv <maxv%NetBSD.org@localhost>
date:      Thu Jul 26 15:46:09 2018 +0000

description:
Retire XENDEBUG_LOW, and switch its only user to XENDEBUG.

diffstat:

 sys/arch/amd64/conf/ALL        |   6 ++----
 sys/arch/i386/conf/ALL         |   6 ++----
 sys/arch/xen/include/xenfunc.h |   8 +-------
 sys/arch/xen/x86/x86_xpmap.c   |  12 ++++--------
 4 files changed, 9 insertions(+), 23 deletions(-)

diffs (131 lines):

diff -r 51779f1bf671 -r 7497c9372d50 sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Thu Jul 26 15:38:26 2018 +0000
+++ b/sys/arch/amd64/conf/ALL   Thu Jul 26 15:46:09 2018 +0000
@@ -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 @@
 
 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 XDDEBUG
 options XDEBUG
 options XENDEBUG
-options XENDEBUG_LOW
 options XENDEBUG_NET
 options XENDEBUG_VBD
 options XENNET_DEBUG
@@ -2389,7 +2388,6 @@
 options XEN_CLOCK_DEBUG
 options XE_DEBUG
 options XHCI_DEBUG
-options XXXXENDEBUG_LOW
 options XYC_DEBUG
 options ZSKBD_DEBUG
 options ZSMACDEBUG
diff -r 51779f1bf671 -r 7497c9372d50 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Thu Jul 26 15:38:26 2018 +0000
+++ b/sys/arch/i386/conf/ALL    Thu Jul 26 15:46:09 2018 +0000
@@ -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 @@
 
 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 XDDEBUG
 options XDEBUG
 options XENDEBUG
-options XENDEBUG_LOW
 options XENDEBUG_NET
 options XENDEBUG_VBD
 options XENNET_DEBUG
@@ -2533,7 +2532,6 @@
 options XEN_CLOCK_DEBUG
 options XE_DEBUG
 options XHCI_DEBUG
-options XXXXENDEBUG_LOW
 options XYC_DEBUG
 options ZSKBD_DEBUG
 options ZSMACDEBUG
diff -r 51779f1bf671 -r 7497c9372d50 sys/arch/xen/include/xenfunc.h
--- a/sys/arch/xen/include/xenfunc.h    Thu Jul 26 15:38:26 2018 +0000
+++ b/sys/arch/xen/include/xenfunc.h    Thu Jul 26 15:46:09 2018 +0000
@@ -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_ */
diff -r 51779f1bf671 -r 7497c9372d50 sys/arch/xen/x86/x86_xpmap.c
--- a/sys/arch/xen/x86/x86_xpmap.c      Thu Jul 26 15:38:26 2018 +0000
+++ b/sys/arch/xen/x86/x86_xpmap.c      Thu Jul 26 15:46:09 2018 +0000
@@ -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 @@
 #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 @@
        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 */