From nobody Thu May 1 18:06:43 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 4ZpMSh3kKCz5vWGb; Thu, 01 May 2025 18:06:44 +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 4ZpMSg5C9Yz4BHC; Thu, 01 May 2025 18:06:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746122803; 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=rdk7wVSTapQa8I2BxdHoXKe3hWTSabOuo8zTZ+dfSic=; b=O/9KhtMw4tvLa8cxwH7rwQK6y3mWkM82A8uFOa9xLYvj79EOKz27kKkSV+wH5NscB+netm Yr16DyOVLPCPvzxuOXSn8NGgWRAz6yano3sA5PlOw6wuqVFk6YDdet4gcrvZWxfAIyF+ij rdMhP1A2kOWSfpNhm++4shsDb7Bi64jlg3FiL6Zi2zOKFBrRpF8Tfd4/aUMojilFwUMwTe TcFCtGJSh5qzwPbMwRX7svdJ0YzSvq48gneiqD9X/0NM5xB0+tRm5DIyzRiggFyt1lLtfT tySTJ6tXTP8nQ7nLRyCChRvDTMfuD61I/KJibyz3/61ypiMLUWeO+BGq5Ccygw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746122803; 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=rdk7wVSTapQa8I2BxdHoXKe3hWTSabOuo8zTZ+dfSic=; b=R44Ac4HCtyYCYUnbKbsLK9D7Sg79sZlIYMV/2u319uPZ12s4S+7/mewanR0rm6jwQXO0sz r7/h43qsq/7JivMuFgdnx2B9zT9aOA/Nhu7VF8VIFpITNWCS1YvFlZBbQjcASlPdCZHvcT l8dOPqabc0bU/DY2LwyXeUtZHNDbLO3VrhhzANCIg1Kfq7bXv4fHA3iQRyT+DwXbxh6dkA tkzdRWf7PVGtf/EkKWKZVf4UONRIuLvYjAbphFkEpeHKLSSlLAjf22n+aiCnLW9z4R+PCB pV9p00y39CI1T7iBW2GRL538wAOTCZFApqu+3ZKtTqu+/cVMu1PZJ4hO/dAPuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746122803; a=rsa-sha256; cv=none; b=b4CMMaSHSzIbZwLZku8uukRWIcbBHZeCpI976G6Q7sSrBJJkxNGeu1ZTxF6bTBBi3UnRrN pY7zupYhULNtSDP4T7XnI0OXFzHATHQi6e7+o/TbT6Gdi3XIpK9BE1RShLedyDiCgA1HrI ZeF1hoaNZ03xPA5lbmizNEekdf3/qeULsFMa+Fb0mn5IRlgna0xcSoIqZiPbA1at1dnDIf zoNXx1YfzJY8aVwpOxfON3OuvfD3REeAM3Q32XyxszfTT0NV7cMH14N7SVJYsx93lVB/u4 7V7zeVvUQCMT9cmtwJEulj6fiOmUvZMAYYM+ZsTf0QQ1NgyUr7KWQ6xJo3zUZQ== 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 4ZpMSg22wlzfPc; Thu, 01 May 2025 18:06:43 +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 541I6hVl066715; Thu, 1 May 2025 18:06:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 541I6hgV066712; Thu, 1 May 2025 18:06:43 GMT (envelope-from git) Date: Thu, 1 May 2025 18:06:43 GMT Message-Id: <202505011806.541I6hgV066712@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: 4c317815f1c2 - main - efivar: Move to new ioctl struct 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: 4c317815f1c220033ab9e1da8b3e22c0e2180fcb Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4c317815f1c220033ab9e1da8b3e22c0e2180fcb commit 4c317815f1c220033ab9e1da8b3e22c0e2180fcb Author: Warner Losh AuthorDate: 2025-05-01 17:53:47 +0000 Commit: Warner Losh CommitDate: 2025-05-01 17:55:05 +0000 efivar: Move to new ioctl struct Move to the newer ioctl 'struct efi_var_ioctl' which uses efi_guid_t instead of struct uuid. This allows for direct assignment agaain. Sponsored by: Netflix Reviewed by: tsoome, kib Differential Revision: https://reviews.freebsd.org/D50058 --- lib/libefivar/efivar.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/libefivar/efivar.c b/lib/libefivar/efivar.c index e28987ff001d..b380ae285831 100644 --- a/lib/libefivar/efivar.c +++ b/lib/libefivar/efivar.c @@ -120,7 +120,7 @@ efi_open_dev(void) } static void -efi_var_reset(struct efi_var_ioc *var) +efi_var_reset(struct efi_var_ioctl *var) { var->name = NULL; var->namesize = 0; @@ -161,7 +161,7 @@ int efi_get_variable(efi_guid_t guid, const char *name, uint8_t **data, size_t *data_size, uint32_t *attributes) { - struct efi_var_ioc var; + struct efi_var_ioctl var; int rv; static uint8_t buf[1024*32]; @@ -172,7 +172,7 @@ efi_get_variable(efi_guid_t guid, const char *name, rv = utf8_to_ucs2(name, &var.name, &var.namesize); if (rv != 0) goto errout; - memcpy(&var.vendor, &guid, sizeof(guid)); + var.vendor = guid; var.data = buf; var.datasize = sizeof(buf); rv = ioctl(efi_fd, EFIIOC_VAR_GET, &var); @@ -211,7 +211,7 @@ efi_get_variable_size(efi_guid_t guid, const char *name, int efi_get_next_variable_name(efi_guid_t **guid, char **name) { - struct efi_var_ioc var; + struct efi_var_ioctl var; int rv; static efi_char *buf; static size_t buflen = 256 * sizeof(efi_char); @@ -240,7 +240,7 @@ again: rv = utf8_to_ucs2(*name, &var.name, &size); if (rv != 0) goto errout; - memcpy(&var.vendor, *guid, sizeof(**guid)); + var.vendor = **guid; } rv = ioctl(efi_fd, EFIIOC_VAR_NEXT, &var); if (rv == 0 && var.name == NULL) { @@ -266,7 +266,7 @@ again: rv = ucs2_to_utf8(var.name, name); if (rv != 0) goto errout; - memcpy(&retguid, &var.vendor, sizeof(retguid)); + retguid = var.vendor; *guid = &retguid; } errout: @@ -351,7 +351,7 @@ int efi_set_variable(efi_guid_t guid, const char *name, uint8_t *data, size_t data_size, uint32_t attributes) { - struct efi_var_ioc var; + struct efi_var_ioctl var; int rv; if (efi_open_dev() == -1) @@ -361,7 +361,7 @@ efi_set_variable(efi_guid_t guid, const char *name, rv = utf8_to_ucs2(name, &var.name, &var.namesize); if (rv != 0) goto errout; - memcpy(&var.vendor, &guid, sizeof(guid)); + var.vendor = guid; var.data = data; var.datasize = data_size; var.attrib = attributes;