From nobody Thu Jan 04 01:37:31 2024 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 4T58NC5YKdz55DG0; Thu, 4 Jan 2024 01:37:31 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T58NC3qT4z43B0; Thu, 4 Jan 2024 01:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704332251; 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=JokGfpF+jAxbgwtOB+VjyEy78GxlAQXsbqdxmBcujZ4=; b=MxPaDK3wu+A6TtSt2JjIZzL3KJcGSpVY26byIq+YTvrX73VOvPImGTpMrUiOcNct/guhRH O0rpRKbELSSesLMpmnXCw5kG7p94DA+0lgQxvHW6SIVslTK9L6p2mSDFl0IYiJ7nUb/Ndc 3M0ySSg3q1+eYrXkcjRWot6nKBgJpx+G46+bYWZtCiTNR49nmN37gUhcveZsT6s+YspiMT STuueHUCzJ36JH5WSviWcwKoRWKgboDSsCUSf4IQx4NbBvl+hagRbuQt4PDs1QxTcpMXSf Y/5Y+f4ztltqbQxJFqDDcf2R8EidDOZbhJO63kfpSQpbmUTaP3uBSNZCHZUsJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704332251; 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=JokGfpF+jAxbgwtOB+VjyEy78GxlAQXsbqdxmBcujZ4=; b=ylkJOFnZa90eAOhVVfsJt7J2Z7UF0BA+N9J0bA08/ERUXCJDPA/C+WvIS9UX+8cI/5ohkY iLhbRlYNWt6cBStKu6zOmiE+SdJgwrvpuqOlUCViDkYII7Ss/ewZags65WW1VxcFSg9Hl7 5kTBMidWvqWPL3YBNrLqXrQ7nko/awMzNshUdeEUmapos3sZ/pggmqgFJ62ADgRtONmNkM dghxzhMpx+zroe3shLGWSEr59BlN/LnosOguNpHxmGawxgn2WvB8Au2CDSqRBjd2da/iZY 65iOtGW4VTWAVTQ4u8mLQNMBDybnh/+J9zyc0Uu1ydUvsU7mAep/4K/ETzkIDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704332251; a=rsa-sha256; cv=none; b=AfEguWmsobjGbtfgeyhsL6MNfqCPbjg558SRZ+Hw09qpVoI9c2DodZa3fU0fpgFbseee7O /S0EixxVpiGVud4gSjILa12onYJ8QATDGHoOyCJXcDWXVmyIQ+bzUxIJhrkhPEvY3X4coM WjhQrct0sIFIxBKrN+uTnWSk4ePw5TGWc3Tp1uenId/0+Y5oAwmxXEyOUwbl8OavM+0XpK wIysi3DDYOGIzS082oc1asH+1kIr8xOMBJzhfspq4+nuPmz/f2nQy7LkWX9Vu+lZPgMsqo 0k4zyb02RSzSYOPNXT71XIH3dIJ+mJyKXHuQ/HRbAFzIjT1XFbVt4yE/7D43YQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T58NC2wZ3z186F; Thu, 4 Jan 2024 01:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4041bVaC024614; Thu, 4 Jan 2024 01:37:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4041bVai024611; Thu, 4 Jan 2024 01:37:31 GMT (envelope-from git) Date: Thu, 4 Jan 2024 01:37:31 GMT Message-Id: <202401040137.4041bVai024611@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 67082f077f39 - main - bhyveload: fix non -l use 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 67082f077f39d9c7b7bd561c14622e6f3ef23681 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=67082f077f39d9c7b7bd561c14622e6f3ef23681 commit 67082f077f39d9c7b7bd561c14622e6f3ef23681 Author: Kyle Evans AuthorDate: 2024-01-04 01:36:06 +0000 Commit: Kyle Evans CommitDate: 2024-01-04 01:36:06 +0000 bhyveload: fix non -l use explicit_loader_fd should have been initialized to -1, not 0, but my last round of testing was only with -l... Fixes: bf7c4fcbbb ("bhyveload: hold /boot and do relative [...]") Pointy hat: kevans --- usr.sbin/bhyveload/bhyveload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 124c1141bffa..d4f930e8cc76 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -97,7 +97,7 @@ static int hostbase_fd = -1; static void *loader_hdl; static char *loader; -static int explicit_loader_fd; +static int explicit_loader_fd = -1; static jmp_buf jb; static char *vmname, *progname;