[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 19/26] qcow2: Use error_report() in qcow2_amend_o
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v5 19/26] qcow2: Use error_report() in qcow2_amend_options() |
Date: |
Mon, 15 Dec 2014 13:50:50 +0100 |
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
---
block/qcow2.c | 14 ++++++--------
tests/qemu-iotests/061.out | 14 +++++++-------
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index dfdab18..c174a23 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -2696,11 +2696,11 @@ static int qcow2_amend_options(BlockDriverState *bs,
QemuOpts *opts,
} else if (!strcmp(compat, "1.1")) {
new_version = 3;
} else {
- fprintf(stderr, "Unknown compatibility level %s.\n", compat);
+ error_report("Unknown compatibility level %s", compat);
return -EINVAL;
}
} else if (!strcmp(desc->name, BLOCK_OPT_PREALLOC)) {
- fprintf(stderr, "Cannot change preallocation mode.\n");
+ error_report("Cannot change preallocation mode");
return -ENOTSUP;
} else if (!strcmp(desc->name, BLOCK_OPT_SIZE)) {
new_size = qemu_opt_get_size(opts, BLOCK_OPT_SIZE, 0);
@@ -2712,16 +2712,14 @@ static int qcow2_amend_options(BlockDriverState *bs,
QemuOpts *opts,
encrypt = qemu_opt_get_bool(opts, BLOCK_OPT_ENCRYPT,
s->crypt_method);
if (encrypt != !!s->crypt_method) {
- fprintf(stderr, "Changing the encryption flag is not "
- "supported.\n");
+ error_report("Changing the encryption flag is not supported");
return -ENOTSUP;
}
} else if (!strcmp(desc->name, BLOCK_OPT_CLUSTER_SIZE)) {
cluster_size = qemu_opt_get_size(opts, BLOCK_OPT_CLUSTER_SIZE,
cluster_size);
if (cluster_size != s->cluster_size) {
- fprintf(stderr, "Changing the cluster size is not "
- "supported.\n");
+ error_report("Changing the cluster size is not supported");
return -ENOTSUP;
}
} else if (!strcmp(desc->name, BLOCK_OPT_LAZY_REFCOUNTS)) {
@@ -2767,8 +2765,8 @@ static int qcow2_amend_options(BlockDriverState *bs,
QemuOpts *opts,
if (s->use_lazy_refcounts != lazy_refcounts) {
if (lazy_refcounts) {
if (s->qcow_version < 3) {
- fprintf(stderr, "Lazy refcounts only supported with
compatibility "
- "level 1.1 and above (use compat=1.1 or greater)\n");
+ error_report("Lazy refcounts only supported with compatibility
"
+ "level 1.1 and above (use compat=1.1 or
greater)");
return -EINVAL;
}
s->compatible_features |= QCOW2_COMPAT_LAZY_REFCOUNTS;
diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out
index e70f983..2cd9eee 100644
--- a/tests/qemu-iotests/061.out
+++ b/tests/qemu-iotests/061.out
@@ -281,19 +281,19 @@ No errors were found on the image.
=== Testing invalid configurations ===
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-Lazy refcounts only supported with compatibility level 1.1 and above (use
compat=1.1 or greater)
+qemu-img: Lazy refcounts only supported with compatibility level 1.1 and above
(use compat=1.1 or greater)
qemu-img: Error while amending options: Invalid argument
-Lazy refcounts only supported with compatibility level 1.1 and above (use
compat=1.1 or greater)
+qemu-img: Lazy refcounts only supported with compatibility level 1.1 and above
(use compat=1.1 or greater)
qemu-img: Error while amending options: Invalid argument
-Unknown compatibility level 0.42.
+qemu-img: Unknown compatibility level 0.42
qemu-img: Error while amending options: Invalid argument
qemu-img: Invalid parameter 'foo'
qemu-img: Invalid options for file format 'qcow2'
-Changing the cluster size is not supported.
+qemu-img: Changing the cluster size is not supported
qemu-img: Error while amending options: Operation not supported
-Changing the encryption flag is not supported.
+qemu-img: Changing the encryption flag is not supported
qemu-img: Error while amending options: Operation not supported
-Cannot change preallocation mode.
+qemu-img: Cannot change preallocation mode
qemu-img: Error while amending options: Operation not supported
=== Testing correct handling of unset value ===
@@ -301,7 +301,7 @@ qemu-img: Error while amending options: Operation not
supported
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
Should work:
Should not work:
-Changing the cluster size is not supported.
+qemu-img: Changing the cluster size is not supported
qemu-img: Error while amending options: Operation not supported
=== Testing zero expansion on inactive clusters ===
--
1.9.3
- [Qemu-devel] [PATCH v5 09/26] qcow2: Helper for refcount array reallocation, (continued)
- [Qemu-devel] [PATCH v5 09/26] qcow2: Helper for refcount array reallocation, Max Reitz, 2014/12/15
- [Qemu-devel] [PATCH v5 10/26] qcow2: Helper function for refcount modification, Max Reitz, 2014/12/15
- [Qemu-devel] [PATCH v5 11/26] qcow2: More helpers for refcount modification, Max Reitz, 2014/12/15
- [Qemu-devel] [PATCH v5 12/26] qcow2: Open images with refcount order != 4, Max Reitz, 2014/12/15
- [Qemu-devel] [PATCH v5 13/26] qcow2: refcount_order parameter for qcow2_create2, Max Reitz, 2014/12/15
- [Qemu-devel] [PATCH v5 14/26] qcow2: Use symbolic macros in qcow2_amend_options, Max Reitz, 2014/12/15
- [Qemu-devel] [PATCH v5 15/26] iotests: Prepare for refcount_bits option, Max Reitz, 2014/12/15
- [Qemu-devel] [PATCH v5 16/26] qcow2: Allow creation with refcount order != 4, Max Reitz, 2014/12/15
- [Qemu-devel] [PATCH v5 17/26] progress: Allow regressing progress, Max Reitz, 2014/12/15
- [Qemu-devel] [PATCH v5 18/26] block: Add opaque value to the amend CB, Max Reitz, 2014/12/15
- [Qemu-devel] [PATCH v5 19/26] qcow2: Use error_report() in qcow2_amend_options(),
Max Reitz <=
- [Qemu-devel] [PATCH v5 20/26] qcow2: Use abort() instead of assert(false), Max Reitz, 2014/12/15
- [Qemu-devel] [PATCH v5 21/26] qcow2: Split upgrade/downgrade paths for amend, Max Reitz, 2014/12/15
- [Qemu-devel] [PATCH v5 24/26] qcow2: Invoke refcount order amendment function, Max Reitz, 2014/12/15
- [Qemu-devel] [PATCH v5 22/26] qcow2: Use intermediate helper CB for amend, Max Reitz, 2014/12/15
- [Qemu-devel] [PATCH v5 25/26] qcow2: Point to amend function in check, Max Reitz, 2014/12/15
- [Qemu-devel] [PATCH v5 23/26] qcow2: Add function for refcount order amendment, Max Reitz, 2014/12/15
- [Qemu-devel] [PATCH v5 26/26] iotests: Add test for different refcount widths, Max Reitz, 2014/12/15