From patchwork Tue Feb 11 19:23:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 319131 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 A2C292C00A8 for ; Tue, 11 Feb 2014 17:22:50 +1100 (EST) Received: from localhost ([::1]:59698 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WD6k4-0001pV-5l for incoming@patchwork.ozlabs.org; Tue, 11 Feb 2014 01:22:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WD6jF-0001ot-SY for qemu-devel@nongnu.org; Tue, 11 Feb 2014 01:22:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WD6j4-0005CD-Vp for qemu-devel@nongnu.org; Tue, 11 Feb 2014 01:21:57 -0500 Received: from e28smtp05.in.ibm.com ([122.248.162.5]:54952) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WD6j3-0005BV-OQ for qemu-devel@nongnu.org; Tue, 11 Feb 2014 01:21:46 -0500 Received: from /spool/local by e28smtp05.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 11 Feb 2014 11:51:42 +0530 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp05.in.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 11 Feb 2014 11:51:41 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 30CD31258055 for ; Tue, 11 Feb 2014 11:53:34 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s1B6LggY7668030 for ; Tue, 11 Feb 2014 11:51:42 +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 s1B6LeNJ025463 for ; Tue, 11 Feb 2014 11:51: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 s1B6LbNJ025270; Tue, 11 Feb 2014 11:51:39 +0530 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Tue, 11 Feb 2014 14:23:01 -0500 Message-Id: <1392146588-12120-2-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1392146588-12120-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1392146588-12120-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14021106-8256-0000-0000-00000B675320 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.5 Cc: kwolf@redhat.com, peter.crosthwaite@xilinx.com, jcody@redhat.com, mreitz@redhat.com, stefanha@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V11 1/8] snapshot: add parameter *errp in snapshot create 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 return value is only used for error report before this patch, so change the function protype to return void. Signed-off-by: Wenchao Xia Reviewed-by: Max Reitz --- block/qcow2-snapshot.c | 30 +++++++++++++++++++++++++----- block/qcow2.h | 4 +++- block/rbd.c | 19 ++++++++++--------- block/sheepdog.c | 28 ++++++++++++++++++---------- block/snapshot.c | 19 +++++++++++++------ blockdev.c | 10 ++++------ include/block/block_int.h | 5 +++-- include/block/snapshot.h | 5 +++-- qemu-img.c | 10 ++++++---- savevm.c | 12 ++++++++---- 10 files changed, 93 insertions(+), 49 deletions(-) diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c index ad8bf3d..8cac42d 100644 --- a/block/qcow2-snapshot.c +++ b/block/qcow2-snapshot.c @@ -347,7 +347,9 @@ static int find_snapshot_by_id_or_name(BlockDriverState *bs, } /* if no id is provided, a new one is constructed */ -int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) +void qcow2_snapshot_create(BlockDriverState *bs, + QEMUSnapshotInfo *sn_info, + Error **errp) { BDRVQcowState *s = bs->opaque; QCowSnapshot *new_snapshot_list = NULL; @@ -366,7 +368,8 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) /* Check that the ID is unique */ if (find_snapshot_by_id_and_name(bs, sn_info->id_str, NULL) >= 0) { - return -EEXIST; + error_setg(errp, "Snapshot with id %s already exists", sn_info->id_str); + return; } /* Populate sn with passed data */ @@ -382,7 +385,8 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) /* Allocate the L1 table of the snapshot and copy the current one there. */ l1_table_offset = qcow2_alloc_clusters(bs, s->l1_size * sizeof(uint64_t)); if (l1_table_offset < 0) { - ret = l1_table_offset; + error_setg_errno(errp, -l1_table_offset, + "Failed in allocation of snapshot L1 table"); goto fail; } @@ -397,12 +401,22 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) ret = qcow2_pre_write_overlap_check(bs, 0, sn->l1_table_offset, s->l1_size * sizeof(uint64_t)); if (ret < 0) { + error_setg_errno(errp, -ret, + "Failed in overlap check for snapshot L1 table at %" + PRIu64 " with size %" PRIu64, + sn->l1_table_offset, + (uint64_t)(s->l1_size * sizeof(uint64_t))); goto fail; } ret = bdrv_pwrite(bs->file, sn->l1_table_offset, l1_table, s->l1_size * sizeof(uint64_t)); if (ret < 0) { + error_setg_errno(errp, -ret, + "Failed in update of snapshot L1 table at %" + PRIu64 " with size %" PRIu64, + sn->l1_table_offset, + (uint64_t)(s->l1_size * sizeof(uint64_t))); goto fail; } @@ -416,6 +430,10 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) */ ret = qcow2_update_snapshot_refcount(bs, s->l1_table_offset, s->l1_size, 1); if (ret < 0) { + error_setg_errno(errp, -ret, + "Failed in update of refcount for snapshot at %" + PRIu64 " with size %d", + s->l1_table_offset, s->l1_size); goto fail; } @@ -431,6 +449,8 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) ret = qcow2_write_snapshots(bs); 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--; @@ -452,14 +472,14 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) qcow2_check_refcounts(bs, &result, 0); } #endif - return 0; + return; fail: g_free(sn->id_str); g_free(sn->name); g_free(l1_table); - return ret; + return; } /* copy the snapshot 'snapshot_name' into the current disk image */ diff --git a/block/qcow2.h b/block/qcow2.h index b5b7d13..f8390ed 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -481,7 +481,9 @@ int qcow2_zero_clusters(BlockDriverState *bs, uint64_t offset, int nb_sectors); int qcow2_expand_zero_clusters(BlockDriverState *bs); /* qcow2-snapshot.c functions */ -int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info); +void qcow2_snapshot_create(BlockDriverState *bs, + QEMUSnapshotInfo *sn_info, + Error **errp); int qcow2_snapshot_goto(BlockDriverState *bs, const char *snapshot_id); int qcow2_snapshot_delete(BlockDriverState *bs, const char *snapshot_id, diff --git a/block/rbd.c b/block/rbd.c index 121fae2..1ae903e 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -774,14 +774,16 @@ static int qemu_rbd_truncate(BlockDriverState *bs, int64_t offset) return 0; } -static int qemu_rbd_snap_create(BlockDriverState *bs, - QEMUSnapshotInfo *sn_info) +static void qemu_rbd_snap_create(BlockDriverState *bs, + QEMUSnapshotInfo *sn_info, + Error **errp) { BDRVRBDState *s = bs->opaque; int r; if (sn_info->name[0] == '\0') { - return -EINVAL; /* we need a name for rbd snapshots */ + error_setg(errp, "rbd snapshot requires a valid name"); + return; /* we need a name for rbd snapshots */ } /* @@ -790,20 +792,19 @@ static int qemu_rbd_snap_create(BlockDriverState *bs, */ if (sn_info->id_str[0] != '\0' && strcmp(sn_info->id_str, sn_info->name) != 0) { - return -EINVAL; + error_setg(errp, "rbd snapshot id should be empty or equal to name"); + return; } if (strlen(sn_info->name) >= sizeof(sn_info->id_str)) { - return -ERANGE; + error_setg(errp, "rbd snapshot name is too long"); + return; } r = rbd_snap_create(s->image, sn_info->name); if (r < 0) { - error_report("failed to create snap: %s", strerror(-r)); - return r; + error_setg_errno(errp, -r, "Failed to create snapshot"); } - - return 0; } static int qemu_rbd_snap_remove(BlockDriverState *bs, diff --git a/block/sheepdog.c b/block/sheepdog.c index 672b9c9..076869c 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -2117,7 +2117,9 @@ static int coroutine_fn sd_co_flush_to_disk(BlockDriverState *bs) return acb->ret; } -static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) +static void sd_snapshot_create(BlockDriverState *bs, + QEMUSnapshotInfo *sn_info, + Error **errp) { BDRVSheepdogState *s = bs->opaque; int ret, fd; @@ -2130,10 +2132,10 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) s->name, sn_info->vm_state_size, s->is_snapshot); if (s->is_snapshot) { - error_report("You can't create a snapshot of a snapshot VDI, " - "%s (%" PRIu32 ").", s->name, s->inode.vdi_id); + error_setg(errp, "You can't create a snapshot of a snapshot VDI, " + "%s (%" PRIu32 ")", s->name, s->inode.vdi_id); - return -EINVAL; + return; } DPRINTF("%s %s\n", sn_info->name, sn_info->id_str); @@ -2150,21 +2152,24 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) /* refresh inode. */ fd = connect_to_sdog(s); if (fd < 0) { - ret = fd; + error_setg_errno(errp, -fd, "Failed to connect"); goto cleanup; } ret = write_object(fd, (char *)&s->inode, vid_to_vdi_oid(s->inode.vdi_id), s->inode.nr_copies, datalen, 0, false, s->cache_flags); if (ret < 0) { - error_report("failed to write snapshot's inode."); + error_setg_errno(errp, -ret, "Failed to write snapshot's inode"); goto cleanup; } ret = do_sd_create(s, &new_vid, 1); if (ret < 0) { - error_report("failed to create inode for snapshot. %s", - strerror(errno)); + error_setg(errp, + "Failed to create inode for snapshot: %d (%s), " + "errno %d (%s)", + ret, strerror(-ret), + errno, strerror(errno)); goto cleanup; } @@ -2174,7 +2179,10 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) s->inode.nr_copies, datalen, 0, s->cache_flags); if (ret < 0) { - error_report("failed to read new inode info. %s", strerror(errno)); + error_setg(errp, "Failed to read new inode info: %d (%s), " + "errno %d (%s)", + ret, strerror(-ret), + errno, strerror(errno)); goto cleanup; } @@ -2184,7 +2192,7 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) cleanup: closesocket(fd); - return ret; + return; } /* diff --git a/block/snapshot.c b/block/snapshot.c index 9047f8d..b2a49e7 100644 --- a/block/snapshot.c +++ b/block/snapshot.c @@ -156,20 +156,27 @@ int bdrv_can_snapshot(BlockDriverState *bs) return 1; } -int bdrv_snapshot_create(BlockDriverState *bs, - QEMUSnapshotInfo *sn_info) +void bdrv_snapshot_create(BlockDriverState *bs, + QEMUSnapshotInfo *sn_info, + Error **errp) { BlockDriver *drv = bs->drv; if (!drv) { - return -ENOMEDIUM; + error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, bdrv_get_device_name(bs)); + return; } if (drv->bdrv_snapshot_create) { - return drv->bdrv_snapshot_create(bs, sn_info); + drv->bdrv_snapshot_create(bs, sn_info, errp); + return; } if (bs->file) { - return bdrv_snapshot_create(bs->file, sn_info); + bdrv_snapshot_create(bs->file, sn_info, errp); + return; } - return -ENOTSUP; + + error_set(errp, QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED, + drv->format_name, bdrv_get_device_name(bs), + "internal snapshot creation"); } int bdrv_snapshot_goto(BlockDriverState *bs, diff --git a/blockdev.c b/blockdev.c index 36ceece..de85a78 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1095,7 +1095,7 @@ static void internal_snapshot_prepare(BlkTransactionState *common, qemu_timeval tv; BlockdevSnapshotInternal *internal; InternalSnapshotState *state; - int ret1; + Error *local_err = NULL; g_assert(common->action->kind == TRANSACTION_ACTION_KIND_BLOCKDEV_SNAPSHOT_INTERNAL_SYNC); @@ -1153,11 +1153,9 @@ static void internal_snapshot_prepare(BlkTransactionState *common, sn->date_nsec = tv.tv_usec * 1000; sn->vm_clock_nsec = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); - ret1 = bdrv_snapshot_create(bs, sn); - if (ret1 < 0) { - error_setg_errno(errp, -ret1, - "Failed to create snapshot '%s' on device '%s'", - name, device); + bdrv_snapshot_create(bs, sn, &local_err); + if (error_is_set(&local_err)) { + error_propagate(errp, local_err); return; } diff --git a/include/block/block_int.h b/include/block/block_int.h index 0bcf1c9..de0e0a4 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -178,8 +178,9 @@ struct BlockDriver { int (*bdrv_write_compressed)(BlockDriverState *bs, int64_t sector_num, const uint8_t *buf, int nb_sectors); - int (*bdrv_snapshot_create)(BlockDriverState *bs, - QEMUSnapshotInfo *sn_info); + void (*bdrv_snapshot_create)(BlockDriverState *bs, + QEMUSnapshotInfo *sn_info, + Error **errp); int (*bdrv_snapshot_goto)(BlockDriverState *bs, const char *snapshot_id); int (*bdrv_snapshot_delete)(BlockDriverState *bs, diff --git a/include/block/snapshot.h b/include/block/snapshot.h index 770d9bb..5f286da 100644 --- a/include/block/snapshot.h +++ b/include/block/snapshot.h @@ -55,8 +55,9 @@ bool bdrv_snapshot_find_by_id_and_name(BlockDriverState *bs, QEMUSnapshotInfo *sn_info, Error **errp); int bdrv_can_snapshot(BlockDriverState *bs); -int bdrv_snapshot_create(BlockDriverState *bs, - QEMUSnapshotInfo *sn_info); +void bdrv_snapshot_create(BlockDriverState *bs, + QEMUSnapshotInfo *sn_info, + Error **errp); int bdrv_snapshot_goto(BlockDriverState *bs, const char *snapshot_id); int bdrv_snapshot_delete(BlockDriverState *bs, diff --git a/qemu-img.c b/qemu-img.c index c989850..2c7a9f9 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -2167,10 +2167,12 @@ static int img_snapshot(int argc, char **argv) sn.date_sec = tv.tv_sec; sn.date_nsec = tv.tv_usec * 1000; - ret = bdrv_snapshot_create(bs, &sn); - if (ret) { - error_report("Could not create snapshot '%s': %d (%s)", - snapshot_name, ret, strerror(-ret)); + bdrv_snapshot_create(bs, &sn, &err); + if (error_is_set(&err)) { + error_report("Could not create snapshot '%s': %s", + snapshot_name, error_get_pretty(err)); + error_free(err); + ret = 1; } break; diff --git a/savevm.c b/savevm.c index a7dbe18..a019c1c 100644 --- a/savevm.c +++ b/savevm.c @@ -906,6 +906,7 @@ void do_savevm(Monitor *mon, const QDict *qdict) qemu_timeval tv; struct tm tm; const char *name = qdict_get_try_str(qdict, "name"); + Error *err = NULL; /* Verify if there is a device that doesn't support snapshots and is writable */ bs = NULL; @@ -979,10 +980,13 @@ void do_savevm(Monitor *mon, const QDict *qdict) if (bdrv_can_snapshot(bs1)) { /* Write VM state size only to the image that contains the state */ sn->vm_state_size = (bs == bs1 ? vm_state_size : 0); - ret = bdrv_snapshot_create(bs1, sn); - if (ret < 0) { - monitor_printf(mon, "Error while creating snapshot on '%s'\n", - bdrv_get_device_name(bs1)); + bdrv_snapshot_create(bs1, sn, &err); + if (error_is_set(&err)) { + monitor_printf(mon, + "Error while creating snapshot on '%s': %s\n", + bdrv_get_device_name(bs1), + error_get_pretty(err)); + error_free(err); } } }