From nobody Thu May 9 19:52:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1633525527556565.360259617983; Wed, 6 Oct 2021 06:05:27 -0700 (PDT) Received: from localhost ([::1]:50204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mY6br-0007Yp-T2 for importer@patchew.org; Wed, 06 Oct 2021 09:05:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6YT-0004k5-Gw for qemu-devel@nongnu.org; Wed, 06 Oct 2021 09:01:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:50179) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6YP-000582-76 for qemu-devel@nongnu.org; Wed, 06 Oct 2021 09:01:52 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-498-Kv4WGgAQNoe_84jNlmKbCA-1; Wed, 06 Oct 2021 09:01:46 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 687B1802C91; Wed, 6 Oct 2021 13:01:45 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 93B6060C4A; Wed, 6 Oct 2021 13:01:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633525307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bXNEwykMTDGPFt6dadB+Th/PiAnZ7tumi7NUnf5OWFA=; b=KKyGQHRt/syhWOSKlNiTOaSp+quolbq+b1wEy6rBX1ZReKAf52F4EfUIyCfe4rFsMOB38T v4Eq7+qemjmoQpgmokIrDluiKBpepj5/rSYKZ1SnRkNILutsGG/zLQYehOrotTYFcCN8jP F13ccFkf0XDhZ1R+AFbLn6mnaN8NEL8= X-MC-Unique: Kv4WGgAQNoe_84jNlmKbCA-1 From: Emanuele Giuseppe Esposito To: qemu-block@nongnu.org Subject: [PATCH 1/2] pylint: fix errors and warnings from qemu-tests test 297 Date: Wed, 6 Oct 2021 09:00:59 -0400 Message-Id: <20211006130100.389521-2-eesposit@redhat.com> In-Reply-To: <20211006130100.389521-1-eesposit@redhat.com> References: <20211006130100.389521-1-eesposit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eesposit@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=eesposit@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 5.0 requ) DKIMWL_WL_HIGH=-0.05, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Emanuele Giuseppe Esposito , Hanna Reitz , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1633525542545100001 Content-Type: text/plain; charset="utf-8" Test 297 in qemu-iotests folder currently fails: pylint has learned new things to check, or we simply missed them. All fixes in this patch are related to additional spaces used or wrong indentation. No functional change intended. Signed-off-by: Emanuele Giuseppe Esposito --- tests/qemu-iotests/129 | 9 +++++---- tests/qemu-iotests/310 | 16 ++++++++-------- tests/qemu-iotests/check | 11 ++++++----- tests/qemu-iotests/iotests.py | 7 ++++--- tests/qemu-iotests/tests/image-fleecing | 4 ++-- 5 files changed, 25 insertions(+), 22 deletions(-) diff --git a/tests/qemu-iotests/129 b/tests/qemu-iotests/129 index 5251e2669e..21df239597 100755 --- a/tests/qemu-iotests/129 +++ b/tests/qemu-iotests/129 @@ -77,8 +77,8 @@ class TestStopWithBlockJob(iotests.QMPTestCase): self.do_test_stop("drive-backup", device=3D"drive0", target=3Dself.target_img, format=3Diotests.imgfm= t, sync=3D"full", - x_perf=3D{ 'max-chunk': 65536, - 'max-workers': 8 }) + x_perf=3D{'max-chunk': 65536, + 'max-workers': 8}) =20 def test_block_commit(self): # Add overlay above the source node so that we actually use a @@ -87,13 +87,14 @@ class TestStopWithBlockJob(iotests.QMPTestCase): iotests.qemu_img('create', '-f', iotests.imgfmt, self.overlay_img, '1G') =20 - result =3D self.vm.qmp('blockdev-add', **{ + result =3D self.vm.qmp('blockdev-add', + **{ 'node-name': 'overlay', 'driver': iotests.imgfmt, 'file': { 'driver': 'file', 'filename': self.overlay_img - } + } }) self.assert_qmp(result, 'return', {}) =20 diff --git a/tests/qemu-iotests/310 b/tests/qemu-iotests/310 index 9d9c928c4b..33c3411869 100755 --- a/tests/qemu-iotests/310 +++ b/tests/qemu-iotests/310 @@ -48,11 +48,11 @@ with iotests.FilePath('base.img') as base_img_path, \ assert qemu_io_silent(base_img_path, '-c', 'write -P 1 3M 1M') =3D=3D 0 assert qemu_img('create', '-f', iotests.imgfmt, '-b', base_img_path, '-F', iotests.imgfmt, mid_img_path) =3D=3D 0 - assert qemu_io_silent(mid_img_path, '-c', 'write -P 3 2M 1M') =3D=3D 0 - assert qemu_io_silent(mid_img_path, '-c', 'write -P 3 4M 1M') =3D=3D 0 + assert qemu_io_silent(mid_img_path, '-c', 'write -P 3 2M 1M') =3D=3D 0 + assert qemu_io_silent(mid_img_path, '-c', 'write -P 3 4M 1M') =3D=3D 0 assert qemu_img('create', '-f', iotests.imgfmt, '-b', mid_img_path, '-F', iotests.imgfmt, top_img_path) =3D=3D 0 - assert qemu_io_silent(top_img_path, '-c', 'write -P 2 1M 1M') =3D=3D 0 + assert qemu_io_silent(top_img_path, '-c', 'write -P 2 1M 1M') =3D=3D 0 =20 # 0 1 2 3 4 # top 2 @@ -108,10 +108,10 @@ with iotests.FilePath('base.img') as base_img_path, \ assert qemu_img('rebase', '-u', '-b', '', '-f', iotests.imgfmt, top_img_path) =3D=3D 0 =20 - assert qemu_io_silent(top_img_path, '-c', 'read -P 0 0 1M') =3D=3D 0 - assert qemu_io_silent(top_img_path, '-c', 'read -P 2 1M 1M') =3D=3D 0 - assert qemu_io_silent(top_img_path, '-c', 'read -P 3 2M 1M') =3D=3D 0 - assert qemu_io_silent(top_img_path, '-c', 'read -P 0 3M 1M') =3D=3D 0 - assert qemu_io_silent(top_img_path, '-c', 'read -P 3 4M 1M') =3D=3D 0 + assert qemu_io_silent(top_img_path, '-c', 'read -P 0 0 1M') =3D=3D 0 + assert qemu_io_silent(top_img_path, '-c', 'read -P 2 1M 1M') =3D=3D 0 + assert qemu_io_silent(top_img_path, '-c', 'read -P 3 2M 1M') =3D=3D 0 + assert qemu_io_silent(top_img_path, '-c', 'read -P 0 3M 1M') =3D=3D 0 + assert qemu_io_silent(top_img_path, '-c', 'read -P 3 4M 1M') =3D=3D 0 =20 log('Done') diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index da1bfb839e..43a4b694cc 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -37,13 +37,14 @@ def make_argparser() -> argparse.ArgumentParser: =20 p.add_argument('-d', dest=3D'debug', action=3D'store_true', help=3D'de= bug') p.add_argument('-p', dest=3D'print', action=3D'store_true', - help=3D'redirects qemu\'s stdout and stderr to the test ou= tput') + help=3D'redirects qemu\'s stdout and stderr to ' + 'the test output') p.add_argument('-gdb', action=3D'store_true', - help=3D"start gdbserver with $GDB_OPTIONS options \ - ('localhost:12345' if $GDB_OPTIONS is empty)") + help=3D"start gdbserver with $GDB_OPTIONS options " + "('localhost:12345' if $GDB_OPTIONS is empty)") p.add_argument('-valgrind', action=3D'store_true', - help=3D'use valgrind, sets VALGRIND_QEMU environment ' - 'variable') + help=3D'use valgrind, sets VALGRIND_QEMU environment ' + 'variable') =20 p.add_argument('-misalign', action=3D'store_true', help=3D'misalign memory allocations') diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index ce06cf5630..168cc5736a 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -608,7 +608,7 @@ def _post_shutdown(self) -> None: super()._post_shutdown() if not qemu_valgrind or not self._popen: return - valgrind_filename =3D f"{test_dir}/{self._popen.pid}.valgrind" + valgrind_filename =3D f"{test_dir}/{self._popen.pid}.valgrind" if self.exitcode() =3D=3D 99: with open(valgrind_filename, encoding=3D'utf-8') as f: print(f.read()) @@ -1350,8 +1350,9 @@ def write(self, arg=3DNone): =20 class ReproducibleTestRunner(unittest.TextTestRunner): def __init__(self, stream: Optional[TextIO] =3D None, - resultclass: Type[unittest.TestResult] =3D ReproducibleTestRe= sult, - **kwargs: Any) -> None: + resultclass: Type[unittest.TestResult] =3D + ReproducibleTestResult, + **kwargs: Any) -> None: rstream =3D ReproducibleStreamWrapper(stream or sys.stdout) super().__init__(stream=3Drstream, # type: ignore descriptions=3DTrue, diff --git a/tests/qemu-iotests/tests/image-fleecing b/tests/qemu-iotests/t= ests/image-fleecing index f6318492c6..8c5472f421 100755 --- a/tests/qemu-iotests/tests/image-fleecing +++ b/tests/qemu-iotests/tests/image-fleecing @@ -114,8 +114,8 @@ def do_test(use_cbw, base_img_path, fleece_img_path, nb= d_sock_path, vm): =20 nbd_uri =3D 'nbd+unix:///%s?socket=3D%s' % (tmp_node, nbd_sock_path) log(vm.qmp('nbd-server-start', - {'addr': { 'type': 'unix', - 'data': { 'path': nbd_sock_path } } })) + {'addr': {'type': 'unix', + 'data': {'path': nbd_sock_path}}})) =20 log(vm.qmp('nbd-server-add', device=3Dtmp_node)) =20 --=20 2.27.0 From nobody Thu May 9 19:52:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1633525569712781.7642781860307; Wed, 6 Oct 2021 06:06:09 -0700 (PDT) Received: from localhost ([::1]:51578 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mY6ca-0008VQ-Po for importer@patchew.org; Wed, 06 Oct 2021 09:06:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40244) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6YT-0004lE-H4 for qemu-devel@nongnu.org; Wed, 06 Oct 2021 09:01:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:44925) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY6YP-00058P-OQ for qemu-devel@nongnu.org; Wed, 06 Oct 2021 09:01:53 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-81-0YTXZYsMO0-x1yha3eRHpQ-1; Wed, 06 Oct 2021 09:01:47 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 38D6E101AFAB; Wed, 6 Oct 2021 13:01:46 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 81C3F60C9F; Wed, 6 Oct 2021 13:01:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633525308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3Y3nLX6CO4IW3BVz2wG2uQOPDJRPzSW+K+iLfFDrg3E=; b=bc/DILN0UnVOgI6E4eIS4DvGCu6Y8x5E9Q6RbOmwuCBeuL34IWYgduanofcwWgnYpUoD59 qfL/HrwS1Iz5KbAsKe+4FoHkdZhbZ+8ko62O9x7SG03VOTbf7ElpBWOihZg1L8svpiLCvk R4JKLWtnrC1bi4bkUmQGlnlYw2DtHQY= X-MC-Unique: 0YTXZYsMO0-x1yha3eRHpQ-1 From: Emanuele Giuseppe Esposito To: qemu-block@nongnu.org Subject: [PATCH 2/2] qemu-iotests: fix image-fleecing pylint errors Date: Wed, 6 Oct 2021 09:01:00 -0400 Message-Id: <20211006130100.389521-3-eesposit@redhat.com> In-Reply-To: <20211006130100.389521-1-eesposit@redhat.com> References: <20211006130100.389521-1-eesposit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eesposit@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=eesposit@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.05, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Emanuele Giuseppe Esposito , Hanna Reitz , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1633525575705100001 Content-Type: text/plain; charset="utf-8" The problem here is that some variables are formatted with unnecessary spaces to make it prettier and easier to read. However, pylint complains about those additional spaces. A solution is to transform them as string with arbitrary spaces, and then convert it back into a tuple. Removing the spaces makes it a little bit ugly, and directly using the string forces us to change the test reference output accordingly, which will 1) contain ugly weird formatted strings, 2) is not portable if somebody changes the formatting in the test string. Signed-off-by: Emanuele Giuseppe Esposito --- tests/qemu-iotests/tests/image-fleecing | 43 +++++++++++++++---------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/tests/qemu-iotests/tests/image-fleecing b/tests/qemu-iotests/t= ests/image-fleecing index 8c5472f421..9709ecbba1 100755 --- a/tests/qemu-iotests/tests/image-fleecing +++ b/tests/qemu-iotests/tests/image-fleecing @@ -30,23 +30,27 @@ iotests.script_initialize( supported_platforms=3D['linux'], ) =20 -patterns =3D [('0x5d', '0', '64k'), - ('0xd5', '1M', '64k'), - ('0xdc', '32M', '64k'), - ('0xcd', '0x3ff0000', '64k')] # 64M - 64K - -overwrite =3D [('0xab', '0', '64k'), # Full overwrite - ('0xad', '0x00f8000', '64k'), # Partial-left (1M-32K) - ('0x1d', '0x2008000', '64k'), # Partial-right (32M+32K) - ('0xea', '0x3fe0000', '64k')] # Adjacent-left (64M - 128K) - -zeroes =3D [('0', '0x00f8000', '32k'), # Left-end of partial-left (1M-32K) - ('0', '0x2010000', '32k'), # Right-end of partial-right (32M+64K) - ('0', '0x3fe0000', '64k')] # overwrite[3] - -remainder =3D [('0xd5', '0x108000', '32k'), # Right-end of partial-left [= 1] - ('0xdc', '32M', '32k'), # Left-end of partial-right [2] - ('0xcd', '0x3ff0000', '64k')] # patterns[3] +# Each string in patterns, overwrite and remainder is formatted in such way +# for readability. Using a 3-tuple will make pylint trigger +# "bad-whitespace" when we try to format it in the same way +# The testing code will take care of splitting it properly. +patterns =3D ['0x5d 0 64k', + '0xd5 1M 64k', + '0xdc 32M 64k', + '0xcd 0x3ff0000 64k'] # 64M - 64K + +overwrite =3D ['0xab 0 64k', # Full overwrite + '0xad 0x00f8000 64k', # Partial-left (1M-32K) + '0x1d 0x2008000 64k', # Partial-right (32M+32K) + '0xea 0x3fe0000 64k'] # Adjacent-left (64M - 128K) + +zeroes =3D ['0 0x00f8000 32k', # Left-end of partial-left (1M-32K) + '0 0x2010000 32k', # Right-end of partial-right (32M+64K) + '0 0x3fe0000 64k'] # overwrite[3] + +remainder =3D ['0xd5 0x108000 32k', # Right-end of partial-left [1] + '0xdc 32M 32k', # Left-end of partial-right [2] + '0xcd 0x3ff0000 64k'] # patterns[3] =20 def do_test(use_cbw, base_img_path, fleece_img_path, nbd_sock_path, vm): log('--- Setting up images ---') @@ -56,6 +60,7 @@ def do_test(use_cbw, base_img_path, fleece_img_path, nbd_= sock_path, vm): assert qemu_img('create', '-f', 'qcow2', fleece_img_path, '64M') =3D= =3D 0 =20 for p in patterns: + p =3D tuple(p.split()) qemu_io('-f', iotests.imgfmt, '-c', 'write -P%s %s %s' % p, base_img_path) =20 @@ -124,6 +129,7 @@ def do_test(use_cbw, base_img_path, fleece_img_path, nb= d_sock_path, vm): log('') =20 for p in patterns + zeroes: + p =3D tuple(p.split()) cmd =3D 'read -P%s %s %s' % p log(cmd) assert qemu_io_silent('-r', '-f', 'raw', '-c', cmd, nbd_uri) =3D= =3D 0 @@ -133,6 +139,7 @@ def do_test(use_cbw, base_img_path, fleece_img_path, nb= d_sock_path, vm): log('') =20 for p in overwrite: + p =3D tuple(p.split()) cmd =3D 'write -P%s %s %s' % p log(cmd) log(vm.hmp_qemu_io(qom_path, cmd, qdev=3DTrue)) @@ -142,6 +149,7 @@ def do_test(use_cbw, base_img_path, fleece_img_path, nb= d_sock_path, vm): log('') =20 for p in patterns + zeroes: + p =3D tuple(p.split()) cmd =3D 'read -P%s %s %s' % p log(cmd) assert qemu_io_silent('-r', '-f', 'raw', '-c', cmd, nbd_uri) =3D= =3D 0 @@ -168,6 +176,7 @@ def do_test(use_cbw, base_img_path, fleece_img_path, nb= d_sock_path, vm): log('') =20 for p in overwrite + remainder: + p =3D tuple(p.split()) cmd =3D 'read -P%s %s %s' % p log(cmd) assert qemu_io_silent(base_img_path, '-c', cmd) =3D=3D 0 --=20 2.27.0