svn commit: r268158 - in head/sys: amd64/amd64 kern sys

[Roger Pau Monné]

On 02/07/14 15:24, Ed Maste wrote:
> Author: emaste
> Date: Wed Jul  2 13:24:21 2014
> New Revision: 268158
> URL: http://svnweb.freebsd.org/changeset/base/268158
> 
> Log:
>   Prefer vt(4) for UEFI boot
>   
>   The UEFI framebuffer driver vt_efifb requires vt(4), so add a mechanism
>   for the startup routine to set the preferred console.  This change is
>   ugly because console init happens very early in the boot, making a
>   cleaner interface difficult.  This change is intended only to facilitate
>   the sc(4) / vt(4) transition, and can be reverted once vt(4) is the
>   default.
> 
> Modified:
>   head/sys/amd64/amd64/machdep.c
>   head/sys/kern/kern_cons.c
>   head/sys/sys/cons.h
> 
> Modified: head/sys/amd64/amd64/machdep.c
> ==============================================================================
> --- head/sys/amd64/amd64/machdep.c	Wed Jul  2 13:09:26 2014	(r268157)
> +++ head/sys/amd64/amd64/machdep.c	Wed Jul  2 13:24:21 2014	(r268158)
> @@ -1955,6 +1955,14 @@ hammer_time(u_int64_t modulep, u_int64_t
>  	clock_init();
>  
>  	/*
> +	 * Use vt(4) by default for UEFI boot (during the sc(4)/vt(4)
> +	 * transition).
> +	 */
> +	if (preload_search_info(kmdp, MODINFO_METADATA | MODINFOMD_EFI_MAP) !=
> +	    NULL)
> +		vty_set_preferred(VTY_VT);

I think a kmdp != NULL check should be added here, because on Xen PVH
guests kmdp == NULL.

Roger.