[Qemu-devel] [PATCH 4/4] block/vpc: add tests for image creation force_size parameter

[Jeff Cody]

Signed-off-by: Jeff Cody <jc...@redhat.com>
---
 tests/qemu-iotests/146     | 81 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/146.out | 44 +++++++++++++++++++++++++
 2 files changed, 125 insertions(+)

diff --git a/tests/qemu-iotests/146 b/tests/qemu-iotests/146
index af60849..323ea8a 100755
--- a/tests/qemu-iotests/146
+++ b/tests/qemu-iotests/146
@@ -113,6 +113,87 @@ _send_qemu_cmd $h1 'qemu-io disk "map"' "sectors"
 _send_qemu_cmd $h1 'quit' ""
 
 
+_cleanup_test_img
+
+echo
+echo === Testing Image create, default ===
+echo
+
+TEST_IMG="${TEST_DIR}/vpc-create-test.vpc"
+
+_make_test_img 4G
+
+echo
+echo === Read created image, default opts ====
+echo
+
+_launch_qemu -drive file="${TEST_IMG}",id=disk,format=vpc
+h1=$QEMU_HANDLE
+
+_send_qemu_cmd $h1 'qemu-io disk "map"' "sectors"
+_send_qemu_cmd $h1 'quit' ""
+
+echo
+echo === Read created image, force_size_calc=chs ====
+echo
+
+_launch_qemu -drive file="${TEST_IMG}",id=disk,format=vpc,force_size_calc=chs
+h1=$QEMU_HANDLE
+
+_send_qemu_cmd $h1 'qemu-io disk "map"' "sectors"
+_send_qemu_cmd $h1 'quit' ""
+
+
+echo
+echo === Read created image, force_size_calc=current_size ====
+echo
+
+_launch_qemu -drive 
file="${TEST_IMG}",id=disk,format=vpc,force_size_calc=current_size
+h1=$QEMU_HANDLE
+
+_send_qemu_cmd $h1 'qemu-io disk "map"' "sectors"
+_send_qemu_cmd $h1 'quit' ""
+
+
+echo
+echo === Testing Image create, force_size ===
+echo
+
+_make_test_img -o force_size 4G
+
+
+echo
+echo === Read created image, default opts ====
+echo
+
+_launch_qemu -drive file="${TEST_IMG}",id=disk,format=vpc
+h1=$QEMU_HANDLE
+
+_send_qemu_cmd $h1 'qemu-io disk "map"' "sectors"
+_send_qemu_cmd $h1 'quit' ""
+
+echo
+echo === Read created image, force_size_calc=chs ====
+echo
+
+_launch_qemu -drive file="${TEST_IMG}",id=disk,format=vpc,force_size_calc=chs
+h1=$QEMU_HANDLE
+
+_send_qemu_cmd $h1 'qemu-io disk "map"' "sectors"
+_send_qemu_cmd $h1 'quit' ""
+
+
+echo
+echo === Read created image, force_size_calc=current_size ====
+echo
+
+_launch_qemu -drive 
file="${TEST_IMG}",id=disk,format=vpc,force_size_calc=current_size
+h1=$QEMU_HANDLE
+
+_send_qemu_cmd $h1 'qemu-io disk "map"' "sectors"
+_send_qemu_cmd $h1 'quit' ""
+
+
 
 echo "*** done"
 rm -f $seq.full
diff --git a/tests/qemu-iotests/146.out b/tests/qemu-iotests/146.out
index ddcfeb6..9a28a60 100644
--- a/tests/qemu-iotests/146.out
+++ b/tests/qemu-iotests/146.out
@@ -35,4 +35,48 @@ QEMU X.Y.Z monitor - type 'help' for more information
 QEMU X.Y.Z monitor - type 'help' for more information
 (qemu) 
qqeqemqemuqemu-qemu-iqemu-ioqemu-io
 qemu-io dqemu-io 
diqemu-io 
disqemu-io 
diskqemu-io disk 
qemu-io disk 
"qemu-io disk 
"mqemu-io disk 
"maqemu-io disk 
"mapqemu-io disk "map"
 [                       0]  266334240/ 266334240 sectors not allocated at 
offset 0 bytes (0)
+
+=== Testing Image create, default ===
+
+Formatting 'TEST_DIR/IMGFMT-create-test.IMGFMT', fmt=IMGFMT size=4294967296
+
+=== Read created image, default opts ====
+
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) 
qqeqemqemuqemu-qemu-iqemu-ioqemu-io
 qemu-io dqemu-io 
diqemu-io 
disqemu-io 
diskqemu-io disk 
qemu-io disk 
"qemu-io disk 
"mqemu-io disk 
"maqemu-io disk 
"mapqemu-io disk "map"
+[                       0]  8389584/ 8389584 sectors not allocated at offset 0 
bytes (0)
+
+=== Read created image, force_size_calc=chs ====
+
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) 
qqeqemqemuqemu-qemu-iqemu-ioqemu-io
 qemu-io dqemu-io 
diqemu-io 
disqemu-io 
diskqemu-io disk 
qemu-io disk 
"qemu-io disk 
"mqemu-io disk 
"maqemu-io disk 
"mapqemu-io disk "map"
+[                       0]  8389584/ 8389584 sectors not allocated at offset 0 
bytes (0)
+
+=== Read created image, force_size_calc=current_size ====
+
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) 
qqeqemqemuqemu-qemu-iqemu-ioqemu-io
 qemu-io dqemu-io 
diqemu-io 
disqemu-io 
diskqemu-io disk 
qemu-io disk 
"qemu-io disk 
"mqemu-io disk 
"maqemu-io disk 
"mapqemu-io disk "map"
+[                       0]  8389584/ 8389584 sectors not allocated at offset 0 
bytes (0)
+
+=== Testing Image create, force_size ===
+
+Formatting 'TEST_DIR/IMGFMT-create-test.IMGFMT', fmt=IMGFMT size=4294967296 
force_size=on
+
+=== Read created image, default opts ====
+
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) 
qqeqemqemuqemu-qemu-iqemu-ioqemu-io
 qemu-io dqemu-io 
diqemu-io 
disqemu-io 
diskqemu-io disk 
qemu-io disk 
"qemu-io disk 
"mqemu-io disk 
"maqemu-io disk 
"mapqemu-io disk "map"
+[                       0]  8389584/ 8389584 sectors not allocated at offset 0 
bytes (0)
+
+=== Read created image, force_size_calc=chs ====
+
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) 
qqeqemqemuqemu-qemu-iqemu-ioqemu-io
 qemu-io dqemu-io 
diqemu-io 
disqemu-io 
diskqemu-io disk 
qemu-io disk 
"qemu-io disk 
"mqemu-io disk 
"maqemu-io disk 
"mapqemu-io disk "map"
+[                       0]  8389584/ 8389584 sectors not allocated at offset 0 
bytes (0)
+
+=== Read created image, force_size_calc=current_size ====
+
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) 
qqeqemqemuqemu-qemu-iqemu-ioqemu-io
 qemu-io dqemu-io 
diqemu-io 
disqemu-io 
diskqemu-io disk 
qemu-io disk 
"qemu-io disk 
"mqemu-io disk 
"maqemu-io disk 
"mapqemu-io disk "map"
+[                       0]  8388608/ 8388608 sectors not allocated at offset 0 
bytes (0)
 *** done
-- 
1.9.3