From nobody Mon May 26 15:33:33 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 4b5ftQ4Zp5z5wBcf; Mon, 26 May 2025 15:33:34 +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 4b5ftP61y4z43F0; Mon, 26 May 2025 15:33:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273613; 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=MmDKjW8oZsuZy046N4A/6gffKNI3y7wxUxOWYV+X9UE=; b=rzr8o9yz8BcRRZ+lTNLYC99AY7pvPGVMwoLfSoOWIL5av39mw3d1Z9Ok5NlFLqt7pOkk01 59+RjIsptVm8HYqhjlqWyIM3OvWcHenrdE0J0/2JgMtV5TCRD4viKvzHn/aJqb/adNFtjf IzVprSAyiblXrtCEH96OWdIUBWxaS5kuIi/b1LIBXyeJKPvoqvudgK2ZvxyQKP4r3eHEsa HWVbgUF0M8mJjiQAGHKGpx3mlO5iFYhXwbLFvLb93S4krGp2qvE8Z8IIl4oIxWJGz8BO66 BPAo+nCx44xyg8MjMge2hjGnMvCz9rWgwOKPvk9aUGT7GhLBeZeRNcJdtII8Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273613; 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=MmDKjW8oZsuZy046N4A/6gffKNI3y7wxUxOWYV+X9UE=; b=LlfoT+cr1gol4tJBx0XLvvmaqThwY8cJcRXcpZfEN0BECiEEymZQvCEk3JLeSDUbQTAo7l /4/OPNJNW+meo7UdL6uIW0IEOxWesYkISSzNjyVGO7zotuKSgI05RKwNxgQqjdHPTQ5VT/ KufbV2Osremq2bkEgHCbU/BOpXcUxGPmIdgeibDhHMhN5sISSkjj8CT1GykcJbhqHPS+sm N94UfGHG9atS0Q81GS6tcBAHz2YCN9IfxrEJwDf9m+xYGoIm/CaT42Ioit2uALHKiVSlDj 5ieoXcIZbke+2/CmVD8nWyqaEfbohAg0JH5xazBc53xR3KYBiEB59QNRxzdhAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748273613; a=rsa-sha256; cv=none; b=kSgmHIlWICMEbEkmTQZPgWs2J/liNe5i0uIIbOiwQTpiHOhstm7Ts3Idyacq3bkZIILs3Z k1wuDfy44Jb5G+75MN3AXchu2ca4C4mQTAV9Zf4/QfYojmSoZgQZuiQCVimr8Y63hZMchI omm0fm9CON85fyjkfWFC/26hV/PLmIaEwUC+lSPp7aewyh59O+xw60F1Ou5yk+5nr45C3a NwRHx1GQ1ZwUZSWhSJg6t/r12kLW6YLjhZEcfItXXFliq5R0FeM4EB51+FN0pod1zKZdBL IUGAQ48M7Y+2vjPN4crrlE9YE2qllxo4aXL3IMXssA94dsixzzDcebNkkyarDA== 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 4b5ftP5dmtz1CBb; Mon, 26 May 2025 15:33:33 +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 54QFXXia045079; Mon, 26 May 2025 15:33:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QFXXeK045076; Mon, 26 May 2025 15:33:33 GMT (envelope-from git) Date: Mon, 26 May 2025 15:33:33 GMT Message-Id: <202505261533.54QFXXeK045076@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: e94f269cd329 - main - stand/efi: Initialize archsw at compile time 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: e94f269cd3293187d52406f1904b82613964644f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e94f269cd3293187d52406f1904b82613964644f commit e94f269cd3293187d52406f1904b82613964644f Author: Warner Losh AuthorDate: 2025-05-26 03:25:26 +0000 Commit: Warner Losh CommitDate: 2025-05-26 15:30:37 +0000 stand/efi: Initialize archsw at compile time Sponsored by: Netflix --- stand/efi/loader/main.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index c9a842afb06d..70cdfb2e9328 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -71,7 +71,17 @@ #include "loader_efi.h" -struct arch_switch archsw; /* MI/MD interface boundary */ +struct arch_switch archsw = { /* MI/MD interface boundary */ + .arch_autoload = efi_autoload, + .arch_getdev = efi_getdev, + .arch_copyin = efi_copyin, + .arch_copyout = efi_copyout, +#if defined(__amd64__) || defined(__i386__) + .arch_hypervisor = x86_hypervisor, +#endif + .arch_readin = efi_readin, + .arch_zfs_probe = efi_zfs_probe, +}; EFI_GUID acpi = ACPI_TABLE_GUID; EFI_GUID acpi20 = ACPI_20_TABLE_GUID; @@ -1202,16 +1212,6 @@ main(int argc, CHAR16 *argv[]) char buf[32]; bool uefi_boot_mgr; - archsw.arch_autoload = efi_autoload; - archsw.arch_getdev = efi_getdev; - archsw.arch_copyin = efi_copyin; - archsw.arch_copyout = efi_copyout; -#if defined(__amd64__) || defined(__i386__) - archsw.arch_hypervisor = x86_hypervisor; -#endif - archsw.arch_readin = efi_readin; - archsw.arch_zfs_probe = efi_zfs_probe; - #if !defined(__arm__) efi_smbios_detect(); #endif