From nobody Sun Oct 5 19:25:08 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1611197178; cv=none; d=zohomail.com; s=zohoarc; b=Pc/JMkS4GOFrvs18MzLn5qVhPl2cwncT7j1OoOzl5nogfondlOUaHDlDqHjf9yK81sHrxmw+yp5ACdkKlpcNgz9joWf17gUI9NurHUfy7qzk1U7GQQnhGr00G6yrSZGt4BQK0xKCwtrr+3MQv3Y/Qv0l4xmPIHQO0khbtalfwkA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611197178; h=Content-Type: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; bh=MQKKL8RAuUsGLZe4iU9JKFNWZB674WqawLkAYXsTg58=; b=RibqWEuPHOjdUn/V4HF6vt9rZNTf6ue6clIUmqweiVT1oqZk76IwaHyw1nQ5kVwGyjQnskKxFH7+IcEGbzoIaEIxcchiIul0GXOcov1q6GmXiUQkVNH3rjGhJVY6tYbdqVJuBtGCGppbcxQVGYHjMQeOy9pV3J2cBOqxJLruFfc= ARC-Authentication-Results: i=1; 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 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 1611197178894535.4048099418943; Wed, 20 Jan 2021 18:46:18 -0800 (PST) Received: from localhost ([::1]:48960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2PzD-0004JW-Mt for importer@patchew.org; Wed, 20 Jan 2021 21:46:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2Pqs-0001lI-OP for qemu-devel@nongnu.org; Wed, 20 Jan 2021 21:37:41 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:42078) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l2Pqn-0003ou-PH for qemu-devel@nongnu.org; Wed, 20 Jan 2021 21:37:38 -0500 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-193-gmKGrdlkMv2qXQklQZiIbg-1; Wed, 20 Jan 2021 21:37:29 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DE0398030A0; Thu, 21 Jan 2021 02:37:28 +0000 (UTC) Received: from blue.redhat.com (ovpn-113-116.phx2.redhat.com [10.3.113.116]) by smtp.corp.redhat.com (Postfix) with ESMTP id 716665D764; Thu, 21 Jan 2021 02:37:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611196652; 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=MQKKL8RAuUsGLZe4iU9JKFNWZB674WqawLkAYXsTg58=; b=Ji/L1+4Mh6y+71+9rBVb7AOc/4l9xM6PyxModbsznphmicYUZiT2EdnUg2dhOh8xEYEweA 0MUV9ZKaJOhDwf03B8c7gHFrNyq0nRYlg9hl0nAbM2SeYXwpIdZVCEg6e+jvYJPlYsuLDb ai6g3EU1qIVazNXvmr/92TitFqXyf8w= X-MC-Unique: gmKGrdlkMv2qXQklQZiIbg-1 From: Eric Blake To: qemu-devel@nongnu.org Subject: [PULL 13/13] iotests.py: qemu_io(): reuse qemu_tool_pipe_and_status() Date: Wed, 20 Jan 2021 20:36:57 -0600 Message-Id: <20210121023657.1186241-14-eblake@redhat.com> In-Reply-To: <20210121023657.1186241-1-eblake@redhat.com> References: <20210121023657.1186241-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eblake@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=eblake@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.167, 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_H3=0.001, RCVD_IN_MSPIKE_WL=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 , Vladimir Sementsov-Ogievskiy , "open list:Block layer core" , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Just drop code duplication. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20201130134024.19212-5-vsementsov@virtuozzo.com> Reviewed-by: Eric Blake Signed-off-by: Eric Blake --- tests/qemu-iotests/iotests.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index ea5c3c51624e..2e89c0ab1abc 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -188,14 +188,7 @@ def img_info_log(filename, filter_path=3DNone, imgopts= =3DFalse, extra_args=3D()): def qemu_io(*args): '''Run qemu-io and return the stdout data''' args =3D qemu_io_args + list(args) - subp =3D subprocess.Popen(args, stdout=3Dsubprocess.PIPE, - stderr=3Dsubprocess.STDOUT, - universal_newlines=3DTrue) - output =3D subp.communicate()[0] - if subp.returncode < 0: - sys.stderr.write('qemu-io received signal %i: %s\n' - % (-subp.returncode, ' '.join(args))) - return output + return qemu_tool_pipe_and_status('qemu-io', args)[0] def qemu_io_log(*args): result =3D qemu_io(*args) --=20 2.30.0