From nobody Mon Feb 9 14:33:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 ARC-Seal: i=1; a=rsa-sha256; t=1557254512; cv=none; d=zoho.com; s=zohoarc; b=WovgyxCUZZ7eqAF2pF/LvRgfitVGZ1RDG9enea/CJHS6KJ37XWN4Y2yaf7x4aP4i7SvYWwN1s3HX1KU4tm9UTYNOqsMax2NjDDu8KNiV92bzLzcMr716XPjL7q/hlzKpgybdaPqJe7mJOqrWmDsvpTKzS/5qDpEhhXepkAKexmU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557254512; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=93FCc/m6rDGeI19g9RJHGMvSvMtifmLYuTa7B3XacL0=; b=NnsX4jZ/YN39egVtvhqvUNxcbHZuAeaPpdxU3SmPe462mc2BeiFlJW+swQ0SVXtlA6UOQdvtkbjJU8bDBU+CaQSvW5g9GVXBHpXEIhy75mIPjzCp+kIbR2o5eCHdgUEunkSvXHRn1km4Xo42yuxS8BPR82h9w/SefSVxHRlZ+ps= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557254512498482.809223267766; Tue, 7 May 2019 11:41:52 -0700 (PDT) Received: from localhost ([127.0.0.1]:51380 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hO52D-000463-Jp for importer@patchew.org; Tue, 07 May 2019 14:41:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hO4x3-0007uJ-8K for qemu-devel@nongnu.org; Tue, 07 May 2019 14:36:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hO4wu-0002OS-JT for qemu-devel@nongnu.org; Tue, 07 May 2019 14:36:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56400) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hO4ws-0002J1-Ba; Tue, 07 May 2019 14:36:18 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A9599307D854; Tue, 7 May 2019 18:36:17 +0000 (UTC) Received: from localhost (unknown [10.40.205.217]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3E6DB4123; Tue, 7 May 2019 18:36:17 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Tue, 7 May 2019 20:36:07 +0200 Message-Id: <20190507183610.9848-3-mreitz@redhat.com> In-Reply-To: <20190507183610.9848-1-mreitz@redhat.com> References: <20190507183610.9848-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 07 May 2019 18:36:17 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/5] iotests.py: Add qemu_nbd_early_pipe() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" qemu_nbd_pipe() currently unconditionally reads qemu-nbd's output. That is not ideal because qemu-nbd may keep stderr open after the parent process has exited. Currently, the only user of qemu_nbd_pipe() is 147, which discards the whole output if the parent process returned success and only evaluates it on error. Therefore, we can replace qemu_nbd_pipe() by qemu_nbd_early_pipe() that does the same: Discard the output on success, and return it on error. Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- tests/qemu-iotests/147 | 4 ++-- tests/qemu-iotests/iotests.py | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/147 b/tests/qemu-iotests/147 index 82513279b0..2d84fddb01 100755 --- a/tests/qemu-iotests/147 +++ b/tests/qemu-iotests/147 @@ -24,7 +24,7 @@ import socket import stat import time import iotests -from iotests import cachemode, imgfmt, qemu_img, qemu_nbd, qemu_nbd_pipe +from iotests import cachemode, imgfmt, qemu_img, qemu_nbd, qemu_nbd_early_= pipe =20 NBD_PORT_START =3D 32768 NBD_PORT_END =3D NBD_PORT_START + 1024 @@ -93,7 +93,7 @@ class QemuNBD(NBDBlockdevAddBase): pass =20 def _try_server_up(self, *args): - status, msg =3D qemu_nbd_pipe('-f', imgfmt, test_img, *args) + status, msg =3D qemu_nbd_early_pipe('-f', imgfmt, test_img, *args) if status =3D=3D 0: return True if 'Address already in use' in msg: diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index f811f69135..ce21d83182 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -204,9 +204,9 @@ def qemu_nbd(*args): '''Run qemu-nbd in daemon mode and return the parent's exit code''' return subprocess.call(qemu_nbd_args + ['--fork'] + list(args)) =20 -def qemu_nbd_pipe(*args): +def qemu_nbd_early_pipe(*args): '''Run qemu-nbd in daemon mode and return both the parent's exit code - and its output''' + and its output in case of an error''' subp =3D subprocess.Popen(qemu_nbd_args + ['--fork'] + list(args), stdout=3Dsubprocess.PIPE, stderr=3Dsubprocess.STDOUT, @@ -216,7 +216,10 @@ def qemu_nbd_pipe(*args): sys.stderr.write('qemu-nbd received signal %i: %s\n' % (-exitcode, ' '.join(qemu_nbd_args + ['--fork'] + list(args)= ))) - return exitcode, subp.communicate()[0] + if exitcode =3D=3D 0: + return exitcode, '' + else: + return exitcode, subp.communicate()[0] =20 def compare_images(img1, img2, fmt1=3Dimgfmt, fmt2=3Dimgfmt): '''Return True if two image files are identical''' --=20 2.20.1