From patchwork Mon Oct 14 21:52:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 283482 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C65632C010A for ; Tue, 15 Oct 2013 16:54:47 +1100 (EST) Received: from localhost ([::1]:39888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VVxaf-0005fQ-Ly for incoming@patchwork.ozlabs.org; Tue, 15 Oct 2013 01:54:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46208) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VVxYy-0003R9-6t for qemu-devel@nongnu.org; Tue, 15 Oct 2013 01:53:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VVxYm-0003rr-6a for qemu-devel@nongnu.org; Tue, 15 Oct 2013 01:53:00 -0400 Received: from e28smtp08.in.ibm.com ([122.248.162.8]:39825) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VVxYl-0003rQ-Iq for qemu-devel@nongnu.org; Tue, 15 Oct 2013 01:52:48 -0400 Received: from /spool/local by e28smtp08.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 15 Oct 2013 11:22:45 +0530 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp08.in.ibm.com (192.168.1.138) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 15 Oct 2013 11:22:42 +0530 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 2B5FF1258053 for ; Tue, 15 Oct 2013 11:23:08 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r9F5tMaR37027948 for ; Tue, 15 Oct 2013 11:25:22 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r9F5qe9D000630 for ; Tue, 15 Oct 2013 11:22:40 +0530 Received: from RH64wenchao ([9.181.129.59]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id r9F5qZHD000390; Tue, 15 Oct 2013 11:22:39 +0530 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Tue, 15 Oct 2013 05:52:29 +0800 Message-Id: <1381787553-12497-3-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1381787553-12497-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1381787553-12497-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13101505-2000-0000-0000-00000E1C68AB X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.8 Cc: kwolf@redhat.com, stefanha@gmail.com, mreitz@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V4 2/6] qcow2: add error message in qcow2_write_snapshots() 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 The function still returns int since qcow2_snapshot_delete() will return the number. Signed-off-by: Wenchao Xia --- block/qcow2-snapshot.c | 48 ++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 42 insertions(+), 6 deletions(-) diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c index b373f9a..4bd494b 100644 --- a/block/qcow2-snapshot.c +++ b/block/qcow2-snapshot.c @@ -152,7 +152,7 @@ fail: } /* add at the end of the file a new list of snapshots */ -static int qcow2_write_snapshots(BlockDriverState *bs) +static int qcow2_write_snapshots(BlockDriverState *bs, Error **errp) { BDRVQcowState *s = bs->opaque; QCowSnapshot *sn; @@ -183,10 +183,18 @@ static int qcow2_write_snapshots(BlockDriverState *bs) offset = snapshots_offset; if (offset < 0) { ret = offset; + error_setg(errp, + "Failed in allocation of cluster for snapshot list: " + "%d (%s)", + ret, strerror(-ret)); goto fail; } ret = bdrv_flush(bs); if (ret < 0) { + error_setg(errp, + "Failed in flush after snapshot list cluster allocation: " + "%d (%s)", + ret, strerror(-ret)); goto fail; } @@ -194,6 +202,10 @@ static int qcow2_write_snapshots(BlockDriverState *bs) * must indeed be completely free */ ret = qcow2_pre_write_overlap_check(bs, 0, offset, snapshots_size); if (ret < 0) { + error_setg(errp, + "Failed in overlap check for snapshot list cluster at %" + PRIi64 " with size %d: %d (%s)", + offset, snapshots_size, ret, strerror(-ret)); goto fail; } @@ -227,24 +239,40 @@ static int qcow2_write_snapshots(BlockDriverState *bs) ret = bdrv_pwrite(bs->file, offset, &h, sizeof(h)); if (ret < 0) { + error_setg(errp, + "Failed in write of snapshot header at %" + PRIi64 " with size %" PRIu64 ": %d (%s)", + offset, sizeof(h), ret, strerror(-ret)); goto fail; } offset += sizeof(h); ret = bdrv_pwrite(bs->file, offset, &extra, sizeof(extra)); if (ret < 0) { + error_setg(errp, + "Failed in write of extra snapshot data at %" + PRIi64 " with size %" PRIu64 ": %d (%s)", + offset, sizeof(extra), ret, strerror(-ret)); goto fail; } offset += sizeof(extra); ret = bdrv_pwrite(bs->file, offset, sn->id_str, id_str_size); if (ret < 0) { + error_setg(errp, + "Failed in write of snapshot id string at %" + PRIi64 " with size %d: %d (%s)", + offset, id_str_size, ret, strerror(-ret)); goto fail; } offset += id_str_size; ret = bdrv_pwrite(bs->file, offset, sn->name, name_size); if (ret < 0) { + error_setg(errp, + "Failed in write of snapshot name string at %" + PRIi64 " with size %d: %d (%s)", + offset, name_size, ret, strerror(-ret)); goto fail; } offset += name_size; @@ -256,6 +284,9 @@ static int qcow2_write_snapshots(BlockDriverState *bs) */ ret = bdrv_flush(bs); if (ret < 0) { + error_setg(errp, + "Failed in flush after snapshot list update: %d (%s)", + ret, strerror(-ret)); goto fail; } @@ -268,6 +299,11 @@ static int qcow2_write_snapshots(BlockDriverState *bs) ret = bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, nb_snapshots), &header_data, sizeof(header_data)); if (ret < 0) { + error_setg(errp, + "Failed in update of image header at %" + PRIi64 " with size %" PRIu64 ":%d (%s)", + offsetof(QCowHeader, nb_snapshots), sizeof(header_data), + ret, strerror(-ret)); goto fail; } @@ -283,6 +319,9 @@ fail: qcow2_free_clusters(bs, snapshots_offset, snapshots_size, QCOW2_DISCARD_ALWAYS); } + if (errp) { + g_assert(error_is_set(errp)); + } return ret; } @@ -446,10 +485,8 @@ void qcow2_snapshot_create(BlockDriverState *bs, s->snapshots = new_snapshot_list; s->snapshots[s->nb_snapshots++] = *sn; - ret = qcow2_write_snapshots(bs); + ret = qcow2_write_snapshots(bs, errp); if (ret < 0) { - /* Following line will be replaced with more detailed error later */ - error_setg(errp, "Failed in write of snapshot"); g_free(s->snapshots); s->snapshots = old_snapshot_list; s->nb_snapshots--; @@ -623,9 +660,8 @@ int qcow2_snapshot_delete(BlockDriverState *bs, s->snapshots + snapshot_index + 1, (s->nb_snapshots - snapshot_index - 1) * sizeof(sn)); s->nb_snapshots--; - ret = qcow2_write_snapshots(bs); + ret = qcow2_write_snapshots(bs, errp); if (ret < 0) { - error_setg(errp, "Failed to remove snapshot from snapshot list"); return ret; }