Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 8 Jul 2019 13:46:26 +0000 (UTC)
From:      Eric van Gyzen <vangyzen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r349834 - head/sys/dev/vt
Message-ID:  <201907081346.x68DkQFF068563@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vangyzen
Date: Mon Jul  8 13:46:26 2019
New Revision: 349834
URL: https://svnweb.freebsd.org/changeset/base/349834

Log:
  Ignore kern.vt.splash_cpu without graphics
  
  When the system has no graphical console, such as bhyve in common
  configurations, ignore kern.vt.splash_cpu, instead of panicking
  on INVARIANTS kernels.
  
  Reviewed by:	cem dumbbell
  MFC after:	1 week
  Sponsored by:	Dell EMC Isilon
  Differential Revision:	https://reviews.freebsd.org/D20877

Modified:
  head/sys/dev/vt/vt_cpulogos.c

Modified: head/sys/dev/vt/vt_cpulogos.c
==============================================================================
--- head/sys/dev/vt/vt_cpulogos.c	Mon Jul  8 13:01:54 2019	(r349833)
+++ head/sys/dev/vt/vt_cpulogos.c	Mon Jul  8 13:46:26 2019	(r349834)
@@ -229,9 +229,8 @@ vt_init_logos(void *dummy)
 		return;
 
 	VT_LOCK(vd);
-	KASSERT((vd->vd_flags & VDF_INITIALIZED) != 0,
-	    ("vd %p not initialized", vd));
-
+	if ((vd->vd_flags & VDF_INITIALIZED) == 0)
+		goto out;
 	if ((vd->vd_flags & (VDF_DEAD | VDF_TEXTMODE)) != 0)
 		goto out;
 	if (vd->vd_height <= vt_logo_sprite_height)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907081346.x68DkQFF068563>