From owner-p4-projects@FreeBSD.ORG  Fri Apr 24 07:24:31 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A200A1065679; Fri, 24 Apr 2009 07:24:31 +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 5FBA71065672
	for <perforce@freebsd.org>; Fri, 24 Apr 2009 07:24:31 +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 4EA258FC0C
	for <perforce@freebsd.org>; Fri, 24 Apr 2009 07:24:31 +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 n3O7OVSO003895
	for <perforce@freebsd.org>; Fri, 24 Apr 2009 07:24:31 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3O7OVV5003893
	for perforce@freebsd.org; Fri, 24 Apr 2009 07:24:31 GMT
	(envelope-from zec@fer.hr)
Date: Fri, 24 Apr 2009 07:24:31 GMT
Message-Id: <200904240724.n3O7OVV5003893@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 161016 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: Fri, 24 Apr 2009 07:24:32 -0000

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

Change 161016 by zec@zec_tpx32 on 2009/04/24 07:23:39

	s/vmi_struct_size/vmi_size/ - still always hidden by
	#ifdef VIMAGE which is not yet a valid compile-time option.

Affected files ...

.. //depot/projects/vimage-commit/src/sys/kern/kern_vimage.c#8 edit

Differences ...

==== //depot/projects/vimage-commit/src/sys/kern/kern_vimage.c#8 (text+ko) ====

@@ -185,8 +185,8 @@
 		printf("/%s", vml->vml_iname);
 	printf(": ");
 #ifdef VIMAGE
-	if (vmi->vmi_struct_size)
-		printf("malloc(%zu); ", vmi->vmi_struct_size);
+	if (vmi->vmi_size)
+		printf("malloc(%zu); ", vmi->vmi_size);
 #endif
 	if (vmi->vmi_iattach != NULL)
 		printf("iattach()");
@@ -194,7 +194,7 @@
 #endif
 
 #ifdef VIMAGE
-	if (vmi->vmi_struct_size) {
+	if (vmi->vmi_size) {
 		void *mem = malloc(vmi->vmi_size, M_VNET,
 		    M_NOWAIT | M_ZERO);
 		if (mem == NULL) /* XXX should return error, not panic. */