From owner-p4-projects@FreeBSD.ORG  Tue Aug 11 10:19:16 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2A7D01065676; Tue, 11 Aug 2009 10:19:16 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DE96F1065673
	for <perforce@freebsd.org>; Tue, 11 Aug 2009 10:19:15 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CDDDF8FC39
	for <perforce@freebsd.org>; Tue, 11 Aug 2009 10:19:15 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7BAJFCb097298
	for <perforce@freebsd.org>; Tue, 11 Aug 2009 10:19:15 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7BAJFr3097296
	for perforce@freebsd.org; Tue, 11 Aug 2009 10:19:15 GMT
	(envelope-from zec@fer.hr)
Date: Tue, 11 Aug 2009 10:19:15 GMT
Message-Id: <200908111019.n7BAJFr3097296@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 167205 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Aug 2009 10:19:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=167205

Change 167205 by zec@zec_tpx32 on 2009/08/11 10:18:59

	Make VNET_DEBUG a standalone compile-time option, i.e.
	decouple it from WITNESS.
	Suggested by:	bz

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/conf/NOTES#36 edit
.. //depot/projects/vimage-commit2/src/sys/conf/options#37 edit
.. //depot/projects/vimage-commit2/src/sys/net/vnet.h#30 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/conf/NOTES#36 (text+ko) ====

@@ -273,6 +273,10 @@
 options 	WITNESS_KDB
 options 	WITNESS_SKIPSPIN
 
+# VNET_DEBUG attempts to detect usage of faulty / NULL vnets, and
+# reports unintended curvnet recursions on console.
+options		VNET_DEBUG
+
 # LOCK_PROFILING - Profiling locks.  See LOCK_PROFILING(9) for details.
 options 	LOCK_PROFILING
 # Set the number of buffers and the hash size.  The hash size MUST be larger

==== //depot/projects/vimage-commit2/src/sys/conf/options#37 (text+ko) ====

@@ -659,6 +659,9 @@
 WITNESS_KDB		opt_witness.h
 WITNESS_SKIPSPIN	opt_witness.h
 
+# VIMAGE / VNET debugging
+VNET_DEBUG		opt_global.h
+
 # options for ACPI support
 ACPI_DEBUG		opt_acpi.h
 ACPI_MAX_TASKS		opt_acpi.h

==== //depot/projects/vimage-commit2/src/sys/net/vnet.h#30 (text+ko) ====

@@ -107,9 +107,6 @@
  * Various macros -- get and set the current network stack, but also
  * assertions.
  */
-#ifdef INVARIANTS
-#define	VNET_DEBUG
-#endif
 #ifdef VNET_DEBUG
 #define	VNET_ASSERT(condition)						\
 	if (!(condition)) {						\