From patchwork Mon Mar 21 13:47:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Garcia X-Patchwork-Id: 8633311 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 998EC9F294 for ; Mon, 21 Mar 2016 13:50:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0AD5E20219 for ; Mon, 21 Mar 2016 13:50:31 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 50832201F5 for ; Mon, 21 Mar 2016 13:50:30 +0000 (UTC) Received: from localhost ([::1]:57913 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai0E1-0006M5-RD for patchwork-qemu-devel@patchwork.kernel.org; Mon, 21 Mar 2016 09:50:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60567) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai0C4-0002ug-7G for qemu-devel@nongnu.org; Mon, 21 Mar 2016 09:48:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ai0C0-0003JC-V6 for qemu-devel@nongnu.org; Mon, 21 Mar 2016 09:48:28 -0400 Received: from smtp3.mundo-r.com ([212.51.32.191]:63846 helo=smtp4.mundo-r.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai0C0-0003EU-OF; Mon, 21 Mar 2016 09:48:24 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2BDAgCs+u9W/5tjdVteHAGDFoFFpiwFAYEPjj+CFoIPAQ2BcIYNAoEmOBQBAQEBAQEBZCeEQgEBBHkQPxI8GxmIKwG+ZgEBAQcghVaCQ4ZTfoUKBZdXjgSJM4VURI5CHgEBQoNnaIhagTsBAQE X-IPAS-Result: A2BDAgCs+u9W/5tjdVteHAGDFoFFpiwFAYEPjj+CFoIPAQ2BcIYNAoEmOBQBAQEBAQEBZCeEQgEBBHkQPxI8GxmIKwG+ZgEBAQcghVaCQ4ZTfoUKBZdXjgSJM4VURI5CHgEBQoNnaIhagTsBAQE X-IronPort-AV: E=Sophos;i="5.24,372,1454972400"; d="scan'208";a="33491409" Received: from fanzine.igalia.com ([91.117.99.155]) by smtp4.mundo-r.com with ESMTP; 21 Mar 2016 14:47:47 +0100 Received: from [194.100.51.2] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim) id 1ai0BP-0000Wt-1S; Mon, 21 Mar 2016 14:47:47 +0100 Received: from berto by perseus.local with local (Exim 4.86_2) (envelope-from ) id 1ai0B7-00045I-5J; Mon, 21 Mar 2016 15:47:29 +0200 From: Alberto Garcia To: qemu-devel@nongnu.org Date: Mon, 21 Mar 2016 15:47:26 +0200 Message-Id: <2efa304da38b32d47c120ce728568a589c5a3afc.1458566441.git.berto@igalia.com> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.51.32.191 Cc: Kevin Wolf , Alberto Garcia , Stefan Hajnoczi , qemu-block@nongnu.org, Max Reitz Subject: [Qemu-devel] [PATCH v2 2/3] qemu-iotests: fix test_stream_partial() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This test is streaming to the top layer using the intermediate image as the base. This is a mistake since block-stream never copies data from the base image and its backing chain, so this is effectively a no-op. In addition to fixing the base parameter, this patch also writes some data to the intermediate image before the test, so there's something to copy and the test is meaningful. Signed-off-by: Alberto Garcia Reviewed-by: Max Reitz --- tests/qemu-iotests/030 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030 index 32469ef..48a924c 100755 --- a/tests/qemu-iotests/030 +++ b/tests/qemu-iotests/030 @@ -35,6 +35,7 @@ class TestSingleDrive(iotests.QMPTestCase): qemu_img('create', '-f', iotests.imgfmt, '-o', 'backing_file=%s' % backing_img, mid_img) qemu_img('create', '-f', iotests.imgfmt, '-o', 'backing_file=%s' % mid_img, test_img) qemu_io('-f', 'raw', '-c', 'write -P 0x1 0 512', backing_img) + qemu_io('-f', iotests.imgfmt, '-c', 'write -P 0x1 524288 512', mid_img) self.vm = iotests.VM().add_drive("blkdebug::" + test_img) self.vm.launch() @@ -93,7 +94,7 @@ class TestSingleDrive(iotests.QMPTestCase): def test_stream_partial(self): self.assert_no_active_block_jobs() - result = self.vm.qmp('block-stream', device='drive0', base=mid_img) + result = self.vm.qmp('block-stream', device='drive0', base=backing_img) self.assert_qmp(result, 'return', {}) self.wait_until_completed()