From patchwork Tue Feb 11 17:03:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 319366 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9E6562C00A5 for ; Wed, 12 Feb 2014 04:37:35 +1100 (EST) Received: from localhost ([::1]:34939 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDGpO-00068m-DY for incoming@patchwork.ozlabs.org; Tue, 11 Feb 2014 12:08:58 -0500 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=uxPn/SdtFIxcnMKlfhnEAAfWCSwFNOIXLyRouhHCZTI=; b=IOt5YgeWrLMT1UAMgyEJs7c3PkA+un943xBb1IRwfWAJYuobGEtuMFOhVHyO7woMRh cp05yTqEVveE5/j/QJy00E9805JLTJELU/0z9cyuQOZ14DLkjVQrd73SUdFnBK+qrPEf 343IWdAyAcybPGa9hVgHaiyAEbsjwHS2g9w8vt6Y+50Qr0DYCaBImys0BKtTyN382Xht r3IhO5OVnCDz3Pel2hwUdx7HcDqGRChx0biZgnw0d7QwMTnGIfN54khMmCQd05nAU+P+ Vll9z/OfZ6aMxghk4x1gclzYCbVo4cpyPUTWq3GYwWuht/6lS887NchZfyEY970mlPdQ Uacg== X-Received: by 10.140.92.65 with SMTP id a59mr55169977qge.34.1392138263989; Tue, 11 Feb 2014 09:04:23 -0800 (PST) Received: from yakj.usersys.redhat.com (nat-pool-brq-u.redhat.com. [209.132.186.35]) by mx.google.com with ESMTPSA id l40sm29527992qga.13.2014.02.11.09.04.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Feb 2014 09:04:23 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 11 Feb 2014 18:03:44 +0100 Message-Id: <1392138233-26407-12-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1392138233-26407-1-git-send-email-pbonzini@redhat.com> References: <1392138233-26407-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c00::22e Cc: kwolf@redhat.com, famz@redhat.com Subject: [Qemu-devel] [PATCH v2 11/20] qcow: correctly propagate errors X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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; }