[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 11/20] qcow: correctly propagate errors
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 11/20] qcow: correctly propagate errors |
Date: |
Tue, 11 Feb 2014 18:03:44 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
block/qcow.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/block/qcow.c b/block/qcow.c
index 948b0c5..23bc691 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -119,17 +119,19 @@ static int qcow_open(BlockDriverState *bs, QDict
*options, int flags,
if (header.version != QCOW_VERSION) {
char version[64];
snprintf(version, sizeof(version), "QCOW version %d", header.version);
- qerror_report(QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,
- bs->device_name, "qcow", version);
+ error_set(errp, QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,
+ bs->device_name, "qcow", version);
ret = -ENOTSUP;
goto fail;
}
if (header.size <= 1 || header.cluster_bits < 9) {
+ error_setg(errp, "invalid value in qcow header");
ret = -EINVAL;
goto fail;
}
if (header.crypt_method > QCOW_CRYPT_AES) {
+ error_setg(errp, "invalid encryption method in qcow header");
ret = -EINVAL;
goto fail;
}
@@ -668,7 +670,6 @@ static int qcow_create(const char *filename,
QEMUOptionParameter *options,
int64_t total_size = 0;
const char *backing_file = NULL;
int flags = 0;
- Error *local_err = NULL;
int ret;
BlockDriverState *qcow_bs;
@@ -684,18 +685,13 @@ static int qcow_create(const char *filename,
QEMUOptionParameter *options,
options++;
}
- ret = bdrv_create_file(filename, options, &local_err);
+ ret = bdrv_create_file(filename, options, errp);
if (ret < 0) {
- qerror_report_err(local_err);
- error_free(local_err);
return ret;
}
- ret = bdrv_file_open(&qcow_bs, filename, NULL, NULL, BDRV_O_RDWR,
- &local_err);
+ ret = bdrv_file_open(&qcow_bs, filename, NULL, NULL, BDRV_O_RDWR, errp);
if (ret < 0) {
- qerror_report_err(local_err);
- error_free(local_err);
return ret;
}
--
1.8.5.3
- Re: [Qemu-devel] [PATCH v2 09/20] cow: correctly propagate errors, (continued)
- Re: [Qemu-devel] [PATCH v2 09/20] cow: correctly propagate errors, Kevin Wolf, 2014/02/17
- Re: [Qemu-devel] [PATCH v2 09/20] cow: correctly propagate errors, Markus Armbruster, 2014/02/17
- Re: [Qemu-devel] [PATCH v2 09/20] cow: correctly propagate errors, Fam Zheng, 2014/02/17
- Re: [Qemu-devel] [PATCH v2 09/20] cow: correctly propagate errors, Paolo Bonzini, 2014/02/14
- Re: [Qemu-devel] [PATCH v2 09/20] cow: correctly propagate errors, Kevin Wolf, 2014/02/14
- Re: [Qemu-devel] [PATCH v2 09/20] cow: correctly propagate errors, Paolo Bonzini, 2014/02/14
[Qemu-devel] [PATCH v2 11/20] qcow: correctly propagate errors,
Paolo Bonzini <=
[Qemu-devel] [PATCH v2 12/20] qed: correctly propagate errors, Paolo Bonzini, 2014/02/11
[Qemu-devel] [PATCH v2 13/20] vhdx: correctly propagate errors, Paolo Bonzini, 2014/02/11
[Qemu-devel] [PATCH v2 14/20] vvfat: correctly propagate errors, Paolo Bonzini, 2014/02/11
[Qemu-devel] [PATCH v2 15/20] vmdk: extract vmdk_read_desc, Paolo Bonzini, 2014/02/11
[Qemu-devel] [PATCH v2 16/20] vmdk: push vmdk_read_desc up to caller, Paolo Bonzini, 2014/02/11
[Qemu-devel] [PATCH v2 17/20] vmdk: do not try opening a file as both image and descriptor, Paolo Bonzini, 2014/02/11
[Qemu-devel] [PATCH v2 18/20] vmdk: correctly propagate errors, Paolo Bonzini, 2014/02/11
[Qemu-devel] [PATCH v2 19/20] block: do not abuse EMEDIUMTYPE, Paolo Bonzini, 2014/02/11
[Qemu-devel] [PATCH v2 20/20] vdi: say why an image is bad, Paolo Bonzini, 2014/02/11