From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 84657C433EF for ; Wed, 23 Feb 2022 23:03:18 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4EFB383D44; Thu, 24 Feb 2022 00:02:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="VMN+Uxq0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7444083CC8; Thu, 24 Feb 2022 00:01:12 +0100 (CET) Received: from mail-oo1-xc36.google.com (mail-oo1-xc36.google.com [IPv6:2607:f8b0:4864:20::c36]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 60FC783CC8 for ; Thu, 24 Feb 2022 00:00:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-oo1-xc36.google.com with SMTP id u47-20020a4a9732000000b00316d0257de0so820962ooi.7 for ; Wed, 23 Feb 2022 15:00:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o5WRYilSq3tM4FQ9gEaHRBhNMTgM3VWw7TwDJ/k9vmY=; b=VMN+Uxq0vg9Akn4EMb5PNSgKPLXOHKuPTyMu7flDjnOdxvVh1/p6ywjVdvkJvnSxcW EPDiUqHJ24kDZTX/D2TgNs46Sqw7jIjo0KD7Ru4XxrW3INJ91nHVlEJJhPqI+81SVA/0 6nzulBg4wto+G9wEX0bjcmgCm/ZbR3n26pTWg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o5WRYilSq3tM4FQ9gEaHRBhNMTgM3VWw7TwDJ/k9vmY=; b=RlfJjwxgP1IpMi4B3aZoHNUS6XRwnZUkX0+8dD/qMfSZFHf+tjY3PJU3+oNk1k6qzM eY886bRyxbiezkHZ+QZP6sTb7MNhVAD5Ymv2MsRuiRr/nqpahSc6gwzKngLZhEvQbyDF tplpoIrvpeBuyXCCCzb4+OJV5mp5gok2bUwftgG9tzxhmYSgGaTvs3LWVIkaODE7xl8a 4mSjy8Rz5/tm081e9KVkdyfK31y87ByioS7VeCi6ef7572d94jLHUlxIEAycJZ+MCEll vQd7raMvCxTNyywCwnM4MgHMqcfYh57EzEjXgNBgVtdNC5Pz17LjuRsh5Ll6Cgjw7L+4 lHnA== X-Gm-Message-State: AOAM532+50FTBeVpdj6y73vq/4CTK1uqy3GQi0wjpD/0gZjWE8g0XXZO WpcTaDyOGiPpmVGyCsDW4LMDusXJxdq8iQ== X-Google-Smtp-Source: ABdhPJxVRm6xLnEadgWObXcWHRi4VmXxY6tT8KsVvfVdRjSep5gZ19zhdNJCHl+EhPOa9aew3Xm2jw== X-Received: by 2002:a05:6870:b029:b0:d4:3fc4:eec1 with SMTP id y41-20020a056870b02900b000d43fc4eec1mr884061oae.249.1645657257652; Wed, 23 Feb 2022 15:00:57 -0800 (PST) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id o2sm427507otl.9.2022.02.23.15.00.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Feb 2022 15:00:57 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Ivan Mikhaylov , Tom Rini , Philippe Reynes , Roger Quadros , Alper Nebi Yasak , huang lin , Jeffy Chen , Simon Glass , Kever Yang , Philipp Tomsich Subject: [PATCH v2 06/25] elf: Rename load_segments() and module failure Date: Wed, 23 Feb 2022 16:00:21 -0700 Message-Id: <20220223230040.159317-7-sjg@chromium.org> X-Mailer: git-send-email 2.35.1.574.g5d30c73bfb-goog In-Reply-To: <20220223230040.159317-1-sjg@chromium.org> References: <20220223230040.159317-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean Rename this function to make it clear that it only reads loadable segments. Also update the error for missing module to better match the message emitted by Python. Signed-off-by: Simon Glass Suggested-by: Alper Nebi Yasak --- Changes in v2: - Add new patch to rename load_segments() and module failure tools/binman/elf.py | 6 +++--- tools/binman/elf_test.py | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/binman/elf.py b/tools/binman/elf.py index 5e7d6ae7b9..016e9b2885 100644 --- a/tools/binman/elf.py +++ b/tools/binman/elf.py @@ -105,7 +105,7 @@ def GetSymbolFileOffset(fname, patterns): return addr - seg['p_vaddr'] + seg['p_offset'] if not ELF_TOOLS: - raise ValueError('Python elftools package is not available') + raise ValueError("Python: No module named 'elftools'") syms = {} with open(fname, 'rb') as fd: @@ -371,7 +371,7 @@ def UpdateFile(infile, outfile, start_sym, end_sym, insert): tools.write_file(outfile, newdata) tout.info('Written to offset %#x' % syms[start_sym].offset) -def read_segments(data): +def read_loadable_segments(data): """Read segments from an ELF file Args: @@ -389,7 +389,7 @@ def read_segments(data): ValueError: elftools is not available """ if not ELF_TOOLS: - raise ValueError('Python elftools package is not available') + raise ValueError("Python: No module named 'elftools'") with io.BytesIO(data) as inf: try: elf = ELFFile(inf) diff --git a/tools/binman/elf_test.py b/tools/binman/elf_test.py index a67915bda6..4c881a9755 100644 --- a/tools/binman/elf_test.py +++ b/tools/binman/elf_test.py @@ -244,7 +244,7 @@ class TestElf(unittest.TestCase): fname = self.ElfTestFile('embed_data') with self.assertRaises(ValueError) as e: elf.GetSymbolFileOffset(fname, ['embed_start', 'embed_end']) - self.assertIn('Python elftools package is not available', + self.assertIn("Python: No module named 'elftools'", str(e.exception)) finally: elf.ELF_TOOLS = old_val @@ -258,31 +258,31 @@ class TestElf(unittest.TestCase): offset = elf.GetSymbolFileOffset(fname, ['missing_sym']) self.assertEqual({}, offset) - def test_read_segments(self): - """Test for read_segments()""" + def test_read_loadable_segments(self): + """Test for read_loadable_segments()""" if not elf.ELF_TOOLS: self.skipTest('Python elftools not available') fname = self.ElfTestFile('embed_data') - segments, entry = elf.read_segments(tools.read_file(fname)) + segments, entry = elf.read_loadable_segments(tools.read_file(fname)) def test_read_segments_fail(self): - """Test for read_segments() without elftools""" + """Test for read_loadable_segments() without elftools""" try: old_val = elf.ELF_TOOLS elf.ELF_TOOLS = False fname = self.ElfTestFile('embed_data') with self.assertRaises(ValueError) as e: - elf.read_segments(tools.read_file(fname)) - self.assertIn('Python elftools package is not available', + elf.read_loadable_segments(tools.read_file(fname)) + self.assertIn("Python: No module named 'elftools'", str(e.exception)) finally: elf.ELF_TOOLS = old_val def test_read_segments_bad_data(self): - """Test for read_segments() with an invalid ELF file""" + """Test for read_loadable_segments() with an invalid ELF file""" fname = self.ElfTestFile('embed_data') with self.assertRaises(ValueError) as e: - elf.read_segments(tools.get_bytes(100, 100)) + elf.read_loadable_segments(tools.get_bytes(100, 100)) self.assertIn('Magic number does not match', str(e.exception)) -- 2.35.1.574.g5d30c73bfb-goog