From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47860) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzNHJ-0003OY-Nc for qemu-devel@nongnu.org; Thu, 19 Nov 2015 06:21:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzNHF-00077a-Pk for qemu-devel@nongnu.org; Thu, 19 Nov 2015 06:21:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37990) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzNHF-00077W-KT for qemu-devel@nongnu.org; Thu, 19 Nov 2015 06:21:21 -0500 From: Juan Quintela Date: Thu, 19 Nov 2015 12:21:00 +0100 Message-Id: <1447932069-2772-6-git-send-email-quintela@redhat.com> In-Reply-To: <1447932069-2772-1-git-send-email-quintela@redhat.com> References: <1447932069-2772-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PULL 05/14] snapshot: return error code from bdrv_snapshot_delete_by_id_or_name List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com, "Denis V. Lunev" , dgilbert@redhat.com, Kevin Wolf From: "Denis V. Lunev" this will make code better in the next patch Signed-off-by: Denis V. Lunev Reviewed-by: Stefan Hajnoczi Reviewed-by: Fam Zheng Reviewed-by: Juan Quintela CC: Kevin Wolf Tested-by: Greg Kurz Signed-off-by: Juan Quintela --- 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