[Qemu-devel] [PATCH 2/2] qemu-iotests: Test snapshot mode

[Kevin Wolf]

Signed-off-by: Kevin Wolf <address@hidden>
---
 tests/qemu-iotests/051     | 17 +++++++++++++++
 tests/qemu-iotests/051.out | 54 +++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
index 3a75bda..b23d91b 100755
--- a/tests/qemu-iotests/051
+++ b/tests/qemu-iotests/051
@@ -183,6 +183,23 @@ run_qemu -hda foo:bar
 run_qemu -drive file=foo:bar
 run_qemu -drive file.filename=foo:bar
 
+echo
+echo === Snapshot mode ===
+echo
+
+$QEMU_IO -c "write -P 0x11 0 4k" "$TEST_IMG" | _filter_qemu_io
+
+echo 'qemu-io ide0-hd0 "write -P 0x22 0 4k"' | run_qemu -drive 
file="$TEST_IMG" -snapshot | _filter_qemu_io
+echo 'qemu-io ide0-hd0 "write -P 0x22 0 4k"' | run_qemu -drive 
file="$TEST_IMG",snapshot=on | _filter_qemu_io
+echo 'qemu-io ide0-hd0 "write -P 0x22 0 4k"' | run_qemu -drive 
file.filename="$TEST_IMG",driver=qcow2,snapshot=on | _filter_qemu_io
+echo 'qemu-io ide0-hd0 "write -P 0x22 0 4k"' | run_qemu -drive 
file.filename="$TEST_IMG",driver=qcow2 -snapshot | _filter_qemu_io
+
+$QEMU_IO -c "read -P 0x11 0 4k" "$TEST_IMG" | _filter_qemu_io
+
+echo 'qemu-io ide0-hd0 "write -P 0x22 0 4k"' | run_qemu -drive 
file="$TEST_IMG",snapshot=off | _filter_qemu_io
+
+$QEMU_IO -c "read -P 0x22 0 4k" "$TEST_IMG" | _filter_qemu_io
+
 # success, all done
 echo "*** done"
 rm -f $seq.full
diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out
index 8769c8e..ddef87c 100644
--- a/tests/qemu-iotests/051.out
+++ b/tests/qemu-iotests/051.out
@@ -29,11 +29,11 @@ QEMU_PROG: -drive file=TEST_DIR/t.qcow2,driver=foo: could 
not open disk image TE
 === Overriding backing file ===
 
 Testing: -drive 
file=TEST_DIR/t.qcow2,driver=qcow2,backing.file.filename=TEST_DIR/t.qcow2.orig 
-nodefaults
-QEMU X.Y.Z monitor - type 'help' for more information
-(qemu) iininfinfoinfo 
info binfo 
blinfo bloinfo 
blocinfo block
-ide0-hd0: TEST_DIR/t.qcow2 (qcow2)
-    Backing file:     TEST_DIR/t.qcow2.orig (chain depth: 1)
-(qemu) qququiquit
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) iininfinfoinfo 
info binfo 
blinfo bloinfo 
blocinfo block
+ide0-hd0: TEST_DIR/t.qcow2 (qcow2)
+    Backing file:     TEST_DIR/t.qcow2.orig (chain depth: 1)
+(qemu) qququiquit
 
 
 === Enable and disable lazy refcounting on the command line, plus some invalid 
values ===
@@ -237,4 +237,48 @@ QEMU_PROG: -drive file=foo:bar: could not open disk image 
foo:bar: Unknown proto
 Testing: -drive file.filename=foo:bar
 QEMU_PROG: -drive file.filename=foo:bar: could not open disk image ide0-hd0: 
Could not open 'foo:bar': No such file or directory
 
+
+=== Snapshot mode ===
+
+wrote 4096/4096 bytes at offset 0
+4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+Testing: -drive file=TEST_DIR/t.qcow2 -snapshot
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) 
qqeqemqemuqemu-qemu-iqemu-ioqemu-io
 qemu-io iqemu-io 
idqemu-io 
ideqemu-io 
ide0qemu-io 
ide0-qemu-io 
ide0-hqemu-io 
ide0-hdqemu-io 
ide0-hd0qemu-io ide0-hd0 
qemu-io ide0-hd0 
"qemu-io ide0-hd0 
"wqemu-io ide0-hd0 
"wrqemu-io 
ide0-hd0 "wri!
 qemu-io ide0-hd0 
"writqemu-io
 ide0-hd0 
"writeqemu-io
 ide0-hd0 "write 
qemu-io
 ide0-hd0 "write 
-qemu-io
 ide0-hd0 "write 
-Pqemu-io
 ide0-hd0 "write -P 
qemu-io
 ide0-hd0 "write -P 
0qemu-io
 ide0-hd0 "write -P 
0xqemu-io
 ide0-hd0 "write -P 
0x2qemu-io
 ide0-hd0 "w!
 rite -P 0x22
[Dqemu-io ide0-hd0 "write -P 0x22 
qemu-io
 ide0-hd0 "write -P 0x22 
0qemu-io
 ide0-hd0 "write -P 0x22 0 
qemu-io
 ide0-hd0 "write -P 0x22 0 
4qemu-io
 ide0-hd0 "write -P 0x22 0 
4kqemu-io
 ide0-hd0 "write -P 0x22 0 4k"
+wrote 4096/4096 bytes at offset 0
+4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+(qemu) qququiquit
+
+Testing: -drive file=TEST_DIR/t.qcow2,snapshot=on
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) 
qqeqemqemuqemu-qemu-iqemu-ioqemu-io
 qemu-io iqemu-io 
idqemu-io 
ideqemu-io 
ide0qemu-io 
ide0-qemu-io 
ide0-hqemu-io 
ide0-hdqemu-io 
ide0-hd0qemu-io ide0-hd0 
qemu-io ide0-hd0 
"qemu-io ide0-hd0 
"wqemu-io ide0-hd0 
"wrqemu-io 
ide0-hd0 "wri!
 qemu-io ide0-hd0 
"writqemu-io
 ide0-hd0 
"writeqemu-io
 ide0-hd0 "write 
qemu-io
 ide0-hd0 "write 
-qemu-io
 ide0-hd0 "write 
-Pqemu-io
 ide0-hd0 "write -P 
qemu-io
 ide0-hd0 "write -P 
0qemu-io
 ide0-hd0 "write -P 
0xqemu-io
 ide0-hd0 "write -P 
0x2qemu-io
 ide0-hd0 "w!
 rite -P 0x22
[Dqemu-io ide0-hd0 "write -P 0x22 
qemu-io
 ide0-hd0 "write -P 0x22 
0qemu-io
 ide0-hd0 "write -P 0x22 0 
qemu-io
 ide0-hd0 "write -P 0x22 0 
4qemu-io
 ide0-hd0 "write -P 0x22 0 
4kqemu-io
 ide0-hd0 "write -P 0x22 0 4k"
+wrote 4096/4096 bytes at offset 0
+4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+(qemu) qququiquit
+
+Testing: -drive file.filename=TEST_DIR/t.qcow2,driver=qcow2,snapshot=on
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) 
qqeqemqemuqemu-qemu-iqemu-ioqemu-io
 qemu-io iqemu-io 
idqemu-io 
ideqemu-io 
ide0qemu-io 
ide0-qemu-io 
ide0-hqemu-io 
ide0-hdqemu-io 
ide0-hd0qemu-io ide0-hd0 
qemu-io ide0-hd0 
"qemu-io ide0-hd0 
"wqemu-io ide0-hd0 
"wrqemu-io 
ide0-hd0 "wri!
 qemu-io ide0-hd0 
"writqemu-io
 ide0-hd0 
"writeqemu-io
 ide0-hd0 "write 
qemu-io
 ide0-hd0 "write 
-qemu-io
 ide0-hd0 "write 
-Pqemu-io
 ide0-hd0 "write -P 
qemu-io
 ide0-hd0 "write -P 
0qemu-io
 ide0-hd0 "write -P 
0xqemu-io
 ide0-hd0 "write -P 
0x2qemu-io
 ide0-hd0 "w!
 rite -P 0x22
[Dqemu-io ide0-hd0 "write -P 0x22 
qemu-io
 ide0-hd0 "write -P 0x22 
0qemu-io
 ide0-hd0 "write -P 0x22 0 
qemu-io
 ide0-hd0 "write -P 0x22 0 
4qemu-io
 ide0-hd0 "write -P 0x22 0 
4kqemu-io
 ide0-hd0 "write -P 0x22 0 4k"
+wrote 4096/4096 bytes at offset 0
+4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+(qemu) qququiquit
+
+Testing: -drive file.filename=TEST_DIR/t.qcow2,driver=qcow2 -snapshot
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) 
qqeqemqemuqemu-qemu-iqemu-ioqemu-io
 qemu-io iqemu-io 
idqemu-io 
ideqemu-io 
ide0qemu-io 
ide0-qemu-io 
ide0-hqemu-io 
ide0-hdqemu-io 
ide0-hd0qemu-io ide0-hd0 
qemu-io ide0-hd0 
"qemu-io ide0-hd0 
"wqemu-io ide0-hd0 
"wrqemu-io 
ide0-hd0 "wri!
 qemu-io ide0-hd0 
"writqemu-io
 ide0-hd0 
"writeqemu-io
 ide0-hd0 "write 
qemu-io
 ide0-hd0 "write 
-qemu-io
 ide0-hd0 "write 
-Pqemu-io
 ide0-hd0 "write -P 
qemu-io
 ide0-hd0 "write -P 
0qemu-io
 ide0-hd0 "write -P 
0xqemu-io
 ide0-hd0 "write -P 
0x2qemu-io
 ide0-hd0 "w!
 rite -P 0x22
[Dqemu-io ide0-hd0 "write -P 0x22 
qemu-io
 ide0-hd0 "write -P 0x22 
0qemu-io
 ide0-hd0 "write -P 0x22 0 
qemu-io
 ide0-hd0 "write -P 0x22 0 
4qemu-io
 ide0-hd0 "write -P 0x22 0 
4kqemu-io
 ide0-hd0 "write -P 0x22 0 4k"
+wrote 4096/4096 bytes at offset 0
+4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+(qemu) qququiquit
+
+read 4096/4096 bytes at offset 0
+4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+Testing: -drive file=TEST_DIR/t.qcow2,snapshot=off
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) 
qqeqemqemuqemu-qemu-iqemu-ioqemu-io
 qemu-io iqemu-io 
idqemu-io 
ideqemu-io 
ide0qemu-io 
ide0-qemu-io 
ide0-hqemu-io 
ide0-hdqemu-io 
ide0-hd0qemu-io ide0-hd0 
qemu-io ide0-hd0 
"qemu-io ide0-hd0 
"wqemu-io ide0-hd0 
"wrqemu-io 
ide0-hd0 "wri!
 qemu-io ide0-hd0 
"writqemu-io
 ide0-hd0 
"writeqemu-io
 ide0-hd0 "write 
qemu-io
 ide0-hd0 "write 
-qemu-io
 ide0-hd0 "write 
-Pqemu-io
 ide0-hd0 "write -P 
qemu-io
 ide0-hd0 "write -P 
0qemu-io
 ide0-hd0 "write -P 
0xqemu-io
 ide0-hd0 "write -P 
0x2qemu-io
 ide0-hd0 "w!
 rite -P 0x22
[Dqemu-io ide0-hd0 "write -P 0x22 
qemu-io
 ide0-hd0 "write -P 0x22 
0qemu-io
 ide0-hd0 "write -P 0x22 0 
qemu-io
 ide0-hd0 "write -P 0x22 0 
4qemu-io
 ide0-hd0 "write -P 0x22 0 
4kqemu-io
 ide0-hd0 "write -P 0x22 0 4k"
+wrote 4096/4096 bytes at offset 0
+4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+(qemu) qququiquit
+
+read 4096/4096 bytes at offset 0
+4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 *** done
-- 
1.8.1.4