From owner-p4-projects@FreeBSD.ORG  Thu Apr 16 14:07:01 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5F69A1065672; Thu, 16 Apr 2009 14:07:01 +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 1FCF3106566C
	for <perforce@freebsd.org>; Thu, 16 Apr 2009 14:07:01 +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 0F2068FC13
	for <perforce@freebsd.org>; Thu, 16 Apr 2009 14:07:01 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3GE70m7014138
	for <perforce@freebsd.org>; Thu, 16 Apr 2009 14:07:00 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3GE703t014136
	for perforce@freebsd.org; Thu, 16 Apr 2009 14:07:00 GMT
	(envelope-from zec@fer.hr)
Date: Thu, 16 Apr 2009 14:07:00 GMT
Message-Id: <200904161407.n3GE703t014136@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 160698 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: Thu, 16 Apr 2009 14:07:02 -0000

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

Change 160698 by zec@zec_amdx2 on 2009/04/16 14:06:53

	Attempt to unbreak a few obscure virtualized sysctl cases.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/kern/kern_sysctl.c#9 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#35 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/kern/kern_sysctl.c#9 (text+ko) ====

@@ -968,7 +968,9 @@
 {
 	int error, s, tt;
 
-	tt = *(int *)oidp->oid_arg1;
+	SYSCTL_RESOLVE_V_ARG1();
+
+	tt = *(int *)arg1;
 	s = (int)((int64_t)tt * 1000 / hz);
 
 	error = sysctl_handle_int(oidp, &s, 0, req);
@@ -979,7 +981,7 @@
 	if (tt < 1)
 		return (EINVAL);
 
-	*(int *)oidp->oid_arg1 = tt;
+	*(int *)arg1 = tt;
 	return (0);
 }
 

==== //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#35 (text+ko) ====

@@ -126,7 +126,9 @@
 	INIT_VNET_INET(curvnet);
 	int error;
 
-	error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req);
+	SYSCTL_RESOLVE_V_ARG1();
+
+	error = sysctl_handle_int(oidp, arg1, arg2, req);
 	if (error == 0) {
 		RANGECHK(V_ipport_lowfirstauto, 1, IPPORT_RESERVED - 1);
 		RANGECHK(V_ipport_lowlastauto, 1, IPPORT_RESERVED - 1);