From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54212) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bZzEz-0002tv-KS for qemu-devel@nongnu.org; Wed, 17 Aug 2016 07:42:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bZzEy-0004WM-1Y for qemu-devel@nongnu.org; Wed, 17 Aug 2016 07:42:37 -0400 Date: Wed, 17 Aug 2016 19:35:23 +0800 From: Fam Zheng Message-ID: <20160817113523.GA23035@al.usersys.redhat.com> References: <1471343175-14945-1-git-send-email-vsementsov@virtuozzo.com> <1471343175-14945-18-git-send-email-vsementsov@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1471343175-14945-18-git-send-email-vsementsov@virtuozzo.com> Subject: Re: [Qemu-devel] [PATCH 17/18] iotests: add dirty bitmap migration test 169 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vladimir Sementsov-Ogievskiy Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, kwolf@redhat.com, peter.maydell@linaro.org, lirans@il.ibm.com, quintela@redhat.com, jsnow@redhat.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, den@openvz.org, amit.shah@redhat.com, pbonzini@redhat.com, dgilbert@redhat.com On Tue, 08/16 13:26, Vladimir Sementsov-Ogievskiy wrote: > The test starts two vms (vm_a, vm_b), create dirty bitmap in > the first one, do several writes to corresponding device and > then migrate vm_a to vm_b with dirty bitmaps. > > Signed-off-by: Vladimir Sementsov-Ogievskiy > --- > tests/qemu-iotests/169 | 84 ++++++++++++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/169.out | 5 +++ > tests/qemu-iotests/group | 1 + > 3 files changed, 90 insertions(+) > create mode 100755 tests/qemu-iotests/169 > create mode 100644 tests/qemu-iotests/169.out > > diff --git a/tests/qemu-iotests/169 b/tests/qemu-iotests/169 > new file mode 100755 > index 0000000..d40be1d > --- /dev/null > +++ b/tests/qemu-iotests/169 > @@ -0,0 +1,84 @@ > +#!/usr/bin/env python > +# > +# Tests for dirty bitmaps migration. > +# > +# (C) Vladimir Sementsov-Ogievskiy 2015 2016? > +# > +# 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_a = os.path.join(iotests.test_dir, 'disk_a') > +disk_b = os.path.join(iotests.test_dir, 'disk_b') > +fifo = os.path.join(iotests.test_dir, 'mig_fifo') > + > +class TestDirtyBitmapMigration(iotests.QMPTestCase): > + > + def setUp(self): > + size = 0x400000000 # 1G > + os.mkfifo(fifo) > + qemu_img('create', '-f', iotests.imgfmt, disk_a, str(size)) > + qemu_img('create', '-f', iotests.imgfmt, disk_b, str(size)) > + self.vm_a = iotests.VM().add_drive(disk_a) > + self.vm_b = iotests.VM().add_drive(disk_b) > + self.vm_b.add_incoming_migration("exec: cat " + fifo) > + self.vm_a.launch() > + self.vm_b.launch() > + > + def tearDown(self): > + self.vm_a.shutdown() > + self.vm_b.shutdown() > + os.remove(disk_a) > + os.remove(disk_b) > + os.remove(fifo) > + > + def test_migration(self): > + granularity = 512 > + regions = [ > + { 'start': 0, 'count': 0x100000 }, ^ Misaligned by one column? > + { 'start': 0x100000000, 'count': 0x200000 }, > + { 'start': 0x399900000, 'count': 0x100000 } > + ] > + > + result = self.vm_a.qmp('block-dirty-bitmap-add', node='drive0', > + name='bitmap', granularity=granularity) > + self.assert_qmp(result, 'return', {}); > + > + for r in regions: > + self.vm_a.hmp_qemu_io('drive0', > + 'write %d %d' % (r['start'], r['count'])) > + > + result = self.vm_a.qmp('query-block'); > + md5 = result['return'][0]['dirty-bitmaps'][0]['md5'] > + > + result = self.vm_a.qmp('migrate-set-capabilities', > + capabilities=[{'capability': 'dirty-bitmaps', > + 'state': True}]) > + self.assert_qmp(result, 'return', {}) > + > + result = self.vm_a.qmp('migrate', uri='exec:cat>' + fifo) > + self.assertNotEqual(self.vm_a.event_wait("STOP"), None) > + self.assertNotEqual(self.vm_b.event_wait("RESUME"), None) > + time.sleep(2) > + > + result = self.vm_b.qmp('query-block'); > + self.assert_qmp(result, 'return[0]/dirty-bitmaps[0]/md5', md5); > + > + > +if __name__ == '__main__': > + iotests.main() > diff --git a/tests/qemu-iotests/169.out b/tests/qemu-iotests/169.out > new file mode 100644 > index 0000000..ae1213e > --- /dev/null > +++ b/tests/qemu-iotests/169.out > @@ -0,0 +1,5 @@ > +. > +---------------------------------------------------------------------- > +Ran 1 tests > + > +OK > diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group > index 3a3973e..a939718 100644 > --- a/tests/qemu-iotests/group > +++ b/tests/qemu-iotests/group > @@ -157,3 +157,4 @@ > 155 rw auto > 156 rw auto quick > 157 auto > +169 rw auto quick > -- > 1.8.3.1 > > Fam