From nobody Wed Jan 7 17:12:22 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dmZNC4QmXz6N64g for ; Wed, 07 Jan 2026 17:12:27 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dmZNC3lvxz40fy for ; Wed, 07 Jan 2026 17:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767805947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=skcSAobPnFaaBhSgg8dvbrM1HQkclWqtlqCce0/LP84=; b=DcbxlKHokoRIEcimvSy09o7dooYK7B4E43gjvBwEYu87qi26BUAs7YJId/RtyC5WZYuSvF n4d0GS7/msRNCsidJbC7R2SSmXZL79InUg5deVdWNqA/HJ/X3Z2K/XoVPEdvKYsv4cmQU8 F4omJKK4ROzogRRo/Ovq+7/FGdWiyM8rLpxR/c3+STna8RZqyRucQJLGMcS2XSnJjQ33KK r6rXJdAZ92jy4ZF1ho8oNec3CHnjMohQb+7eynvw4csa+ujxvuYCAkekbCFV+Sm44tHreT Ry466zCxWeauAMQzG7WB0JqeBhBkPkDQXpqPQRVizKs6SXSPKmJY7/U2rJdtLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767805947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=skcSAobPnFaaBhSgg8dvbrM1HQkclWqtlqCce0/LP84=; b=afcSQ9I1XiDKtvjkaW6QAwfqsnh6lWZGjcNZP6KfI36u/Vscsed23nT5FgdWetNjHjm+Mk oyk/jdKAiDmKMW6KPsZLxOs2EyFtD8z6UKhq6FA6KCzdOkqn2AEALidvwBpTdFQHGDHMwt o2zmiim7/cVJrj3pmwEztoLtSeuDLL6YSybws8ZUX4jDEOpswNNDGCg+0GEjqfrHEqVb1b Uhu5intsgAj59Zdch5htgIKkSKg4iYQ05iGQRxtYM4dH7yJoKIUrPRVSeWfpbYb6VDsQBW FfVIoMZYgH1tSkbS6jTBusysUNxVPk9TbGkxQAjxXlMjIphlkLsygfkWCe23lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767805947; a=rsa-sha256; cv=none; b=L5pp1oPxYZ+W8yG7slHi3GFld7mbX1yGjtlB/qMsiMDOfsUaZZCI6OP2PsnNiCRBIO7tSa VcdnCuekPT8WJylMCjsCCUFCtbSGFVUJFS4rr7Bs085wqTloHPvmZrzGyAYm0i+gb5d9z0 I3gXuGfPStlsVqwCvMNEV/Yyc7NBlzIMjw7m4iI65ezPmMBxVwoV2Jpas0wCBKPMKTq1iD uFMiHQxV09Ldr5p2EcGmHQeFXaktuAqwkZPc0qSTFyNtDswc6cc1FzZNKMOb7D4MRDlluY tNojmF91VRtaqZDXGfW4KOUUtO6X9TaEXXnIDWF8NMxFVBzwZbeYHwxo6lDJgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dmZNC3890z11rw for ; Wed, 07 Jan 2026 17:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33084 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 07 Jan 2026 17:12:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roman Bogorodskiy Subject: git: 9fc7fe642757 - main - bhyve: improve console error reporting on arm64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: novel X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9fc7fe6427579f1c82a371588df6fd6af3b83dfd Auto-Submitted: auto-generated Date: Wed, 07 Jan 2026 17:12:22 +0000 Message-Id: <695e93f6.33084.4a9e95d6@gitrepo.freebsd.org> The branch main has been updated by novel: URL: https://cgit.FreeBSD.org/src/commit/?id=9fc7fe6427579f1c82a371588df6fd6af3b83dfd commit 9fc7fe6427579f1c82a371588df6fd6af3b83dfd Author: Roman Bogorodskiy AuthorDate: 2026-01-04 13:59:34 +0000 Commit: Roman Bogorodskiy CommitDate: 2026-01-07 17:06:45 +0000 bhyve: improve console error reporting on arm64 Currently, on arm64, if bhyve fails to initialize the console, it falls into assert(), which does not look particularly pretty for users. Replace the assert with proper error handling so bhyve prints a meaningful error message and exits with status code 4 (error). That matches the behavior on amd64. Approved by: markj Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54504 --- usr.sbin/bhyve/aarch64/bhyverun_machdep.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bhyve/aarch64/bhyverun_machdep.c b/usr.sbin/bhyve/aarch64/bhyverun_machdep.c index e099df0559a1..10018d082f7e 100644 --- a/usr.sbin/bhyve/aarch64/bhyverun_machdep.c +++ b/usr.sbin/bhyve/aarch64/bhyverun_machdep.c @@ -270,7 +270,7 @@ mmio_uart_mem_handler(struct vcpu *vcpu __unused, int dir, return (0); } -static bool +static int init_mmio_uart(struct vmctx *ctx) { struct uart_pl011_softc *sc; @@ -280,14 +280,14 @@ init_mmio_uart(struct vmctx *ctx) path = get_config_value("console"); if (path == NULL) - return (false); + return (1); sc = uart_pl011_init(mmio_uart_intr_assert, mmio_uart_intr_deassert, ctx); if (uart_pl011_tty_open(sc, path) != 0) { EPRINTLN("Unable to initialize backend '%s' for mmio uart", path); - assert(0); + return (-1); } bzero(&mr, sizeof(struct mem_range)); @@ -301,7 +301,7 @@ init_mmio_uart(struct vmctx *ctx) error = register_mem(&mr); assert(error == 0); - return (true); + return (0); } static void @@ -414,8 +414,11 @@ bhyve_init_platform(struct vmctx *ctx, struct vcpu *bsp) return (error); } - if (init_mmio_uart(ctx)) + error = init_mmio_uart(ctx); + if (error == 0) fdt_add_uart(UART_MMIO_BASE, UART_MMIO_SIZE, UART_INTR); + else if (error < 0) + return (error); init_mmio_rtc(ctx); fdt_add_rtc(RTC_MMIO_BASE, RTC_MMIO_SIZE, RTC_INTR); fdt_add_timer();