From nobody Thu Dec 18 19:30:06 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576777432; cv=none; d=zohomail.com; s=zohoarc; b=SAeLgAGn0IocVv9/TW5Boe+VVCWcu0V5fppR+jzQzi7eo6zDZL/WjZIIIVo0T880aRidBzdbotxK4waj7nyjEK2xPNnzUdFMo15r8j9jAFlSfgRbtc9SxrShIz8ABnW5qWBlwFjDe2/tvYWa2jaD8nLgie6RaLOwrWyOhtbOOas= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576777432; 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=3On4XWfVcj5B+no5b4p44Jfdeq4GsAjz4vRXBd1i3iM=; b=H2+vGK+W5yIe7mJqMKNyZ4r4vIEObDyD7TxyB9HJZ5/M4kyKQAZmyVpdVyJl7NEgTf4nb44flJl5PLOXZW854+tKf1JAa5JFrE9emWKC0RtsVbL+baxxY9MVEv7sWdBbyC2KxWzretzm+mvd9bhYfMtqNHvRWprLEs/HjlEJKTM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1576777432003635.2347708175333; Thu, 19 Dec 2019 09:43:52 -0800 (PST) Received: from localhost ([::1]:45526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihzq2-0003Rs-Ji for importer@patchew.org; Thu, 19 Dec 2019 12:43:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46099) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihzYE-0006l9-24 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 12:25:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihzYC-0007Ju-P4 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 12:25:25 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:52066 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihzYB-0007Hg-L5 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 12:25:24 -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-254-SbwOIM2oNHCmbOtMlHhAgA-1; Thu, 19 Dec 2019 12:25:19 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 082A4107ACC9; Thu, 19 Dec 2019 17:25:18 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-117-53.ams2.redhat.com [10.36.117.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id E7ECD620C0; Thu, 19 Dec 2019 17:25:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576776322; 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=3On4XWfVcj5B+no5b4p44Jfdeq4GsAjz4vRXBd1i3iM=; b=cDfnNbIiZD94SsM7HVXUvW0o2QGfvLvWfdmI+n4iqfSQcZzocAIUMaqekEj2599CjRyr95 F0UcwLzBmIM/9oELmaPVJhExUIz78MOpKwFeN1LghRSvwWXGwqXJPNJiLy0s/7gn9xIJme rDUs8F/+7lxwRshhxOr+mG82yqx5ag4= From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 18/30] iotests: Create VM.blockdev_create() Date: Thu, 19 Dec 2019 18:24:29 +0100 Message-Id: <20191219172441.7289-19-kwolf@redhat.com> In-Reply-To: <20191219172441.7289-1-kwolf@redhat.com> References: <20191219172441.7289-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: SbwOIM2oNHCmbOtMlHhAgA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We have several almost identical copies of a blockdev_create() function in different test cases. Time to create one unified function in iotests.py. To keep the diff managable, this patch only creates the function and follow-up patches will convert the individual test cases. Signed-off-by: Kevin Wolf --- tests/qemu-iotests/iotests.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index b46d298766..8739ec6613 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -643,6 +643,22 @@ class VM(qtest.QEMUQtestMachine): elif status =3D=3D 'null': return error =20 + # Returns None on success, and an error string on failure + def blockdev_create(self, options, job_id=3D'job0', filters=3DNone): + if filters is None: + filters =3D [filter_qmp_testfiles] + result =3D self.qmp_log('blockdev-create', filters=3Dfilters, + job_id=3Djob_id, options=3Doptions) + + if 'return' in result: + assert result['return'] =3D=3D {} + job_result =3D self.run_job(job_id) + else: + job_result =3D result['error'] + + log("") + return job_result + def enable_migration_events(self, name): log('Enabling migration QMP events on %s...' % name) log(self.qmp('migrate-set-capabilities', capabilities=3D[ --=20 2.20.1