From nobody Sun Feb 27 16:47:49 2022 X-Original-To: dev-commits-src-all@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 7068919EA2C1; Sun, 27 Feb 2022 16:47:51 +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 4K68ZY728Qz4m7n; Sun, 27 Feb 2022 16:47:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645980470; 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=Wrtuy+GfbX42vOGkkTu1wWkEr9UP2ymPCrdIFNTcibQ=; b=By2vrTi34T2iO+Ct8TglGfuqYCtO3/PtHY1pdjjDDkrNvzNpEEfuq/7z37F7Y2cTr0sPKb VXVEnOqy3XxcDUva1/d3GF0R16edRFxg2flIuAX7rqQQ3N9J+DQE7zA2s32eVOWHz4cbKK WY3QbhzmONjvAorZQ7aXMZs+pgv2G4g5bdI27IjmMUBApNFfDJamG7wd8GZ530rFDjtV45 nKHNV66dpp9IzM3GIxaMhD0tgwIxAmV3k5i9L+FTRVAImMrzmuHE5VurkO3X5xezyF7tvq 02ZC3PpVScndk9K2rzT0C+QMbrh0dLkPOdZfu3OWT3f2FyL5/QbuIH8V18t+2Q== 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 A9CF62ACF; Sun, 27 Feb 2022 16:47:49 +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 21RGlnaG036955; Sun, 27 Feb 2022 16:47:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21RGlnaJ036954; Sun, 27 Feb 2022 16:47:49 GMT (envelope-from git) Date: Sun, 27 Feb 2022 16:47:49 GMT Message-Id: <202202271647.21RGlnaJ036954@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: 9a62aa932906 - main - libefivar: Use VENDOR_DEVICE_PATH structure for Debug Port device path List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 9a62aa9329063f7e0c1d90262863b94fef436d7a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645980470; 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=Wrtuy+GfbX42vOGkkTu1wWkEr9UP2ymPCrdIFNTcibQ=; b=rEHpHr+kyRvk83nAUFnsqE4TJ1tgM7T8o0RD8T1aeRn22Uc8ZXteWqUYzYNOTG/ax/fWEF Ygf0ievFdCertC/1em4RGhOFtWTZ0hvFT2RvDCy3Wxkc4v41GtrHmZRr3oZE9Fc3Au333c K2Pwru34o44nAJOmV96ckcjo8T60V5AT6AetABscq4PYRptq9C9WC999D9sOLWXH6SkXgq nfcMhJGoAiZcPds7Y22C/J9Xa84pJmUoxIPb0xpy3vH+UnG3AVXNI/TCQZtSrIz+26otPL xS7Bdp6RbYNS0qUF6iKUK+LvzLpmD+PphZG3aUSS9SsTzPbEVPdLSYZ3iSDG2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645980470; a=rsa-sha256; cv=none; b=lPhvid+PTIEXF8ySvNswuq5LiwN0WxO0F7TVrmnkh5HM6xx3k2LOmwEMa2FEJGL2BeASae BKdzQrRWPdSlO3aioVr86jp5LixO6YLuzLhSvjDt8u2T4EPh5iBlEPwILm2R3e65L7RdEf BwbwpgzLvOly+qQXMwTphDIr0aLLQKxxHexZRgohXBoV11CQy+FCKJbbwI76k7F3jOnfTc jdj5AoSCXqumNYnOdvuCu5LJOSX1jW4fFnbb3CMy0ZIP5wKxXWBpeq0m0jynKdDX+IyOm6 TvQW++ftZY6ieq+hQKpkkwzce7Cq/t5rlN/7qZ13HALlYUWFksKrZAgN8doKgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9a62aa9329063f7e0c1d90262863b94fef436d7a commit 9a62aa9329063f7e0c1d90262863b94fef436d7a Author: Jose Luis Duran AuthorDate: 2022-02-25 17:35:58 +0000 Commit: Warner Losh CommitDate: 2022-02-27 16:13:12 +0000 libefivar: Use VENDOR_DEVICE_PATH structure for Debug Port device path When converting DebugPort device path from text, current code use VENDOR_DEFINED_MESSAGING_DEVICE_PATH structure for Debug port device node. typedef struct { EFI_DEVICE_PATH_PROTOCOL Header; EFI_GUID Guid; UINT8 VendorDefinedData[1]; } VENDOR_DEFINED_MESSAGING_DEVICE_PATH; And Debugport Device Path is a vendor-defined messaging device path with no data, only a GUID. So it's better to use VENDOR_DEVICE_PATH to create the Debug port device node. typedef struct { EFI_DEVICE_PATH_PROTOCOL Header; EFI_GUID Guid; } VENDOR_DEVICE_PATH; Upstream Bug: https://bugzilla.tianocore.org/show_bug.cgi?id=1229 Obtained from: https://github.com/tianocore/edk2/commit/9343d0a1cd09544686b14dba5b428d7bc811f6b9 Pull Request: https://github.com/freebsd/freebsd-src/pull/581 --- lib/libefivar/efivar-dp-parse.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libefivar/efivar-dp-parse.c b/lib/libefivar/efivar-dp-parse.c index 82e003b98229..8e6a7c8acad1 100644 --- a/lib/libefivar/efivar-dp-parse.c +++ b/lib/libefivar/efivar-dp-parse.c @@ -1876,12 +1876,12 @@ DevPathFromTextDebugPort ( IN CHAR16 *TextDeviceNode ) { - VENDOR_DEFINED_MESSAGING_DEVICE_PATH *Vend; + VENDOR_DEVICE_PATH *Vend; - Vend = (VENDOR_DEFINED_MESSAGING_DEVICE_PATH *) CreateDeviceNode ( + Vend = (VENDOR_DEVICE_PATH *) CreateDeviceNode ( MESSAGING_DEVICE_PATH, MSG_VENDOR_DP, - (UINT16) sizeof (VENDOR_DEFINED_MESSAGING_DEVICE_PATH) + (UINT16) sizeof (VENDOR_DEVICE_PATH) ); CopyGuid (&Vend->Guid, &gEfiDebugPortProtocolGuid);