From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Peter Maydell" <peter.maydell@linaro.org>,
qemu-arm@nongnu.org, "Cleber Rosa" <crosa@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>,
"Subbaraya Sundeep" <sundeep.lkml@gmail.com>,
"Cédric Le Goater" <clg@kaod.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>
Subject: [PATCH 1/2] tests/avocado: Factor file_truncate() helper out
Date: Fri, 20 Jan 2023 13:28:35 +0100 [thread overview]
Message-ID: <20230120122836.81675-2-philmd@linaro.org> (raw)
In-Reply-To: <20230120122836.81675-1-philmd@linaro.org>
Factor file_truncate() helper out of image_pow2ceil_expand()
for reuse.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
tests/avocado/boot_linux_console.py | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py
index 8c1d981586..49a4b22fe1 100644
--- a/tests/avocado/boot_linux_console.py
+++ b/tests/avocado/boot_linux_console.py
@@ -30,15 +30,19 @@
def pow2ceil(x):
return 1 if x == 0 else 2**(x - 1).bit_length()
+"""
+Truncate file
+"""
+def file_truncate(path, size):
+ if size != os.path.getsize(path):
+ with open(path, 'ab+') as fd:
+ fd.truncate(size)
+
"""
Expand file size to next power of 2
"""
def image_pow2ceil_expand(path):
- size = os.path.getsize(path)
- size_aligned = pow2ceil(size)
- if size != size_aligned:
- with open(path, 'ab+') as fd:
- fd.truncate(size_aligned)
+ file_truncate(path, pow2ceil(size))
class LinuxKernelTest(QemuSystemTest):
KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
--
2.38.1
next prev parent reply other threads:[~2023-01-20 12:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-20 12:28 [PATCH 0/2] tests/avocado: Truncate M2S-FG484 SOM SPI flash to 16MiB Philippe Mathieu-Daudé
2023-01-20 12:28 ` Philippe Mathieu-Daudé [this message]
2023-01-20 12:53 ` [PATCH 1/2] tests/avocado: Factor file_truncate() helper out Cédric Le Goater
2023-01-20 12:28 ` [PATCH 2/2] tests/avocado: Truncate M2S-FG484 SOM SPI flash to 16MiB Philippe Mathieu-Daudé
2023-01-20 12:51 ` Cédric Le Goater
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230120122836.81675-2-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=bleal@redhat.com \
--cc=clg@kaod.org \
--cc=crosa@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=sundeep.lkml@gmail.com \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).