From nobody Thu Feb 2 20:07:37 2023 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 4P78w965sNz3kWx1; Thu, 2 Feb 2023 20:07:37 +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 4P78w94Gd0z4H9j; Thu, 2 Feb 2023 20:07:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675368457; 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=kyL+GJzSQVQ7SZ4Dk40gRQ0rVRr3CzSUlkPmu+pFpAU=; b=LP4oPLSlAYQlXPi6Qr1U5ansbmf1NnNQLP+SmdOPd6ZDRWlUpizHezgPjkqasOxdCSGIer wjE7hKcdMKV9i1Mak93/tfNXbbk+AdUPW8X56D3e5wQYXZ5ij4OSa8QAWR8jWgT9GxhC4R KV73JNcwFVdvHUFY3EFyAGE7WT8VcOgvy4smRgAQXps/nCTmMvwRkpmfLkBb08gkFW3O1n 4q2LiiEDlyUXRtyl7KlGG5rRUn+f0Nw1yZhzmdjo4zxYWJEO6naiUgGO2jUflb2S6oWBM0 hQW0MySHdLJdJKIENek8B74E3EJKgBHixGgg6e5GrBNFLH2yZxoqxx+SZaVHyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675368457; 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=kyL+GJzSQVQ7SZ4Dk40gRQ0rVRr3CzSUlkPmu+pFpAU=; b=m85NEXx2YGUQmok1IJrhLy15aJbKwHp9XtSSDhGGqlIg3W0XQ5dSgoKlxCx+kneV4K3zlO pGdaM2ewPA4LzYVGjru173Cn3W/p0QwP3PHclavVMmto6bqNDikfyLslK57F+hVXILY80j I7uakdFWGnPdNKVsL9YhfaRRYKEF57Jstv+io4hY5v6WNJXGjn0BhQU80b4TcEp6ambW34 yTUEMfoZf23v2qQdRZlVLgCB0uKGqw2tYQ+hdZvIINQBHndf+PvhdkxPQ9M854r6gDocld BqMiOOZxTDdK72k1UchxcfHSpnMIG/3qKaUFwfEMGilxa7lKuFz5TuINrYOeiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675368457; a=rsa-sha256; cv=none; b=ncq9dubMmUWwzyiJHrvw/30gNfCzzaVh7j24UCrhSNCJwuh2UXSnFoln9V89UlqhJEwGcp 8BR9fY2IfB2Dhi9MbUBSELNPf2BDCPVYydZixSxVahXkFCu3Alf+RvAXa+I7YYOWU5wOU/ bjse7tL9oDG84oaF0folWcPM9FJ2xf9s0V6rbI2EwjBdj5U/6i5BOsy9vVDemqqMfvWH1V hUWNZRloTM6SJudJ7PssHVaJ23JkhK+yBcvsq7m25PlQD3JrPvXPD3nAaCvMtIsSRhZmvV iz8OdrqdEgrYw0w8uZFmJK4JoUh8EtlAY+VJvdfqmz7KWFtYQL0urMU2o6S/9A== 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 4P78w92pmwz16Wt; Thu, 2 Feb 2023 20:07:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 312K7bXv036102; Thu, 2 Feb 2023 20:07:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312K7bdw036101; Thu, 2 Feb 2023 20:07:37 GMT (envelope-from git) Date: Thu, 2 Feb 2023 20:07:37 GMT Message-Id: <202302022007.312K7bdw036101@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 81d71f94cabc - main - kboot: Fix hostdisk fmtdev 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81d71f94cabcef8f88637f426bcd8379f9448fd9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=81d71f94cabcef8f88637f426bcd8379f9448fd9 commit 81d71f94cabcef8f88637f426bcd8379f9448fd9 Author: Warner Losh AuthorDate: 2023-02-02 20:03:39 +0000 Commit: Warner Losh CommitDate: 2023-02-02 20:04:06 +0000 kboot: Fix hostdisk fmtdev The device name was totally wrong. It should be "/dev/mumble:" not just "mumble". Sponsored by: Netflix Reviewed by: tsoome Differential Revision: https://reviews.freebsd.org/D38318 --- stand/kboot/hostdisk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stand/kboot/hostdisk.c b/stand/kboot/hostdisk.c index fab4ee04bb6b..3c924293223a 100644 --- a/stand/kboot/hostdisk.c +++ b/stand/kboot/hostdisk.c @@ -429,8 +429,10 @@ done: static char * hostdisk_fmtdev(struct devdesc *vdev) { + static char name[DEV_DEVLEN]; - return ((char *)hd_name(dev2hd(vdev))); + snprintf(name, sizeof(name), "%s:", dev2hd(vdev)->hd_dev); + return (name); } static bool