From nobody Mon May 26 15:33:38 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 4b5ftV5Qdkz5wBZf; Mon, 26 May 2025 15:33:38 +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 4b5ftV33GDz43WC; Mon, 26 May 2025 15:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273618; 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=TPVw6rD8YVkFD+qlW5eEW5CzrkR0Tkv5V8UvNWBVNi8=; b=Eb+qovBaw/1cDVAlKzZUn2Na+tbNX3CXA+s0rnGAqHC+RJtMrnrxyRpcKCdTDLf04DtEJk USSojdkWX0pXMWCSRBqYrm399r8SVKTqNe4/pHpiE4Mywh1TaxTKsDacp5cBjqwHtxMHBE VJO8Bjw8wY9+GZ1DvbZc/uz4SisiEmrlxcfXLccAAcCvoOuHExRjc3B+Td9ZLoiLDgKR25 bwrI9QwWbI6B/zbpK7cSUC31q+VH0p5OkrjnlbOAGZ0qfrufPEGCyApXQZmcPWqciK5gbc UbY/WFRlgPpvATueeYi/LN3q1ZGyXrx4bLHHb8GTHQjMEfwB0RPyjLAerZNimg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273618; 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=TPVw6rD8YVkFD+qlW5eEW5CzrkR0Tkv5V8UvNWBVNi8=; b=aVmpWYdVnQaTETm057XmcOEPYuQ9UrYGhK33SifRdMLlH9QwMKgWtZY9KjyggnKkDnELTk 8L8mnlESlWgfy7zNwEGC1qxUC3x56VGDox4bOLOnFM7sZGgWH9hIw2n8rJyFYeW3P/++Y5 hiKIagJlp5HGP1ugegXvUCghN69Y7CfHomzmIE+JgPBFOrjAsnlBzZ8YEjOxi4KDWMu280 vWLPfShW6aENH0vHXOiWLAldm4ZGPPeVV1GCP8/ezJgKv2YYmSVuj3A76ZeTHxDZ1LdGCj b1G6lA+OgHSRRbcoGxcM1GDnqZr8kAkijotZt3tzjvJLqfpDzdidKiF0m+jn/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748273618; a=rsa-sha256; cv=none; b=PTGQVNgdDnJxtvFTxEjPHoULp7mD44JWTbmqQp9VjU3UPNteXMaGZkxjJiD94GvRwUk9iC xkUJG4ssKlpz1EFThi2LZDcSI9SheC17v6OggKWuebAVooxSiVD6CRRgt1Cm28dMtoMXj2 Bo4rvDbOUkwG2dDeazJg2vmaRxWRSKws4QjcbHHp5nKQwS933qBkovZ1jyeYWSSECn0gIW cV4Ww/Bd71BnTL0q69YhQxnItmJSalKtYuEJnzAicQsj8TRIROX5CGfPu6phGPIS5Us0l8 wYalQAyFNU0HI75mRfcsDuGJ5cXY+iW7IVUz+QZda5UcgELSZpZzRN7RelWb5g== 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 4b5ftV2Nn5z1BZN; Mon, 26 May 2025 15:33:38 +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 54QFXcTk045233; Mon, 26 May 2025 15:33:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QFXcOr045230; Mon, 26 May 2025 15:33:38 GMT (envelope-from git) Date: Mon, 26 May 2025 15:33:38 GMT Message-Id: <202505261533.54QFXcOr045230@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: 26178196de73 - main - stand/userboot: 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: 26178196de7345cdef047ef5b953101d0b50d41f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=26178196de7345cdef047ef5b953101d0b50d41f commit 26178196de7345cdef047ef5b953101d0b50d41f Author: Warner Losh AuthorDate: 2025-05-26 03:52:34 +0000 Commit: Warner Losh CommitDate: 2025-05-26 15:30:38 +0000 stand/userboot: Initialize archsw at compile time Sponsored by: Netflix --- stand/userboot/userboot/main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/stand/userboot/userboot/main.c b/stand/userboot/userboot/main.c index cf1d9b12d69f..53b76c685d92 100644 --- a/stand/userboot/userboot/main.c +++ b/stand/userboot/userboot/main.c @@ -55,7 +55,16 @@ void *callbacks_arg; static jmp_buf jb; -struct arch_switch archsw; /* MI/MD interface boundary */ +struct arch_switch archsw = { /* MI/MD interface boundary */ + .arch_autoload = userboot_autoload, + .arch_getdev = userboot_getdev, + .arch_copyin = userboot_copyin, + .arch_copyout = userboot_copyout, + .arch_readin = userboot_readin, +#if defined(USERBOOT_ZFS_SUPPORT) + .arch_zfs_probe = userboot_zfs_probe, +#endif +}; static void extract_currdev(void); static void check_interpreter(void); @@ -189,15 +198,6 @@ loader_main(struct loader_callbacks *cb, void *arg, int version, int ndisks) putenv(var); } - archsw.arch_autoload = userboot_autoload; - archsw.arch_getdev = userboot_getdev; - archsw.arch_copyin = userboot_copyin; - archsw.arch_copyout = userboot_copyout; - archsw.arch_readin = userboot_readin; -#if defined(USERBOOT_ZFS_SUPPORT) - archsw.arch_zfs_probe = userboot_zfs_probe; -#endif - /* * Initialise the block cache. Set the upper limit. */