From nobody Thu May 01 18:06:40 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 4ZpMSd5MbSz5vW6T; Thu, 01 May 2025 18:06:41 +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 4ZpMSd1KXqz4Bnw; Thu, 01 May 2025 18:06:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746122801; 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=sxA8otl7V1RSV4S2zD4XZlDa5E2v9LqRh5mq2FEcEjE=; b=NNNfugqa/kqoXcz0bc/uQ7vfiSC8LG1elQDLB5PNf7JtZIhD8Mg9LfhjdPHJP+b/o88TGH j6CHdRCD6jlcIQx+XAaqmovxY5Kusc0hgY8os+EUFQd4FZHD92KPKT9429x67r1LqYnafn pxAMQJFFqCNMaM5LCZ3r5jDpu9RIU5qS56Cvyd6LUb1UsLKIM9/4sVb1GS955k4gqNxx7G UY1DPVRUQxEBIlP2bGtwZvom6mpHLO1g2fmuhiYSxnotQc+7QN5J7Q16EWjFaA/Qn6D0m5 LoaS/tjRvY3ZM1UUnnhN6VsD79plWao79+qIdJsUmWQFWWsW/d9UWLPbOybFhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746122801; 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=sxA8otl7V1RSV4S2zD4XZlDa5E2v9LqRh5mq2FEcEjE=; b=Irruc3fhvzeyk2aLeMg4Qm1aoKUEzJJYICqzLhS68rfoIkzniRouTR9vCt8RmZeSbzVKix Qbyaz5o62NgLVrpMjfoyQiuOhggs2HPWSk59rVNo+X+AcJsiDyvx3Qr5XeoejVEOxsorOg P1xcaJjNdeJmlPw8AjnXMeGambtQWTXOCF11PQc6CZwtnykoHDhmI31VmtgLuTtsLbpwl5 zGAWxkGZqMx8WRnBWpzROMAKClymi4KllfaO/XPhkr0P+g+/QMFsJEEsLlhLSpEWnjWCpq sy0IVtLGVJ4uVfyWTyiTDZxA36eNSHro36em2YDi/W7VpgTMo/BfDUVLZ1CNcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746122801; a=rsa-sha256; cv=none; b=LVCImTW+CpaAUg/BVqzFQMUzTiGWPKulmMZ0aLcNlrTfSY19TD1Da35WS4837tKWNGSh/r AucZ6AFMg5I4JbzzNwSjxIkkwZmYYrHrxBu2v4tdDhxE5mxgXFBZ+DRxN9ohycpoGOpvM5 57WWmLGnY65yBwiSGdsVtpQPkMziC7lnaptPR1viILhaRTe9rZYqH1zL0MH595KJNg22pp JDENrRm9EWIBiNdnJs/HT4z7FmsfCxOVYoQQCR9k3T1EHGg0SW5571DHqaLS65M2pVjzbs 3sOGayunhT5CMgrXxqAqTa6Wna89xiciAw2+psBaMUTx8OUx2s96Sab1Oq/e7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZpMSd0N0Xzdqc; Thu, 01 May 2025 18:06:41 +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 541I6emu066641; Thu, 1 May 2025 18:06:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 541I6eRG066638; Thu, 1 May 2025 18:06:40 GMT (envelope-from git) Date: Thu, 1 May 2025 18:06:40 GMT Message-Id: <202505011806.541I6eRG066638@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: 915b2336b1c4 - main - libefi: Update to use the efi_guid_t from sys/efi.h 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 915b2336b1c428537a6ccaed1b7e60a39adf7b66 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=915b2336b1c428537a6ccaed1b7e60a39adf7b66 commit 915b2336b1c428537a6ccaed1b7e60a39adf7b66 Author: Warner Losh AuthorDate: 2025-05-01 17:53:36 +0000 Commit: Warner Losh CommitDate: 2025-05-01 17:53:36 +0000 libefi: Update to use the efi_guid_t from sys/efi.h Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D50038 --- lib/libefivar/efivar.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/libefivar/efivar.h b/lib/libefivar/efivar.h index 7551205fda38..980f261e9edc 100644 --- a/lib/libefivar/efivar.h +++ b/lib/libefivar/efivar.h @@ -46,19 +46,14 @@ #endif -#ifndef _EFIVAR_EFI_GUID_T_DEF -#define _EFIVAR_EFI_GUID_T_DEF -typedef uuid_t efi_guid_t; -#endif - #if BYTE_ORDER == LITTLE_ENDIAN #define EFI_GUID(a, b, c, d, e0, e1, e2, e3, e4, e5) \ - ((efi_guid_t) {(a), (b), (c), (d) >> 8, (d) & 0xff, \ - { (e0), (e1), (e2), (e3), (e4), (e5) }}) + ((efi_guid_t) {(a), (b), (c), { (d) >> 8, (d) & 0xff, \ + (e0), (e1), (e2), (e3), (e4), (e5) }}) #else #define EFI_GUID(a, b, c, d, e0, e1, e2, e3, e4, e5) \ - ((efi_guid_t) {(a), (b), (c), (d) & 0xff, (d) >> 8, \ - { (e0), (e1), (e2), (e3), (e4), (e5) }}) + ((efi_guid_t) {(a), (b), (c), { (d) & 0xff, (d) >> 8, \ + (e0), (e1), (e2), (e3), (e4), (e5) }}) #endif #define EFI_GLOBAL_GUID EFI_GUID(0x8be4df61, 0x93ca, 0x11d2, 0xaa0d, \