From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyLeM-0000k7-6k for qemu-devel@nongnu.org; Mon, 16 Nov 2015 10:24:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZyLeH-0001B9-9y for qemu-devel@nongnu.org; Mon, 16 Nov 2015 10:24:58 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:38193 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyLeG-00016h-S1 for qemu-devel@nongnu.org; Mon, 16 Nov 2015 10:24:53 -0500 From: "Denis V. Lunev" Date: Mon, 16 Nov 2015 18:24:33 +0300 Message-Id: <1447687481-29244-3-git-send-email-den@openvz.org> In-Reply-To: <1447687481-29244-1-git-send-email-den@openvz.org> References: <1447687481-29244-1-git-send-email-den@openvz.org> Subject: [Qemu-devel] [PATCH 02/10] snapshot: return error code from bdrv_snapshot_delete_by_id_or_name List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "Denis V. Lunev" , qemu-devel@nongnu.org, stefanha@redhat.com, Juan Quintela this will make code better in the next patch Signed-off-by: Denis V. Lunev Reviewed-by: Fam Zheng Reviewed-by: Stefan Hajnoczi CC: Juan Quintela CC: Kevin Wolf --- block/snapshot.c | 7 ++++--- include/block/snapshot.h | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/block/snapshot.c b/block/snapshot.c index d929d08..ed0422d 100644 --- a/block/snapshot.c +++ b/block/snapshot.c @@ -253,9 +253,9 @@ int bdrv_snapshot_delete(BlockDriverState *bs, return -ENOTSUP; } -void bdrv_snapshot_delete_by_id_or_name(BlockDriverState *bs, - const char *id_or_name, - Error **errp) +int bdrv_snapshot_delete_by_id_or_name(BlockDriverState *bs, + const char *id_or_name, + Error **errp) { int ret; Error *local_err = NULL; @@ -270,6 +270,7 @@ void bdrv_snapshot_delete_by_id_or_name(BlockDriverState *bs, if (ret < 0) { error_propagate(errp, local_err); } + return ret; } int bdrv_snapshot_list(BlockDriverState *bs, diff --git a/include/block/snapshot.h b/include/block/snapshot.h index 6195c9c..9ddfd42 100644 --- a/include/block/snapshot.h +++ b/include/block/snapshot.h @@ -63,9 +63,9 @@ int bdrv_snapshot_delete(BlockDriverState *bs, const char *snapshot_id, const char *name, Error **errp); -void bdrv_snapshot_delete_by_id_or_name(BlockDriverState *bs, - const char *id_or_name, - Error **errp); +int bdrv_snapshot_delete_by_id_or_name(BlockDriverState *bs, + const char *id_or_name, + Error **errp); int bdrv_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_info); int bdrv_snapshot_load_tmp(BlockDriverState *bs, -- 2.5.0