svn commit: r350056 - stable/11/sys/dev/vt

Eric van Gyzen vangyzen at FreeBSD.org
Tue Jul 16 16:49:12 UTC 2019


Author: vangyzen
Date: Tue Jul 16 16:49:11 2019
New Revision: 350056
URL: https://svnweb.freebsd.org/changeset/base/350056

Log:
  MFC r349834
  
  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
  Sponsored by:	Dell EMC Isilon
  Differential Revision:	https://reviews.freebsd.org/D20877

Modified:
  stable/11/sys/dev/vt/vt_cpulogos.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/vt/vt_cpulogos.c
==============================================================================
--- stable/11/sys/dev/vt/vt_cpulogos.c	Tue Jul 16 16:33:44 2019	(r350055)
+++ stable/11/sys/dev/vt/vt_cpulogos.c	Tue Jul 16 16:49:11 2019	(r350056)
@@ -227,9 +227,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)


More information about the svn-src-stable-11 mailing list