15.12.2018 2:15, John Snow wrote: > New interface, new smoke test. > --- > tests/qemu-iotests/236 | 124 +++++++++++++++++++++++ > tests/qemu-iotests/236.out | 200 +++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/group | 1 + > 3 files changed, 325 insertions(+) > create mode 100755 tests/qemu-iotests/236 > create mode 100644 tests/qemu-iotests/236.out > > diff --git a/tests/qemu-iotests/236 b/tests/qemu-iotests/236 > new file mode 100755 > index 0000000000..edf16c4ab1 > --- /dev/null > +++ b/tests/qemu-iotests/236 > @@ -0,0 +1,124 @@ > +#!/usr/bin/env python > +# > +# Test bitmap merges. > +# > +# Copyright (c) 2018 John Snow for Red Hat, Inc. > +# > +# 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 <http://www.gnu.org/licenses/>. > +# > +# owner=js...@redhat.com > + > +import json > +import iotests > +from iotests import log > + > +iotests.verify_image_format(supported_fmts=['qcow2']) > +
we hardcode patterns, so it's better to hardcode size here too: size = 64 * 1024 * 1024 > +patterns = [("0x5d", "0", "64k"), > + ("0xd5", "1M", "64k"), > + ("0xdc", "32M", "64k"), > + ("0xcd", "0x3ff0000", "64k")] # 64M - 64K > + > +overwrite = [("0xab", "0", "64k"), # Full overwrite > + ("0xad", "0x00f8000", "64k"), # Partial-left (1M-32K) > + ("0x1d", "0x2008000", "64k"), # Partial-right (32M+32K) > + ("0xea", "0x3fe0000", "64k")] # Adjacent-left (64M - 128K) > + > +def query_bitmaps(vm): > + res = vm.qmp("query-block") > + return {device['device']: device['dirty-bitmaps'] for > + device in res['return']} > + > +with iotests.FilePath('img') as img_path, \ > + iotests.VM() as vm: > + > + log('--- Preparing image & VM ---\n') > + iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, img_path, '64M') no needs for qemu_img_pipe, as you don't use its output, qemu_img() is enough and qemu_img_create() is better, and the best I think is just: vm.add_drive_raw('id=drive0,driver=null-co,size=' + str(size)) as qcow2 (and real disk in general) is actually unrelated to the test. > + vm.add_drive(img_path) > + vm.launch() > + > + log('--- Adding preliminary bitmaps A & B ---\n') > + vm.qmp_log("block-dirty-bitmap-add", node="drive0", name="bitmapA") > + vm.qmp_log("block-dirty-bitmap-add", node="drive0", name="bitmapB") > + > + # Dirties 4 clusters. count=262144 > + log('') > + log('--- Emulating writes ---\n') > + for p in patterns: > + cmd = "write -P%s %s %s" % p > + log(cmd) > + log(vm.hmp_qemu_io("drive0", cmd)) > + > + log(json.dumps(query_bitmaps(vm), indent=2, separators=(',', ': '))) log can do json.dumps, so it's strange to do it here, and I don't like ',' separator, as I described -- Best regards, Vladimir