From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36170) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1zVq-0001oR-5J for qemu-devel@nongnu.org; Mon, 08 Jun 2015 12:03:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z1zVm-0001Ei-Hc for qemu-devel@nongnu.org; Mon, 08 Jun 2015 12:02:58 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:38531 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1zVm-00018U-5C for qemu-devel@nongnu.org; Mon, 08 Jun 2015 12:02:54 -0400 From: Vladimir Sementsov-Ogievskiy Date: Mon, 8 Jun 2015 18:21:26 +0300 Message-Id: <1433776886-27239-9-git-send-email-vsementsov@virtuozzo.com> In-Reply-To: <1433776886-27239-1-git-send-email-vsementsov@virtuozzo.com> References: <1433776886-27239-1-git-send-email-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH 8/8] iotests: test internal persistent dirty bitmap List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, Vladimir Sementsov-Ogievskiy , stefanha@redhat.com, pbonzini@redhat.com, den@openvz.org, jsnow@redhat.com From: Vladimir Sementsov-Ogievskiy The test performs several vm reloads with checking and updating dirty bitmap. Signed-off-by: Vladimir Sementsov-Ogievskiy --- tests/qemu-iotests/118 | 83 +++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/118.out | 5 +++ tests/qemu-iotests/group | 1 + tests/qemu-iotests/iotests.py | 6 ++++ 4 files changed, 95 insertions(+) create mode 100755 tests/qemu-iotests/118 create mode 100644 tests/qemu-iotests/118.out diff --git a/tests/qemu-iotests/118 b/tests/qemu-iotests/118 new file mode 100755 index 0000000..f6e91aa --- /dev/null +++ b/tests/qemu-iotests/118 @@ -0,0 +1,83 @@ +#!/usr/bin/env python +# +# Tests for persistent dirty bitmaps. +# +# (C) 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 TestDirtyBitmapMigration(iotests.QMPTestCase): + + def setUp(self): + qemu_img('create', '-f', iotests.imgfmt, disk, str(size)) + self.vm = iotests.VM().add_drive(disk) + self.vm.add_dirty_bitmap('bitmap', 'drive0') + self.vm.launch() + + def tearDown(self): + self.vm.shutdown() + 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.writeRegions(regions1) + md5 = self.getMd5() + + self.vm.shutdown() + self.vm.launch() + + self.checkBitmap(md5) + self.writeRegions(regions2) + md5 = self.getMd5() + + self.vm.shutdown() + self.vm.launch() + + self.checkBitmap(md5) + + +if __name__ == '__main__': + iotests.main() diff --git a/tests/qemu-iotests/118.out b/tests/qemu-iotests/118.out new file mode 100644 index 0000000..ae1213e --- /dev/null +++ b/tests/qemu-iotests/118.out @@ -0,0 +1,5 @@ +. +---------------------------------------------------------------------- +Ran 1 tests + +OK diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index 6812681..8cd4db1 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -122,6 +122,7 @@ 115 rw auto 116 rw auto quick 117 rw auto quick +118 rw auto quick 121 rw auto 122 rw auto 123 rw auto quick diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 945f2a2..013d5da 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -140,6 +140,12 @@ class VM(object): self._args.append(desc) return self + def add_dirty_bitmap(self, name, drive): + '''Add dirty bitmap parameter to VM cmd''' + self._args.append('-dirty-bitmap') + self._args.append('name=%s,drive=%s' % (name, drive)) + return self + def pause_drive(self, drive, event=None): '''Pause drive r/w operations''' if not event: -- 1.9.1