From nobody Tue Feb 10 09:01:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1624471246; cv=none; d=zohomail.com; s=zohoarc; b=AKlCoB9Rx1UIClrSdRYjaEdIe4YOusXZ/WPaJwVbrEnZP/u1jkcJOxofV1uiDb1C9i3NyqQKFriJjqUZIQeMAr9+hqqRV9cx2UY6c3kXKhsgaLNzBFIf7LoOMRaY5dPDLAllTKzNZqdjZSK+pLz1LCrOs2r8ZUnAk7GEdyNeB0s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624471246; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2XYaMzq79oJ14Mdhp8DY6/ioX+j6FXQDMcscp3/hpSM=; b=aKeceQKZu/2y9kiGUzwZaWN32IWGEO9pNmvRzkaARRJ4b//r1GoJWBQIrnUoWPay3XyvNeoBc4HaOvH+Cxj0l4csay3kacyKA6ZjvADnhHC+4fuMlabgoC0xayMQcyV9vCuFui0QXGcDBDrezo/FAfU7HFW9i1R/iJS3mXwIknE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 162447124655382.74480793426892; Wed, 23 Jun 2021 11:00:46 -0700 (PDT) Received: by mail-wm1-f45.google.com with SMTP id v20-20020a05600c2154b02901dcefb16af0so1921686wml.5 for ; Wed, 23 Jun 2021 11:00:46 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id g83sm662070wma.10.2021.06.23.11.00.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jun 2021 11:00:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2XYaMzq79oJ14Mdhp8DY6/ioX+j6FXQDMcscp3/hpSM=; b=pq3bP9YV30SMxXr0g199HWQ2mwWrCaWuXViMQzax80LXWgezYHSfDhWxzg6EM6c7hS EOiNW+ydFQbkVXrLfW5ZpyrC8S84DQS78IUCoMvjs8o/TYFY+L5md+OL4xL2E03Fk7TG X2LgoPt40Tv+ui4U1v+9OJco0sLxBcXDM0EoshfqrdOMBANpaNbZiGsKkjbiO+c9/zWL 4e3i7soZa7Qi41irTD0qGjbLrAJyDhccFRyTLpH9uADiY6qH0q+LnTRgGm9GX8upq+eB PBo8uX2unB9VAnNrFH/iZnbjDxlwyEnL7Klo3tVOrMSA0D3cfRcVdRSnK7XSYzlZCIXH nAcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2XYaMzq79oJ14Mdhp8DY6/ioX+j6FXQDMcscp3/hpSM=; b=IHN3yeP0iGIi62rtJWZfuRk5RtctVYYdCHW6/LPq4pi/CXwEhuYitBDXzodUD8oF1f 2T4TREFedOF3d+FsCNbUituDeZiNsZVjKNMgnhJA0MykEkfYUd/d3heGdWioT17RviI6 H4sLhWVe9M6KaFf7PxbvCMpQk+Qknd/y4QS85y1986+0PXotQGErRbC7Kctd9O0NPwMA KPVIyGfjZFxQOSk3RIKg6J59vdygP+6W9S07F2BZRKzRspsar9CrKx8eR6Co+G5DoZ69 54T8GiJyiiZZ0kWGv7qwGF8JvwFVVX7Yyxjk4mthJeB5S8gZmZgOGTkuj+KKCoU9bCeh qkYw== X-Gm-Message-State: AOAM532B0O6xuY5fMt8DLPDepqaLeBJlgG39lG09NIZh7iXcWrDmuyhY tZVF3E3+NL/k85/k7Wuw2Lo= X-Google-Smtp-Source: ABdhPJwWA6U52E/h61LwJHok19ZJNSQbLwQOZDQGnqdwTlTdKEe3WQWCVBe58eGKN5N1QO3egwcXRg== X-Received: by 2002:a05:600c:3791:: with SMTP id o17mr12503338wmr.187.1624471244908; Wed, 23 Jun 2021 11:00:44 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Alexander Bulekov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Tom Yan , Warner Losh , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Niek Linnenbank , =?UTF-8?q?Michal=20Such=C3=A1nek?= , Bin Meng Subject: [PATCH 4/9] tests/acceptance: Extract image_expand() helper Date: Wed, 23 Jun 2021 20:00:16 +0200 Message-Id: <20210623180021.898286-5-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210623180021.898286-1-f4bug@amsat.org> References: <20210623180021.898286-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) To be able to expand an image to a non-power-of-2 value, extract image_expand() from image_pow2ceil_expand(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo --- tests/acceptance/boot_linux_console.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 20d57c1a8c6..61069f0064f 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -35,15 +35,19 @@ def pow2ceil(x): return 1 if x =3D=3D 0 else 2**(x - 1).bit_length() =20 +""" +Expand file size +""" +def image_expand(path, size): + if size !=3D 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 =3D os.path.getsize(path) - size_aligned =3D pow2ceil(size) - if size !=3D size_aligned: - with open(path, 'ab+') as fd: - fd.truncate(size_aligned) + image_expand(path, pow2ceil(os.path.getsize(path))) =20 class LinuxKernelTest(Test): KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 ' --=20 2.31.1