From nobody Mon Sep 21 16:56:21 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 4hpTs12JXzz6ssgH for ; Mon, 21 Sep 2026 16:56:21 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hpTs11THNz4tc5 for ; Mon, 21 Sep 2026 16:56:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790009781; 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=8xhkcbPLg7QeW6xWmoBMVfcy6J+CcomtJ2o0ZmmQUlg=; b=TU7unAiNGIh49IwLhhTCrWSC9owOp6plv5+UyAIzLu6wDyhHEgXUkQUeML4hpb7cxf8Az4 zqbn5AxhHbrfZLnQi/4WNreolzb6Y5HuyCamM97ONCgQZ1jK/gW4V2S5jEgMzzERLxEMFu 9zSyogYwAq91XVHUOPkTl+BixHpkvkzKFhciu9O714OlJqgjk7Bh4VBO/R6YHgmUl4LenK RX9FmFjg40gRlnxEY+kMauc06tyjZXOsHcdwqLrwBOKJMQ/SmAG7ofLHqGSa2TWfJvDoW3 /gy3h8ximv0W1WAAdIyOfeP3yACZAAm5P25rNyK58mDSCQl/KuMmDZDeZpmWpA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790009781; b=p7v+zq/zWMo+gm4a/XQd697YGEuHTNVYAMxDpE8f+8J7b+ZNIWnGyjOdCT1EU1RDvupHy3 t1qLH7JDn7B2HVDsQ+aQ3jLmnu7FVB254kkQ0OZ1LMdNf2mGJAVbylxKhTCGlPk+559Ahe 3mMeXWBf2bSoRa42EEfs7ONdKYO9iLX6W4FFBp79YHCFxErsFMdLEqY16gkd+DaW3sDOTM E2Wj49FlYsPgB7AiwI+zGq48nLQVQ3aInofA0aLPWrxc/GCgEZ2KazrL5EoqwPhAWh4WZO 5QYraxEwMGW1GWnI8un7ODvHW7tUii8eRRcDGDLo5wI9cYcvVogCo4takMHmwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790009781; 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=8xhkcbPLg7QeW6xWmoBMVfcy6J+CcomtJ2o0ZmmQUlg=; b=J2kmFp8oEU5k/GCO+PafL1Z3AorFF5jv9I2IqkB+oeB2OG1VOHEG+hEBqBBW6Ie5n+F+o2 uY83GBa0SttuTUsWsWTaTEdUEDcb85ERGFsxFUc88BacP/vurmvoa8NLInV21r+00qZjp9 ero7NkPuSoRthqlOAK9z5fzae1vFzcj5BP6YIgRSqyruBRDgbdCmbVkjDWdLYcAGA1VlJU HU+4zJHeXxEO0aS1E8FITGd4q9zi8OyW8Q7tRJFnB4Jvb0Y5r7hDua18oMQNcdvWPbQyQs EJDUiRZ58b/gFE26N0yM1hhI5YNHTVyihLTqgGGIc8vJ9+2UnmjNRypJcBT5dg== 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 4hpTs10XGrzSQ4 for ; Mon, 21 Sep 2026 16:56:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39f5b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 21 Sep 2026 16:56:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roman Bogorodskiy Subject: git: b27a221ef79d - main - bhyve: fix boot device ordering 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: b27a221ef79d6d77d6173897f12118e1126453d8 Auto-Submitted: auto-generated Date: Mon, 21 Sep 2026 16:56:21 +0000 Message-Id: <6ab161b5.39f5b.73544cea@gitrepo.freebsd.org> The branch main has been updated by novel: URL: https://cgit.FreeBSD.org/src/commit/?id=b27a221ef79d6d77d6173897f12118e1126453d8 commit b27a221ef79d6d77d6173897f12118e1126453d8 Author: Roman Bogorodskiy AuthorDate: 2026-09-20 14:41:55 +0000 Commit: Roman Bogorodskiy CommitDate: 2026-09-21 16:54:45 +0000 bhyve: fix boot device ordering EDK2's QemuBootOrderLib inspects the bootorder file provided via fw_cfg and requires it to be NUL-terminated. Otherwise, it rejects the supplied bootorder and falls back to its default boot order. Currently, bhyve registers bootorder with qemu_fwcfg_add_file() using bootorder_len returned by open_memstream(), which excludes the trailing NUL byte. Fix that by passing bootorder_len + 1 to qemu_fwcfg_add_file() so the fw_cfg payload is properly NUL-terminated. PR: 279720 Reviewed by: markj Found with: codex (gpt-5.6-sol) MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59859 --- usr.sbin/bhyve/pci_emul.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c index 2baeaa0c76b7..9170e0b6b93c 100644 --- a/usr.sbin/bhyve/pci_emul.c +++ b/usr.sbin/bhyve/pci_emul.c @@ -1516,7 +1516,7 @@ init_bootorder(void) } fclose(fp); - return (qemu_fwcfg_add_file("bootorder", bootorder_len, bootorder)); + return (qemu_fwcfg_add_file("bootorder", bootorder_len + 1, bootorder)); } #define BUSIO_ROUNDUP 32