From patchwork Wed Feb 17 15:29:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 8340391 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 981CB9F372 for ; Wed, 17 Feb 2016 15:39:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9ACDC203B7 for ; Wed, 17 Feb 2016 15:39:09 +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 9A9C120357 for ; Wed, 17 Feb 2016 15:39:03 +0000 (UTC) Received: from localhost ([::1]:58751 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW4Bz-00054c-0k for patchwork-qemu-devel@patchwork.kernel.org; Wed, 17 Feb 2016 10:39:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60428) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW43Y-0007eC-HC for qemu-devel@nongnu.org; Wed, 17 Feb 2016 10:30:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aW43T-0008Q4-V7 for qemu-devel@nongnu.org; Wed, 17 Feb 2016 10:30:20 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:22100 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW43T-0008Po-Ix for qemu-devel@nongnu.org; Wed, 17 Feb 2016 10:30:15 -0500 Received: from kvm.sw.ru. ([10.28.8.145]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u1HFTHCX009256; Wed, 17 Feb 2016 18:29:58 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Date: Wed, 17 Feb 2016 18:29:07 +0300 Message-Id: <1455722949-17060-16-git-send-email-vsementsov@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1455722949-17060-1-git-send-email-vsementsov@virtuozzo.com> References: <1455722949-17060-1-git-send-email-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, famz@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, den@openvz.org, jsnow@redhat.com Subject: [Qemu-devel] [PATCH 15/17] iotests: test internal persistent dirty bitmap 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 Add simple test cases for testing persistent dirty bitmaps. Signed-off-by: Vladimir Sementsov-Ogievskiy --- tests/qemu-iotests/160 | 112 ++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/160.out | 21 ++++++++ tests/qemu-iotests/group | 1 + tests/qemu-iotests/iotests.py | 6 +++ 4 files changed, 140 insertions(+) create mode 100755 tests/qemu-iotests/160 create mode 100644 tests/qemu-iotests/160.out diff --git a/tests/qemu-iotests/160 b/tests/qemu-iotests/160 new file mode 100755 index 0000000..f9843da --- /dev/null +++ b/tests/qemu-iotests/160 @@ -0,0 +1,112 @@ +#!/usr/bin/env python +# +# Tests for persistent dirty bitmaps. +# +# Copyright: Vladimir Sementsov-Ogievskiy 2015 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +import os +import iotests +import time +from iotests import qemu_img + +disk = os.path.join(iotests.test_dir, 'disk') + +size = 0x40000000 # 1G +sector_size = 512 +granularity = 0x10000 +regions1 = [ + { 'start': 0, 'count': 0x100000 }, + { 'start': 0x200000, 'count': 0x100000 } + ] +regions2 = [ + { 'start': 0x10000000, 'count': 0x20000 }, + { 'start': 0x39990000, 'count': 0x10000 } + ] + +class TestPersistentDirtyBitmap(iotests.QMPTestCase): + + def setUp(self): + qemu_img('create', '-f', iotests.imgfmt, disk, str(size)) + + def mkVm(self, create_bitmap): + vm = iotests.VM().add_drive(disk) + vm.add_dirty_bitmap('12300000-0000-0000-1230-000001230000', 'drive0', create_bitmap) + return vm + + def tearDown(self): + os.remove(disk) + + def getMd5(self): + result = self.vm.qmp('query-block'); + return result['return'][0]['dirty-bitmaps'][0]['md5'] + + def checkBitmap(self, md5): + result = self.vm.qmp('query-block'); + self.assert_qmp(result, 'return[0]/dirty-bitmaps[0]/md5', md5); + + def writeRegions(self, regions): + for r in regions: + self.vm.hmp_qemu_io('drive0', + 'write %d %d' % (r['start'], r['count'])) + + def test_persistent(self): + self.vm = self.mkVm(True) + self.vm.launch() + + self.writeRegions(regions1) + md5 = self.getMd5() + + self.vm.shutdown() + self.vm = self.mkVm(False) + self.vm.launch() + + self.checkBitmap(md5) + self.writeRegions(regions2) + md5 = self.getMd5() + + self.vm.shutdown() + self.vm.launch() + + self.checkBitmap(md5) + + self.vm.shutdown() + + def test_not_exist(self): + vm = self.mkVm(False) + vm.test_launch() + + def test_already_exists(self): + vm = self.mkVm(True) + vm.test_launch() + vm.test_launch() + + def test_in_use(self): + vm = self.mkVm(True) + vm.launch() + vm.shutdown() + + vm1 = self.mkVm(False) + vm1.launch() + + vm2 = self.mkVm(False) + vm2.test_launch() + + vm1.shutdown() + + +if __name__ == '__main__': + iotests.main() diff --git a/tests/qemu-iotests/160.out b/tests/qemu-iotests/160.out new file mode 100644 index 0000000..bb2e6ec --- /dev/null +++ b/tests/qemu-iotests/160.out @@ -0,0 +1,21 @@ +.... +---------------------------------------------------------------------- +Ran 4 tests + +OK +Tast launch successed! +Test launch failed: 1 +--- qemu output --- +qemu-system-x86_64: -dirty-bitmap name=12300000-0000-0000-1230-000001230000,node=drive0,create=on: bitmap '12300000-0000-0000-1230-000001230000' already exists + +--- end qemu output --- +Test launch failed: 1 +--- qemu output --- +qemu-system-x86_64: -dirty-bitmap name=12300000-0000-0000-1230-000001230000,node=drive0,create=off: Bitmap '12300000-0000-0000-1230-000001230000' is in use + +--- end qemu output --- +Test launch failed: 1 +--- qemu output --- +qemu-system-x86_64: -dirty-bitmap name=12300000-0000-0000-1230-000001230000,node=drive0,create=off: Could not find bitmap '12300000-0000-0000-1230-000001230000' in the node 'drive0' + +--- end qemu output --- diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index d6e9219..75342f6 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -142,3 +142,4 @@ 138 rw auto quick 139 rw auto quick 142 auto +160 rw auto quick diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index c879e88..f537b99 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -166,6 +166,12 @@ class VM(object): self._num_drives += 1 return self + def add_dirty_bitmap(self, name, node, create=False): + '''Add dirty bitmap parameter to VM cmd''' + self._args.append('-dirty-bitmap') + self._args.append('name=%s,node=%s,create=%s' % (name, node, 'on' if create else 'off')) + return self + def pause_drive(self, drive, event=None): '''Pause drive r/w operations''' if not event: