From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 12 Mar 2026 15:44:06 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1w0hGf-00ArMx-2i for lore@lore.pengutronix.de; Thu, 12 Mar 2026 15:44:06 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1w0hGf-00042D-DO for lore@pengutronix.de; Thu, 12 Mar 2026 15:44:06 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=0IVPi8W1sh5KX8du+b356SCQ0xO5tCfXMo9jG/Um2CQ=; b=SwkiQXAx6rbqle7SFQ8ZXi6QwO 1R08EEHuKI/gBeG2PGKJC9qmqYVcCGvpb3UUQXbIZuVTLBNADIwddBNAewvpfqf+k9xRs4VRBBxb2 h+nWdbTZbpWQUtgPdvUOaLh/T/5E3XJFCNwdvj1pxgqd5siCt0Sceu6bAMbds/x8kuOy0FRMCg6Nt m1jOli1sVpnea1KOq/F/GIpvp1KmqVE1zjDP6c6vmHzjHUZfk2kqXvq3vhtcefDYIP39AOVQ1IBlp NIBlBI/oMYSIglxktIC6VytaqcGK5dIyvAp7Gpcr/4jX+o5VmB7Vc7XHLLON3Z+LyZebIBwy/ohyp HTOrUACw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1w0hG9-0000000EEIb-1o8J; Thu, 12 Mar 2026 14:43:33 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1w0hG6-0000000EEHA-1ymQ for barebox@lists.infradead.org; Thu, 12 Mar 2026 14:43:31 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1w0hG3-0003s1-Bb; Thu, 12 Mar 2026 15:43:27 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1w0hG1-0052NR-2e; Thu, 12 Mar 2026 15:43:27 +0100 Received: from [::1] (helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.98.2) (envelope-from ) id 1w0hG3-000000093Gt-0Jku; Thu, 12 Mar 2026 15:43:27 +0100 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Thu, 12 Mar 2026 15:43:16 +0100 Message-ID: <20260312144325.2157379-2-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260312144325.2157379-1-a.fatoum@pengutronix.de> References: <20260312144325.2157379-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260312_074330_506085_E3A69ACB X-CRM114-Status: GOOD ( 10.71 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-3.8 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 2/2] globalvar: add helpers for stashing global variables X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) Configuring a FIT image boot with overlays involves setting not only global.bootm.* variables, but also global.of.overlay.* variables. For use in custom boot entry functions, provide functions for stashing and restoring a set of variables. This allows dry run and boot fallback behavior to not affect later boot attempts. Signed-off-by: Ahmad Fatoum --- common/globalvar.c | 77 +++++++++++++++++++++++++++++++++++++++++++++ include/globalvar.h | 3 ++ 2 files changed, 80 insertions(+) diff --git a/common/globalvar.c b/common/globalvar.c index c2b0d5b4bbad..e168d6055347 100644 --- a/common/globalvar.c +++ b/common/globalvar.c @@ -461,6 +461,83 @@ int globalvar_set(const char *name, const char *val) return dev_set_param(&global_device, name, val); } +struct globalvar_stashed { + const char *key; + const char *value; + struct list_head list; +}; + +static void globalvar_stashed_free(struct globalvar_stashed *elem) +{ + list_del(&elem->list); + free_const(elem->key); + free_const(elem->value); + free(elem); +} + +int globalvar_stash_push(struct list_head *stash, ...) +{ + struct globalvar_stashed *elem, *safe; + const char *name; + int ret = -ENOMEM; + va_list args; + LIST_HEAD(tmp); + + va_start(args, stash); + + while ((name = va_arg(args, const char *))) { + const char *value; + + elem = calloc(1, sizeof(*elem)); + if (!elem) + goto out; + + list_add_tail(&elem->list, &tmp); + + elem->key = strdup_const(name); + if (!elem->key) + goto out; + + value = globalvar_get(name); + if (!value) { + ret = -EINVAL; + goto out; + } + + elem->value = strdup_const(value); + if (!elem->value) + goto out; + } + + list_splice_tail(&tmp, stash); + + ret = 0; +out: + va_end(args); + + if (ret) { + list_for_each_entry_safe(elem, safe, &tmp, list) + globalvar_stashed_free(elem); + } + + return ret; +} + +int globalvar_stash_pop(struct list_head *stash) +{ + struct globalvar_stashed *elem, *tmp; + int err = 0; + + list_for_each_entry_safe(elem, tmp, stash, list) { + int ret = globalvar_set(elem->key, elem->value); + if (ret) + err = ret; + globalvar_stashed_free(elem); + } + + return err; +} + static int globalvar_simple_set(struct bobject *bobj, struct param_d *p, const char *val) { diff --git a/include/globalvar.h b/include/globalvar.h index 413cf72002a0..1d39849ddbab 100644 --- a/include/globalvar.h +++ b/include/globalvar.h @@ -24,6 +24,9 @@ char *globalvar_get_match(const char *match, const char *separator); void globalvar_set_match(const char *match, const char *val); int globalvar_set(const char *name, const char *val); +int globalvar_stash_push(struct list_head *stash, ...) __attribute__((sentinel)); +int globalvar_stash_pop(struct list_head *stash); + int globalvar_add_simple_string(const char *name, char **value); int globalvar_add_simple_int(const char *name, int *value, const char *format); -- 2.47.3