From nobody Fri Nov 7 13:03:43 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1538784117012779.7327281217971; Fri, 5 Oct 2018 17:01:57 -0700 (PDT) Received: from localhost ([::1]:37443 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g8a2b-0004Ot-KA for importer@patchew.org; Fri, 05 Oct 2018 20:01:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57699) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g8ZjE-0003yR-NB for qemu-devel@nongnu.org; Fri, 05 Oct 2018 19:41:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g8ZjD-00019g-13 for qemu-devel@nongnu.org; Fri, 05 Oct 2018 19:41:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50290) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g8Zj4-0000j2-Dx; Fri, 05 Oct 2018 19:41:42 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4759B88E48; Fri, 5 Oct 2018 23:41:41 +0000 (UTC) Received: from localhost (ovpn-204-46.brq.redhat.com [10.40.204.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9DE8371D45; Fri, 5 Oct 2018 23:41:40 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Sat, 6 Oct 2018 01:40:23 +0200 Message-Id: <20181005234023.8104-32-mreitz@redhat.com> In-Reply-To: <20181005234023.8104-1-mreitz@redhat.com> References: <20181005234023.8104-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 05 Oct 2018 23:41:41 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v11 31/31] iotests: Test json:{} filenames of internal BDSs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz --- tests/qemu-iotests/224 | 139 +++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/224.out | 18 +++++ tests/qemu-iotests/group | 1 + 3 files changed, 158 insertions(+) create mode 100755 tests/qemu-iotests/224 create mode 100644 tests/qemu-iotests/224.out diff --git a/tests/qemu-iotests/224 b/tests/qemu-iotests/224 new file mode 100755 index 0000000000..ef652ad488 --- /dev/null +++ b/tests/qemu-iotests/224 @@ -0,0 +1,139 @@ +#!/usr/bin/env python +# +# Test json:{} filenames with qemu-internal BDSs +# (the one of commit, to be precise) +# +# Copyright (C) 2018 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 . +# +# Creator/Owner: Max Reitz + +import iotests +from iotests import log, qemu_img, qemu_io_silent, filter_testfiles, \ + filter_imgfmt +import json + +# Need backing file support (for arbitrary backing formats) +iotests.verify_image_format(supported_fmts=3D['qcow2', 'qcow', 'qed']) +iotests.verify_platform(['linux']) + + +# There are two variations of this test: +# (1) We do not set filter_node_name. In that case, the commit_top +# driver should not appear anywhere. +# (2) We do set filter_node_name. In that case, it should appear. +# +# This for loop executes both. +for filter_node_name in False, True: + log('') + log('--- filter_node_name: %s ---' % filter_node_name) + log('') + + with iotests.FilePath('base.img') as base_img_path, \ + iotests.FilePath('mid.img') as mid_img_path, \ + iotests.FilePath('top.img') as top_img_path, \ + iotests.VM() as vm: + + assert qemu_img('create', '-f', iotests.imgfmt, + base_img_path, '64M') =3D=3D 0 + assert qemu_img('create', '-f', iotests.imgfmt, '-b', base_img_pat= h, + mid_img_path) =3D=3D 0 + assert qemu_img('create', '-f', iotests.imgfmt, '-b', mid_img_path, + top_img_path) =3D=3D 0 + + # Something to commit + assert qemu_io_silent(mid_img_path, '-c', 'write -P 1 0 1M') =3D= =3D 0 + + vm.launch() + + # Change the bottom-most image's backing file (to null-co://) + # to enforce json:{} filenames + vm.qmp_log('blockdev-add', + node_name=3D'top', + driver=3Diotests.imgfmt, + file=3D{ + 'driver': 'file', + 'filename': top_img_path + }, + backing=3D{ + 'node-name': 'mid', + 'driver': iotests.imgfmt, + 'file': { + 'driver': 'file', + 'filename': mid_img_path + }, + 'backing': { + 'node-name': 'base', + 'driver': iotests.imgfmt, + 'file': { + 'driver': 'file', + 'filename': base_img_path + }, + 'backing': { + 'driver': 'null-co' + } + } + }, + filters=3D[filter_testfiles, filter_imgfmt]) + + # As long as block-commit does not accept node names, we have to + # get our mid/base filenames here + mid_name =3D vm.node_info('mid')['image']['filename'] + base_name =3D vm.node_info('base')['image']['filename'] + + assert mid_name[:5] =3D=3D 'json:' + assert base_name[:5] =3D=3D 'json:' + + # Start the block job + if filter_node_name: + vm.qmp_log('block-commit', + job_id=3D'commit', + device=3D'top', + filter_node_name=3D'filter_node', + top=3Dmid_name, + base=3Dbase_name, + speed=3D1, + filters=3D[filter_testfiles, filter_imgfmt]) + else: + vm.qmp_log('block-commit', + job_id=3D'commit', + device=3D'top', + top=3Dmid_name, + base=3Dbase_name, + speed=3D1, + filters=3D[filter_testfiles, filter_imgfmt]) + + vm.qmp_log('job-pause', id=3D'commit') + + # Get and parse top's json:{} filename + top_name =3D vm.node_info('top')['image']['filename'] + + vm.shutdown() + + assert top_name[:5] =3D=3D 'json:' + top_options =3D json.loads(top_name[5:]) + + if filter_node_name: + # This should be present and set + assert top_options['backing']['driver'] =3D=3D 'commit_top' + # And the mid image is commit_top's backing image + mid_options =3D top_options['backing']['backing'] + else: + # The mid image should appear as the immediate backing BDS + # of top + mid_options =3D top_options['backing'] + + assert mid_options['driver'] =3D=3D iotests.imgfmt + assert mid_options['file']['filename'] =3D=3D mid_img_path diff --git a/tests/qemu-iotests/224.out b/tests/qemu-iotests/224.out new file mode 100644 index 0000000000..0230ae2c54 --- /dev/null +++ b/tests/qemu-iotests/224.out @@ -0,0 +1,18 @@ + +--- filter_node_name: False --- + +{'execute': 'blockdev-add', 'arguments': {'backing': {'backing': {'backing= ': {'driver': 'null-co'}, 'node-name': 'base', 'driver': 'IMGFMT', 'file': = {'driver': 'file', 'filename': 'TEST_DIR/PID-base.img'}}, 'node-name': 'mid= ', 'driver': 'IMGFMT', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID= -mid.img'}}, 'driver': 'IMGFMT', 'file': {'driver': 'file', 'filename': 'TE= ST_DIR/PID-top.img'}, 'node_name': 'top'}} +{u'return': {}} +{'execute': 'block-commit', 'arguments': {'device': 'top', 'top': u'json:{= "backing": {"backing": {"driver": "null-co"}, "driver": "IMGFMT", "file": {= "driver": "file", "filename": "TEST_DIR/PID-base.img"}}, "driver": "IMGFMT"= , "file": {"driver": "file", "filename": "TEST_DIR/PID-mid.img"}}', 'base':= u'json:{"backing": {"driver": "null-co"}, "driver": "IMGFMT", "file": {"dr= iver": "file", "filename": "TEST_DIR/PID-base.img"}}', 'speed': 1, 'job_id'= : 'commit'}} +{u'return': {}} +{'execute': 'job-pause', 'arguments': {'id': 'commit'}} +{u'return': {}} + +--- filter_node_name: True --- + +{'execute': 'blockdev-add', 'arguments': {'backing': {'backing': {'backing= ': {'driver': 'null-co'}, 'node-name': 'base', 'driver': 'IMGFMT', 'file': = {'driver': 'file', 'filename': 'TEST_DIR/PID-base.img'}}, 'node-name': 'mid= ', 'driver': 'IMGFMT', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID= -mid.img'}}, 'driver': 'IMGFMT', 'file': {'driver': 'file', 'filename': 'TE= ST_DIR/PID-top.img'}, 'node_name': 'top'}} +{u'return': {}} +{'execute': 'block-commit', 'arguments': {'job_id': 'commit', 'top': u'jso= n:{"backing": {"backing": {"driver": "null-co"}, "driver": "IMGFMT", "file"= : {"driver": "file", "filename": "TEST_DIR/PID-base.img"}}, "driver": "IMGF= MT", "file": {"driver": "file", "filename": "TEST_DIR/PID-mid.img"}}', 'bas= e': u'json:{"backing": {"driver": "null-co"}, "driver": "IMGFMT", "file": {= "driver": "file", "filename": "TEST_DIR/PID-base.img"}}', 'device': 'top', = 'filter_node_name': 'filter_node', 'speed': 1}} +{u'return': {}} +{'execute': 'job-pause', 'arguments': {'id': 'commit'}} +{u'return': {}} diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index 9b28c47fbe..18ad9091ce 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -222,6 +222,7 @@ 221 rw auto quick 222 rw auto quick 223 rw auto quick +224 rw auto quick 225 rw auto quick 226 auto quick 227 auto quick --=20 2.17.1