Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 16 Jul 2019 16:05:42 +0000 (UTC)
From:      Eric van Gyzen <vangyzen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r350050 - stable/12/sys/dev/vt
Message-ID:  <201907161605.x6GG5gbD020405@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vangyzen
Date: Tue Jul 16 16:05:42 2019
New Revision: 350050
URL: https://svnweb.freebsd.org/changeset/base/350050

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/12/sys/dev/vt/vt_cpulogos.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/vt/vt_cpulogos.c
==============================================================================
--- stable/12/sys/dev/vt/vt_cpulogos.c	Tue Jul 16 16:03:08 2019	(r350049)
+++ stable/12/sys/dev/vt/vt_cpulogos.c	Tue Jul 16 16:05:42 2019	(r350050)
@@ -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)



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