From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDGl6-0007jK-T7 for qemu-devel@nongnu.org; Tue, 11 Feb 2014 12:04:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WDGky-0008H4-HM for qemu-devel@nongnu.org; Tue, 11 Feb 2014 12:04:32 -0500 Received: from mail-qa0-x22e.google.com ([2607:f8b0:400d:c00::22e]:59380) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDGky-0008H0-Bi for qemu-devel@nongnu.org; Tue, 11 Feb 2014 12:04:24 -0500 Received: by mail-qa0-f46.google.com with SMTP id ii20so11876029qab.5 for ; Tue, 11 Feb 2014 09:04:24 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 11 Feb 2014 18:03:44 +0100 Message-Id: <1392138233-26407-12-git-send-email-pbonzini@redhat.com> In-Reply-To: <1392138233-26407-1-git-send-email-pbonzini@redhat.com> References: <1392138233-26407-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 11/20] qcow: correctly propagate errors List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com Signed-off-by: Paolo Bonzini --- 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