From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yv5gx-000835-6O for qemu-devel@nongnu.org; Wed, 20 May 2015 11:13:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yv5gt-0000HZ-FQ for qemu-devel@nongnu.org; Wed, 20 May 2015 11:13:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33894) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yv5gt-0000HI-9s for qemu-devel@nongnu.org; Wed, 20 May 2015 11:13:51 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 5C6365D for ; Wed, 20 May 2015 15:13:50 +0000 (UTC) Date: Wed, 20 May 2015 16:13:46 +0100 From: "Daniel P. Berrange" Message-ID: <20150520151346.GZ23989@redhat.com> References: <1432122314-17287-1-git-send-email-berrange@redhat.com> <20150520150551.GI4917@noname.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20150520150551.GI4917@noname.redhat.com> Subject: Re: [Qemu-devel] [PATCH] block: filter filename when testing encrypted images Reply-To: "Daniel P. Berrange" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: qemu-devel@nongnu.org On Wed, May 20, 2015 at 05:05:51PM +0200, Kevin Wolf wrote: > Am 20.05.2015 um 13:45 hat Daniel P. Berrange geschrieben: > > qemu-io prints a warning message > > > > "Disk image '/home/berrange/src/virt/qemu/tests/qemu-iotests/scratch/t.qcow2' is encrypted." > > > > when opening an encrypted image, which was mistakenly included > > in the expected output for test 131. Add a filter which strips > > this filename from the output data. > > > > Signed-off-by: Daniel P. Berrange > > --- > > tests/qemu-iotests/131.out | 4 ---- > > tests/qemu-iotests/common.filter | 3 ++- > > 2 files changed, 2 insertions(+), 5 deletions(-) > > > > diff --git a/tests/qemu-iotests/131.out b/tests/qemu-iotests/131.out > > index 4eedb35..7141e4f 100644 > > --- a/tests/qemu-iotests/131.out > > +++ b/tests/qemu-iotests/131.out > > @@ -11,7 +11,6 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on > > Encrypted images are deprecated > > Support for them will be removed in a future release. > > You can use 'qemu-img convert' to convert your image to an unencrypted one. > > -Disk image '/home/berrange/src/virt/qemu/tests/qemu-iotests/scratch/t.qcow2' is encrypted. > > password: > > read 134217728/134217728 bytes at offset 0 > > 128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > > Usually we just apply _filter_testdir(), which leaves the message > around, but replaces the variable part with "TEST_DIR". I think that > would be better here, too, because it shows that qemu-io did indeed > recognise the image as encrypted. > > If you send a v2, I'll squash that into the original, buggy commit > before sending a pull request. Ok, will change that. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|