From patchwork Fri Mar 22 13:16:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Hrdina X-Patchwork-Id: 230018 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3C7DF2C00A2 for ; Sat, 23 Mar 2013 00:21:58 +1100 (EST) Received: from localhost ([::1]:44275 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ1uu-00047c-EO for incoming@patchwork.ozlabs.org; Fri, 22 Mar 2013 09:21:56 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44144) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ1pn-0005JV-4k for qemu-devel@nongnu.org; Fri, 22 Mar 2013 09:16:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UJ1ph-0008D3-Hk for qemu-devel@nongnu.org; Fri, 22 Mar 2013 09:16:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60363) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ1ph-0008Cs-56 for qemu-devel@nongnu.org; Fri, 22 Mar 2013 09:16:33 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2MDGWhY017155 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 22 Mar 2013 09:16:32 -0400 Received: from localhost.localdomain.com (vpn1-5-126.ams2.redhat.com [10.36.5.126]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r2MDGBBk008641; Fri, 22 Mar 2013 09:16:30 -0400 From: Pavel Hrdina To: qemu-devel@nongnu.org Date: Fri, 22 Mar 2013 14:16:08 +0100 Message-Id: <706fbb2daa8c17bc9374e9c05d7da83a1fb6a6a4.1363957855.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Pavel Hrdina , armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH v2 09/12] block: update return value from bdrv_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 If we provide error message, we should also provide a return code. In some cases we could not care about any error message and the return code is enough for as. Signed-off-by: Pavel Hrdina --- block.c | 4 ++-- block/qcow2-snapshot.c | 4 ++-- block/rbd.c | 8 ++++---- block/sheepdog.c | 4 ++-- qemu-img.c | 7 ++++--- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/block.c b/block.c index d1b9034..e97a68c 100644 --- a/block.c +++ b/block.c @@ -3210,7 +3210,7 @@ int bdrv_snapshot_create(BlockDriverState *bs, if (!drv) { error_setg(errp, "Device '%s' has no medium.", bdrv_get_device_name(bs)); - return -ENOMEDIUM; + return -1; } if (drv->bdrv_snapshot_create) { return drv->bdrv_snapshot_create(bs, sn_info, errp); @@ -3221,7 +3221,7 @@ int bdrv_snapshot_create(BlockDriverState *bs, error_setg(errp, "Snapshot is not supported for '%s'.", bdrv_get_format_name(bs)); - return -ENOTSUP; + return -1; } int bdrv_snapshot_goto(BlockDriverState *bs, diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c index d6be9a6..ff2e774 100644 --- a/block/qcow2-snapshot.c +++ b/block/qcow2-snapshot.c @@ -337,7 +337,7 @@ int qcow2_snapshot_create(BlockDriverState *bs, /* Check that the ID is unique */ if (find_snapshot_by_id(bs, sn_info->id_str) >= 0) { error_setg(errp, "Parameter 'name' has to be unique ID."); - return -EEXIST; + return -1; } /* Populate sn with passed data */ @@ -420,7 +420,7 @@ fail: g_free(sn->name); g_free(l1_table); - return ret; + return -1; } /* copy the snapshot 'snapshot_name' into the current disk image */ diff --git a/block/rbd.c b/block/rbd.c index 914f9fa..9b5dfb4 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -823,7 +823,7 @@ static int qemu_rbd_snap_create(BlockDriverState *bs, if (sn_info->name[0] == '\0') { error_setg(errp, "Parameter 'name' cannot be empty."); - return -EINVAL; /* we need a name for rbd snapshots */ + return -1; /* we need a name for rbd snapshots */ } /* @@ -833,18 +833,18 @@ static int qemu_rbd_snap_create(BlockDriverState *bs, if (sn_info->id_str[0] != '\0' && strcmp(sn_info->id_str, sn_info->name) != 0) { error_setg(errp, "ID and name have to be equal."); - return -EINVAL; + return -1; } if (strlen(sn_info->name) >= sizeof(sn_info->id_str)) { error_setg(errp, "Parameter 'name' has to be shorter that 127 chars."); - return -ERANGE; + return -1; } r = rbd_snap_create(s->image, sn_info->name); if (r < 0) { error_setg(errp, "Failed to create snapshot: '%s'.", strerror(-r)); - return r; + return -1; } return 0; diff --git a/block/sheepdog.c b/block/sheepdog.c index f4ee80e..a55856e 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -1783,7 +1783,7 @@ static int sd_snapshot_create(BlockDriverState *bs, if (s->is_snapshot) { error_setg(errp, "You can't create a snapshot '%s' of a VDI snapshot.", sn_info->name); - return -EINVAL; + return -1; } dprintf("%s %s\n", sn_info->name, sn_info->id_str); @@ -1835,7 +1835,7 @@ static int sd_snapshot_create(BlockDriverState *bs, cleanup: closesocket(fd); - return ret; + return ret < 0 ? -1 : 0; } static int sd_snapshot_goto(BlockDriverState *bs, const char *snapshot_id) diff --git a/qemu-img.c b/qemu-img.c index 34badad..5090a53 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1943,6 +1943,7 @@ static int img_snapshot(int argc, char **argv) int action = 0; qemu_timeval tv; bool quiet = false; + Error *local_err; bdrv_oflags = BDRV_O_FLAGS | BDRV_O_RDWR; /* Parse commandline parameters */ @@ -2019,10 +2020,10 @@ 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, NULL); + local_err = NULL; + ret = bdrv_snapshot_create(bs, &sn, &local_err); if (ret) { - error_report("Could not create snapshot '%s': %d (%s)", - snapshot_name, ret, strerror(-ret)); + qemu_img_handle_error(local_err); } break;