Skip to contentSkip to conversation

qemu-iotests: Test bdrv_load/save_vmstate

PATCH In review Kevin Wolf 2 participants 4 messages Jul 20, 2009

lore
Share & tools
lore

Kevin Wolf

author
#0 lore raw

cover qemu-iotests: Test bdrv_load/save_vmstate

This tests reading and writing in the VM state area of an image. To be applied on top of the test case 021 patch.

Kevin Wolf (2):
qemu-iotests: Allow spaces in io() operation
qemu-iotests: Test bdrv_load/save_vmstate

 022            |   65 +
 022.out        | 8801 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 common.pattern |   18 +-
 group          |    1 +
 4 files changed, 8876 insertions(+), 9 deletions(-)
 create mode 100755 022
 create mode 100644 022.out
author
#1 lore raw

PATCH 1/2 qemu-iotests: Allow spaces in io() operation

We need to be able to pass "write -b" as an operation to the pattern testing functions. Unfortunately, this contains a space character...

---
 common.pattern |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
common.pattern +9 -9
index 63df923..08e1cda 100644
@@ -46,18 +46,18 @@ function do_io() {
 }
 
 function io_pattern() {
-    do_io $@ | $QEMU_IO $TEST_IMG | _filter_qemu_io
+    do_io "$@" | $QEMU_IO $TEST_IMG | _filter_qemu_io
 }
 
 function io() {
     local start=$2
     local pattern=$(( (start >> 9) % 256 ))
 
-    do_io $@ $pattern | $QEMU_IO $TEST_IMG | _filter_qemu_io
+    do_io "$@" $pattern | $QEMU_IO $TEST_IMG | _filter_qemu_io
 }
 
 function io_zero() {
-    do_io $@ 0 | $QEMU_IO $TEST_IMG | _filter_qemu_io
+    do_io "$@" 0 | $QEMU_IO $TEST_IMG | _filter_qemu_io
 }
 
 function io_test() {
@@ -65,28 +65,28 @@ function io_test() {
     local offset=$2
 
     # Complete clusters (size = 4k)
-    io $op $offset 4096 4096 256
+    io "$op" $offset 4096 4096 256
     offset=$((offset + 256 * 4096))
 
     # From somewhere in the middle to the end of a cluster
-    io $op $((offset + 2048)) 2048 4096 256
+    io "$op" $((offset + 2048)) 2048 4096 256
     offset=$((offset + 256 * 4096))
 
     # From the start to somewhere in the middle of a cluster
-    io $op $offset 2048 4096 256
+    io "$op" $offset 2048 4096 256
     offset=$((offset + 256 * 4096))
 
     # Completely misaligned (and small)
-    io $op $((offset + 1024)) 2048 4096 256
+    io "$op" $((offset + 1024)) 2048 4096 256
     offset=$((offset + 256 * 4096))
 
     # Spanning multiple clusters
-    io $op $((offset + 2048)) 8192 12288 64
+    io "$op" $((offset + 2048)) 8192 12288 64
     offset=$((offset + 64 * 12288))
 
     # Spanning multiple L2 tables
     # L2 table size: 512 clusters of 4k = 2M
-    io $op $((offset + 2048)) 4194304 4999680 8
+    io "$op" $((offset + 2048)) 4194304 4999680 8
     offset=$((offset + 8 * 4999680))
 
     if false; then
Signature · 1 line
1.6.0.6
#2 lore raw
In reply to Kevin Wolf
Quoted 2 lines · Kevin Wolf

This tests reading and writing in the VM state area of an image. To be applied on top of the test case 021 patch.

Thanks, I've put these two in. Any chance you could send an incremental patch that expains why the two magic offsets are choosen?

author
#3 lore raw
Quoted 6 lines · Christoph Hellwig
Quoted 2 lines · Kevin Wolf

This tests reading and writing in the VM state area of an image. To be applied on top of the test case 021 patch.

Thanks, I've put these two in. Any chance you could send an incremental patch that expains why the two magic offsets are choosen?

Hm, actually I think there is no reason any more. It used to be some offset after the end of the image (for bdrv_put_buffer), but now that the VM state has its own offsets starting at 0, it could just be the usual 0 and 4G.

Kevin