From owner-svn-src-head@FreeBSD.ORG  Mon Aug  6 12:14:07 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A852D106566C;
	Mon,  6 Aug 2012 12:14:07 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from bigwig.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net
	[IPv6:2001:470:1f10:75::2])
	by mx1.freebsd.org (Postfix) with ESMTP id 7B71C8FC18;
	Mon,  6 Aug 2012 12:14:07 +0000 (UTC)
Received: from jhbbsd.localnet (unknown [209.249.190.124])
	by bigwig.baldwin.cx (Postfix) with ESMTPSA id D198DB980;
	Mon,  6 Aug 2012 08:14:06 -0400 (EDT)
From: John Baldwin <jhb@freebsd.org>
To: "Andrey V. Elsukov" <ae@freebsd.org>
Date: Mon, 6 Aug 2012 08:08:39 -0400
User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p17; KDE/4.5.5; amd64; ; )
References: <201208051704.q75H4wB6005480@svn.freebsd.org>
In-Reply-To: <201208051704.q75H4wB6005480@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <201208060808.39793.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
	(bigwig.baldwin.cx); Mon, 06 Aug 2012 08:14:06 -0400 (EDT)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r239073 - in head/sys/boot/userboot: . test userboot
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Aug 2012 12:14:07 -0000

On Sunday, August 05, 2012 1:04:58 pm Andrey V. Elsukov wrote:
> Author: ae
> Date: Sun Aug  5 17:04:58 2012
> New Revision: 239073
> URL: http://svn.freebsd.org/changeset/base/239073
> 
> Log:
>   Bump USERBOOT_VERSION.
>   
>   Requested by:	dfr
> 
> Modified:
>   head/sys/boot/userboot/test/test.c
>   head/sys/boot/userboot/userboot.h
>   head/sys/boot/userboot/userboot/main.c
> 
> Modified: head/sys/boot/userboot/test/test.c
> 
==============================================================================
> --- head/sys/boot/userboot/test/test.c	Sun Aug  5 16:59:02 2012	
(r239072)
> +++ head/sys/boot/userboot/test/test.c	Sun Aug  5 17:04:58 2012	
(r239073)
> @@ -450,5 +450,5 @@ main(int argc, char** argv)
>  	term.c_lflag &= ~(ICANON|ECHO);
>  	tcsetattr(0, TCSAFLUSH, &term);
>  
> -	func(&cb, NULL, USERBOOT_VERSION_1, disk_fd >= 0);
> +	func(&cb, NULL, USERBOOT_VERSION_2, disk_fd >= 0);
>  }
> 
> Modified: head/sys/boot/userboot/userboot.h
> 
==============================================================================
> --- head/sys/boot/userboot/userboot.h	Sun Aug  5 16:59:02 2012	(r239072)
> +++ head/sys/boot/userboot/userboot.h	Sun Aug  5 17:04:58 2012	(r239073)
> @@ -30,6 +30,7 @@
>   * USERBOOT interface versions
>   */
>  #define	USERBOOT_VERSION_1      1
> +#define	USERBOOT_VERSION_2      2
>  
>  /*
>   * Exit codes from the loader
> 
> Modified: head/sys/boot/userboot/userboot/main.c
> 
==============================================================================
> --- head/sys/boot/userboot/userboot/main.c	Sun Aug  5 16:59:02 2012	
(r239072)
> +++ head/sys/boot/userboot/userboot/main.c	Sun Aug  5 17:04:58 2012	
(r239073)
> @@ -36,6 +36,8 @@ __FBSDID("$FreeBSD$");
>  #include "disk.h"
>  #include "libuserboot.h"
>  
> +#define	USERBOOT_VERSION	USERBOOT_VERSION_2
> +
>  struct loader_callbacks_v1 *callbacks;
>  void *callbacks_arg;

Should this be called loader_callbacks_v2 now?

-- 
John Baldwin