All of lore.kernel.org
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] block: qemu-iotests - fix vmdk test 059.out
@ 2015-10-13  0:18 Jeff Cody
  2015-10-13  1:21 ` Fam Zheng
  0 siblings, 1 reply; 3+ messages in thread
From: Jeff Cody @ 2015-10-13  0:18 UTC (permalink / raw)
  To: qemu-devel; +Cc: kwolf, famz, qemu-block

In commit fe646693acc13ac48b98435d14149ab04dc597bc, the option
printout format changed.

This updates the VMDK test 059.out to the correct output.

Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 tests/qemu-iotests/059.out | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
index 67e3cf5..00057fe 100644
--- a/tests/qemu-iotests/059.out
+++ b/tests/qemu-iotests/059.out
@@ -16,17 +16,17 @@ qemu-io: can't open device TEST_DIR/t.vmdk: L1 size too big
 no file open, try 'help open'
 
 === Testing monolithicFlat creation and opening ===
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 subformat=monolithicFlat
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
 virtual size: 2.0G (2147483648 bytes)
 
 === Testing monolithicFlat with zeroed_grain ===
 qemu-img: TEST_DIR/t.IMGFMT: Flat image can't enable zeroed grain
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 subformat=monolithicFlat
 
 === Testing big twoGbMaxExtentFlat ===
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824000
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824000 subformat=twoGbMaxExtentFlat
 image: TEST_DIR/t.vmdk
 file format: vmdk
 virtual size: 1.0T (1073741824000 bytes)
@@ -2043,7 +2043,7 @@ RW 12582912 VMFS "dummy.IMGFMT" 1
 
 
 === Testing truncated sparse ===
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=107374182400
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=107374182400 subformat=monolithicSparse
 qemu-img: Could not open 'TEST_DIR/t.IMGFMT': File truncated, expecting at least 13172736 bytes
 
 === Converting to streamOptimized from image with small cluster size===
@@ -2054,7 +2054,7 @@ wrote 512/512 bytes at offset 10240
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
 === Testing monolithicFlat with internally generated JSON file name ===
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 subformat=monolithicFlat
 qemu-io: can't open: Cannot use relative extent paths with VMDK descriptor file 'json:{"image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "inject-error.0.event": "read_aio"}'
 
 === Testing version 3 ===
@@ -2264,7 +2264,7 @@ read 512/512 bytes at offset 64931328
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
 === Testing 4TB monolithicFlat creation and IO ===
-Formatting 'TEST_DIR/iotest-version3.IMGFMT', fmt=IMGFMT size=4398046511104
+Formatting 'TEST_DIR/iotest-version3.IMGFMT', fmt=IMGFMT size=4398046511104 subformat=monolithicFlat
 image: TEST_DIR/iotest-version3.IMGFMT
 file format: IMGFMT
 virtual size: 4.0T (4398046511104 bytes)
-- 
1.9.3

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] block: qemu-iotests - fix vmdk test 059.out
  2015-10-13  0:18 [Qemu-devel] [PATCH] block: qemu-iotests - fix vmdk test 059.out Jeff Cody
@ 2015-10-13  1:21 ` Fam Zheng
  2015-10-13  9:56   ` Kevin Wolf
  0 siblings, 1 reply; 3+ messages in thread
From: Fam Zheng @ 2015-10-13  1:21 UTC (permalink / raw)
  To: Jeff Cody; +Cc: kwolf, qemu-devel, qemu-block

On Mon, 10/12 20:18, Jeff Cody wrote:
> In commit fe646693acc13ac48b98435d14149ab04dc597bc, the option
> printout format changed.
> 
> This updates the VMDK test 059.out to the correct output.
> 
> Signed-off-by: Jeff Cody <jcody@redhat.com>
> ---
>  tests/qemu-iotests/059.out | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
> index 67e3cf5..00057fe 100644
> --- a/tests/qemu-iotests/059.out
> +++ b/tests/qemu-iotests/059.out
> @@ -16,17 +16,17 @@ qemu-io: can't open device TEST_DIR/t.vmdk: L1 size too big
>  no file open, try 'help open'
>  
>  === Testing monolithicFlat creation and opening ===
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648
> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 subformat=monolithicFlat
>  image: TEST_DIR/t.IMGFMT
>  file format: IMGFMT
>  virtual size: 2.0G (2147483648 bytes)
>  
>  === Testing monolithicFlat with zeroed_grain ===
>  qemu-img: TEST_DIR/t.IMGFMT: Flat image can't enable zeroed grain
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648
> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 subformat=monolithicFlat
>  
>  === Testing big twoGbMaxExtentFlat ===
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824000
> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824000 subformat=twoGbMaxExtentFlat
>  image: TEST_DIR/t.vmdk
>  file format: vmdk
>  virtual size: 1.0T (1073741824000 bytes)
> @@ -2043,7 +2043,7 @@ RW 12582912 VMFS "dummy.IMGFMT" 1
>  
>  
>  === Testing truncated sparse ===
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=107374182400
> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=107374182400 subformat=monolithicSparse
>  qemu-img: Could not open 'TEST_DIR/t.IMGFMT': File truncated, expecting at least 13172736 bytes
>  
>  === Converting to streamOptimized from image with small cluster size===
> @@ -2054,7 +2054,7 @@ wrote 512/512 bytes at offset 10240
>  512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>  
>  === Testing monolithicFlat with internally generated JSON file name ===
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 subformat=monolithicFlat
>  qemu-io: can't open: Cannot use relative extent paths with VMDK descriptor file 'json:{"image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "inject-error.0.event": "read_aio"}'
>  
>  === Testing version 3 ===
> @@ -2264,7 +2264,7 @@ read 512/512 bytes at offset 64931328
>  512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>  
>  === Testing 4TB monolithicFlat creation and IO ===
> -Formatting 'TEST_DIR/iotest-version3.IMGFMT', fmt=IMGFMT size=4398046511104
> +Formatting 'TEST_DIR/iotest-version3.IMGFMT', fmt=IMGFMT size=4398046511104 subformat=monolithicFlat
>  image: TEST_DIR/iotest-version3.IMGFMT
>  file format: IMGFMT
>  virtual size: 4.0T (4398046511104 bytes)
> -- 
> 1.9.3
> 

Reviewed-by: Fam Zheng <famz@redhat.com>

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] block: qemu-iotests - fix vmdk test 059.out
  2015-10-13  1:21 ` Fam Zheng
@ 2015-10-13  9:56   ` Kevin Wolf
  0 siblings, 0 replies; 3+ messages in thread
From: Kevin Wolf @ 2015-10-13  9:56 UTC (permalink / raw)
  To: Fam Zheng; +Cc: Jeff Cody, qemu-devel, qemu-block

Am 13.10.2015 um 03:21 hat Fam Zheng geschrieben:
> On Mon, 10/12 20:18, Jeff Cody wrote:
> > In commit fe646693acc13ac48b98435d14149ab04dc597bc, the option
> > printout format changed.
> > 
> > This updates the VMDK test 059.out to the correct output.
> > 
> > Signed-off-by: Jeff Cody <jcody@redhat.com>
> 
> Reviewed-by: Fam Zheng <famz@redhat.com>

Thanks, applied to the block branch.

Kevin

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-10-13  9:56 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-13  0:18 [Qemu-devel] [PATCH] block: qemu-iotests - fix vmdk test 059.out Jeff Cody
2015-10-13  1:21 ` Fam Zheng
2015-10-13  9:56   ` Kevin Wolf

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.