From nobody Thu Feb 20 20:16:12 2025 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 4YzPfQ00r9z5pN3Z; Thu, 20 Feb 2025 20:16:14 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YzPfP3dVpz3bpX; Thu, 20 Feb 2025 20:16:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740082573; 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=UZQn5GE48Xmddmy7e34RPj1YyOVJbTkPehS8s2PfRWk=; b=tFy/IBGKiUApFkH7zFG8tZ/gTfuxX7GjYhPCMeJ566r4SKkA8Iq71Anby2FqmpcH9Uxkpc mqqH3bceQRZ6ONUqBfWJiyw3D/P5GhMX5Y4pMebDzA7kNw6nv1ZS08XphoM5nFAqLcM9te yKnAthuQIfghshUloYXwlyErjQyLe4/rXGZxsv3LJF6bLQ1Q/r8iqkOQfkfcYm70o8jsWL fx353fjZkhRHZWoKWSz24uzPBNaRoDSOJpRUP0Fny23u46fSMVbiN3yGVwdhZtr4DTB0YU 1FQ9uhTxZbUVsnIDuuZk0gMhuUJifQQF38TsXgSm3mqldFz2d70+Fhd8HVWehg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740082573; a=rsa-sha256; cv=none; b=jfydVrgHwbQfvBBTomefuc9L2aqBsF1c6p/4Dsyi3OsZcYoeIyPt4aAM9df/O/dxz8BGTi U10LA1iEvAZxVbiecsEakdYN1XfnXuuPhBQjnbF1MPYre24U3RyoHzcBG+mh7M/lUnp10t KI3rOCBL8GGO6FbF20BT1PKyMRs5BWRxyKWHUxnvSUp4HMaQhk91AQzxHo7RtFdmxRDQit VK0jWF11o4bg9exXIRMWykGLl7QpbXfTBVvPp6hAoxsVNZ9LM6RpMPh+CqdUdBWl+bWbUn 5c6m5pp7JDycMEv+UA3uR1fRaj+w4WMBOfb4UFjZYX40lVBoFusgr3D8/OzwcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740082573; 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=UZQn5GE48Xmddmy7e34RPj1YyOVJbTkPehS8s2PfRWk=; b=xjIWZJqyMG3QUXAoqjACVXRf6jEuwKqrLBv5j0rXqIDt5rx/l7SOwGQr9dL5ry69jp53AD tYKCFT1TSeRn57nCnn8jZB6kBBVJhf8AlvOQRtSNKImHG+JSfxxD1PvX2ZgDzsrE9pdEnV /lrIvwbmo+87FY9sTofI20S8M0pGSgQ4ZO5GlGsQQpnlytqjw8UJ+djecYqEVSIYb15AGn uHaloDERlEGrD80r2wJfhbcY761mrrAhSAYh4DiWgqu1vqYNW/GybIGsN/e3wxBj64iz0y AGKkd1diTfGqxiIIadBP8t25dTCHie3OB9Q6sb6qgGUnIvGD9MdgyCMH6nJqzA== 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 4YzPfP0kJBz16B4; Thu, 20 Feb 2025 20:16:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51KKGCJb031108; Thu, 20 Feb 2025 20:16:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51KKGCKL031105; Thu, 20 Feb 2025 20:16:12 GMT (envelope-from git) Date: Thu, 20 Feb 2025 20:16:12 GMT Message-Id: <202502202016.51KKGCKL031105@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 39d58c816068 - main - libefivar: Add Display Only format for Hard Drive 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39d58c816068178515af0718c47f4f64d1cffc1d Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=39d58c816068178515af0718c47f4f64d1cffc1d commit 39d58c816068178515af0718c47f4f64d1cffc1d Author: Jose Luis Duran AuthorDate: 2025-02-20 20:10:44 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-20 20:14:26 +0000 libefivar: Add Display Only format for Hard Drive Ref: UEFI Specification Version 2.1 (Errata D) (released October 2008) Reviewed by: imp, emaste Approved by: emaste (mentor) Obtained from: https://github.com/tianocore/edk2/commit/9e6537469d4700d9d793ee21e9c2f2e7ddbb2176 Differential Revision: https://reviews.freebsd.org/D49060 --- lib/libefivar/efivar-dp-format.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/libefivar/efivar-dp-format.c b/lib/libefivar/efivar-dp-format.c index b4300573e41c..3fa2833a7e7a 100644 --- a/lib/libefivar/efivar-dp-format.c +++ b/lib/libefivar/efivar-dp-format.c @@ -1944,7 +1944,7 @@ DevPathToTextHardDrive ( case SIGNATURE_TYPE_MBR: UefiDevicePathLibCatPrint ( Str, - "HD(%d,%s,0x%08x,", + "HD(%d,%s,0x%08x", Hd->PartitionNumber, "MBR", // *((UINT32 *)(&(Hd->Signature[0]))) @@ -1955,7 +1955,7 @@ DevPathToTextHardDrive ( case SIGNATURE_TYPE_GUID: UefiDevicePathLibCatPrint ( Str, - "HD(%d,%s,%36s,", + "HD(%d,%s,%36s", Hd->PartitionNumber, "GPT", G(&(Hd->Signature[0])) @@ -1965,14 +1965,18 @@ DevPathToTextHardDrive ( default: UefiDevicePathLibCatPrint ( Str, - "HD(%d,%d,0,", + "HD(%d,%d,0", Hd->PartitionNumber, Hd->SignatureType ); break; } - UefiDevicePathLibCatPrint (Str, "0x%lx,0x%lx)", Hd->PartitionStart, Hd->PartitionSize); + if (DisplayOnly) { + UefiDevicePathLibCatPrint (Str, ")"); + } else { + UefiDevicePathLibCatPrint (Str, ",0x%lx,0x%lx)", Hd->PartitionStart, Hd->PartitionSize); + } } /**