From owner-svn-src-stable-12@freebsd.org Tue Jul 16 16:05:42 2019 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B445CB3963; Tue, 16 Jul 2019 16:05:42 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 969CD8CCBA; Tue, 16 Jul 2019 16:05:42 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6FCFC855A; Tue, 16 Jul 2019 16:05:42 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6GG5geH020406; Tue, 16 Jul 2019 16:05:42 GMT (envelope-from vangyzen@FreeBSD.org) Received: (from vangyzen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6GG5gbD020405; Tue, 16 Jul 2019 16:05:42 GMT (envelope-from vangyzen@FreeBSD.org) Message-Id: <201907161605.x6GG5gbD020405@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to vangyzen@FreeBSD.org using -f From: Eric van Gyzen Date: Tue, 16 Jul 2019 16:05:42 +0000 (UTC) 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 X-SVN-Group: stable-12 X-SVN-Commit-Author: vangyzen X-SVN-Commit-Paths: stable/12/sys/dev/vt X-SVN-Commit-Revision: 350050 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 969CD8CCBA X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.962,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jul 2019 16:05:42 -0000 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)