From patchwork Fri Jan 31 21:05:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 861034 Delivered-To: patch@linaro.org Received: by 2002:adf:fb05:0:b0:385:e875:8a9e with SMTP id c5csp930239wrr; Fri, 31 Jan 2025 13:10:09 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWkxY/EYykqaulyjXq+bvYoAPdACuOfw85/evZhnKp+k95SpXsRViyEfjbEqsjyP0SyNLg8gw==@linaro.org X-Google-Smtp-Source: AGHT+IGgCuKwUHv35oxREGVrPbuirZ8qWtYLy5N/lMADYDPtdXinh90mybH43CqhUqbRPDTi5wxh X-Received: by 2002:a05:620a:2551:b0:7b6:d710:2282 with SMTP id af79cd13be357-7bffcda112emr1908143385a.49.1738357809523; Fri, 31 Jan 2025 13:10:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1738357809; cv=none; d=google.com; s=arc-20240605; b=NBbiIrGTfUS6TLN5UZ6ah1AAqDNPWjCuy1XV8QOJglSTPL9Uy0+u6fh6qjNhjNoaK3 RTRe+9Mxo1I45ec/6ArSgMYJAigjHKARIo8vCtTuUx+YnVTeRzF7M7X/qg0SUEYJi05+ gv4koukPAVf/YBlwiulu8zAglfiM3fu96KSIDygvhNSxwYW/rphLmTxWGMU6J5FpzJ9T dOvYiKoAwqE859UWgwghfip6xpm9QsRgkaXRxDlpkHMFA2+cMA1XIQJWj1Vkx9XJfqNn AGAp8vHDbxdoz8lP+kZV0dOSbw1ALIdY0E+YJBZJIhPHm1g4Sh2WDpiqhk7rsZ/2/QO5 uSGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HmQOIAQmsmwo1mW3OC9lmlp6Q7vTxJ0LbXR7U7WGXSY=; fh=qtn8prgQtzf5IzCNvLChUZDElvNECP6ej9YfjQeBz3I=; b=WoHHkumyygpy87JQ4FnvpyjJo6zmwySX8QGfiJYiwu8qxw5NSENstrE9aJEfl0EQk1 YeEkyBO8idcTjTygM/pemlpi7uTzSkc/sG2xP5Ev4fLjhSK88dx+ZPHX/7ojXESwoImz pgrGVVEziJIw2W3EF/D7uSzqO4aQKrU1ygpAzjpXhEaGnSYDi3KJJYlRmJfoMousyRQs zazlO8q/Mk88PLNLy0UJU+L/BKc8i63k6YkMoS6gGK/JUz122KLRxtJYbGWMUvTKuhsg B+WFQC8c53dK471Ne7u65V/2lBYTYiLlweGvGSLB8hFB2NMzvTr4Y2Usqh1sNw3KcpwK f10A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Qa1weYwO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c00a8c0e38si493915085a.39.2025.01.31.13.10.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 31 Jan 2025 13:10:09 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Qa1weYwO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tdyEL-0001CX-Kt; Fri, 31 Jan 2025 16:07:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tdyEE-0000tP-Pa for qemu-devel@nongnu.org; Fri, 31 Jan 2025 16:07:07 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tdyEC-0007uw-1W for qemu-devel@nongnu.org; Fri, 31 Jan 2025 16:07:05 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-436281c8a38so18009295e9.3 for ; Fri, 31 Jan 2025 13:07:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738357622; x=1738962422; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HmQOIAQmsmwo1mW3OC9lmlp6Q7vTxJ0LbXR7U7WGXSY=; b=Qa1weYwOWhcIZhaSX6JvkwQRGqNqLdGI1Uhu/foXmIHY1cNKfymivMl99AFT5TVcuV 8iPt1Kw+9xgYHK3Ox3S4tEMzidhUu7FHYP7bjgiE0lzMbFmaZalbylxaIbnYRTtfq1wp erdyz2hfwDtIRWugUotlJKaI2+9fVy7DuxRBb22W7VgagpIw4Yu8/eeVCZwpaliUdM7v j4UhODb5joISng48p4KmjIa3ok4nNZRP+AaLdu9qa+gcKuDDmnqYElcrsqfACN6mlsep WyyOWE012CNVwy7mo0+7vyPA8WixWxgnzo+gJ+pfvktcNAZHv7/mpfgDBAx25epUnnel 6buA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738357622; x=1738962422; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HmQOIAQmsmwo1mW3OC9lmlp6Q7vTxJ0LbXR7U7WGXSY=; b=Hy939Flm6WF1JPJQAa9KMHH+mRkIYDqySZMeq2rmdCYDASn5X8FWpYjAguMvsXRUlM fRhNTp/1pmdNlzPau8ak7/obZaXtdRJ83Pyil89E+sVEQLkw0ucULv8AAtGs2eFHv/wK sdKcGwUcLMm3vwaTW8677xUDqp5bxAtvaDza3LBUFbKflBKCISfuIteVaFthVj8tJNNX m61WEcJPZ7vMgEhUm6t+xCiFdfTPvnW6841DsmNi+uq/myOmjuc/LOMtgPnM0s7FpSkB v/6NEc277AHDCLL3nHCUik60M0TTGldBXmKGiKpFvZ3GgREy9c0Gcxwy2138VT864ovv bAaw== X-Gm-Message-State: AOJu0YzHrCyi9fbGzCrawGyvcfnMuRcWkRXt/1L9BKNax+u++NpnAt91 mxkU1hHn0U6AJUPEFulo+YYvTuosYYseEkTHuBWUlSl5TuWOkRzZRnGQTBXJWhykc8LkVeIbNT0 p/3Q= X-Gm-Gg: ASbGncuwswr676J5SUUhZwF6lgfA9Yy/L/2EbisdazO2PHhEh5HNpCsUlZjohK/o67r A1znkmMCjRoz/pgBPB4l2pe00qY99cB3EvshOOvdzB5oIZ0YgpsiLvWf6Ldxo5/qK7/lflZPBqh uqU2NwRjmG7BJOdSmlxBJBLpXXEdnVy0f//BcCRgFWybDMwTZDKaPlE9wnlAm5eBRpuCRZE8oBd Md4v8o8Al0S7/zl2Op51u6YyV0HIkg9zWKQvGPX86U2+YpXuW8aO28bsq4p/79S0eokgn2lq2d1 8tF5xXcAKzlM219a5rfcGVbIhYAj9miSsZkOChFFG//pgtT8wkRNwNIEY4z8T9SWYQ== X-Received: by 2002:a05:600c:3155:b0:434:a5bc:70fc with SMTP id 5b1f17b1804b1-438dc3ae116mr120786475e9.8.1738357622346; Fri, 31 Jan 2025 13:07:02 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438e23e6b62sm66430035e9.24.2025.01.31.13.07.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 31 Jan 2025 13:07:01 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 20/36] hw/avr/boot: Replace load_elf_ram_sym() -> load_elf_as() Date: Fri, 31 Jan 2025 22:05:03 +0100 Message-ID: <20250131210520.85874-21-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250131210520.85874-1-philmd@linaro.org> References: <20250131210520.85874-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org load_elf_ram_sym() with load_rom=true, sym_cb=NULL is equivalent to load_elf_as(). Replace by the latter to simplify. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20250127113824.50177-2-philmd@linaro.org> --- hw/avr/boot.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/avr/boot.c b/hw/avr/boot.c index 617f3a144c8..6a91dcd12d0 100644 --- a/hw/avr/boot.c +++ b/hw/avr/boot.c @@ -71,11 +71,9 @@ bool avr_load_firmware(AVRCPU *cpu, MachineState *ms, return false; } - bytes_loaded = load_elf_ram_sym(filename, - NULL, NULL, NULL, - &entry, NULL, NULL, - &e_flags, 0, EM_AVR, 0, 0, - NULL, true, NULL); + bytes_loaded = load_elf_as(filename, NULL, NULL, NULL, + &entry, NULL, NULL, + &e_flags, 0, EM_AVR, 0, 0, NULL); if (bytes_loaded >= 0) { /* If ELF file is provided, determine CPU type reading ELF e_flags. */ const char *elf_cpu = avr_elf_e_flags_to_cpu_type(e_flags);