summaryrefslogtreecommitdiffstats
path: root/tests/qemu-iotests
diff options
context:
space:
mode:
authorChunyan Liu2014-06-05 11:20:51 +0200
committerStefan Hajnoczi2014-06-16 11:23:20 +0200
commit83d0521a1e35989b0cb7235aef48455fedda3ca4 (patch)
treeb500cdb1603182b7249a781712a1f058820d5b1b /tests/qemu-iotests
parentQemuOpts: check NULL input for qemu_opts_del (diff)
downloadqemu-83d0521a1e35989b0cb7235aef48455fedda3ca4.tar.gz
qemu-83d0521a1e35989b0cb7235aef48455fedda3ca4.tar.xz
qemu-83d0521a1e35989b0cb7235aef48455fedda3ca4.zip
change block layer to support both QemuOpts and QEMUOptionParamter
Change block layer to support both QemuOpts and QEMUOptionParameter. After this patch, it will change backend drivers one by one. At the end, QEMUOptionParameter will be removed and only QemuOpts is kept. Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com> Signed-off-by: Chunyan Liu <cyliu@suse.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'tests/qemu-iotests')
-rw-r--r--tests/qemu-iotests/049.out2
-rw-r--r--tests/qemu-iotests/061.out2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/qemu-iotests/049.out b/tests/qemu-iotests/049.out
index ceb23289fd..71ca44d76b 100644
--- a/tests/qemu-iotests/049.out
+++ b/tests/qemu-iotests/049.out
@@ -120,7 +120,7 @@ qemu-img: kilobytes, megabytes, gigabytes, terabytes, petabytes and exabytes.
qemu-img create -f qcow2 -o size=foobar TEST_DIR/t.qcow2
qemu-img: Parameter 'size' expects a size
-qemu-img: TEST_DIR/t.qcow2: Invalid options for file format 'qcow2'.
+qemu-img: TEST_DIR/t.qcow2: Invalid options for file format 'qcow2'
== Check correct interpretation of suffixes for cluster size ==
diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out
index 4027e0077e..e3724700b9 100644
--- a/tests/qemu-iotests/061.out
+++ b/tests/qemu-iotests/061.out
@@ -281,7 +281,7 @@ Lazy refcounts only supported with compatibility level 1.1 and above (use compat
qemu-img: Error while amending options: Invalid argument
Unknown compatibility level 0.42.
qemu-img: Error while amending options: Invalid argument
-Unknown option 'foo'
+qemu-img: Invalid parameter 'foo'
qemu-img: Invalid options for file format 'qcow2'
Changing the cluster size is not supported.
qemu-img: Error while amending options: Operation not supported