qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Denis V. Lunev" <den@openvz.org>
Cc: Kevin Wolf <kwolf@redhat.com>, "Denis V. Lunev" <den@openvz.org>,
	qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>,
	Juan Quintela <quintela@redhat.com>
Subject: [Qemu-devel] [PATCH 02/11] snapshot: return error code from bdrv_snapshot_delete_by_id_or_name
Date: Wed,  4 Nov 2015 20:19:33 +0300	[thread overview]
Message-ID: <1446657582-21619-3-git-send-email-den@openvz.org> (raw)
In-Reply-To: <1446657582-21619-1-git-send-email-den@openvz.org>

this will make code better in the next patch

Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Juan Quintela <quintela@redhat.com>
CC: Stefan Hajnoczi <stefanha@redhat.com>
CC: Kevin Wolf <kwolf@redhat.com>
---
 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 2ef4545..d729c76 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 0a3cf0d..76cf6a3 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

  parent reply	other threads:[~2015-11-04 17:19 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-04 17:19 [Qemu-devel] [PATCH 2.5 v5 0/11] dataplane snapshot fixes Denis V. Lunev
2015-11-04 17:19 ` [Qemu-devel] [PATCH 01/11] snapshot: create helper to test that block drivers supports snapshots Denis V. Lunev
2015-11-05  6:26   ` Greg Kurz
2015-11-05  7:58     ` Denis V. Lunev
2015-11-06 13:53     ` Stefan Hajnoczi
2015-11-04 17:19 ` Denis V. Lunev [this message]
2015-11-05  7:55   ` [Qemu-devel] [PATCH 02/11] snapshot: return error code from bdrv_snapshot_delete_by_id_or_name Greg Kurz
2015-11-05  8:02     ` Denis V. Lunev
2015-11-04 17:19 ` [Qemu-devel] [PATCH 03/11] snapshot: create bdrv_all_delete_snapshot helper Denis V. Lunev
2015-11-06 14:09   ` Stefan Hajnoczi
2015-11-06 14:12     ` Denis V. Lunev
2015-11-07 12:22     ` Denis V. Lunev
2015-11-04 17:19 ` [Qemu-devel] [PATCH 04/11] snapshot: create bdrv_all_goto_snapshot helper Denis V. Lunev
2015-11-05  9:09   ` Greg Kurz
2015-11-04 17:19 ` [Qemu-devel] [PATCH 05/11] snapshot: create bdrv_all_find_snapshot helper Denis V. Lunev
2015-11-04 17:19 ` [Qemu-devel] [PATCH 06/11] migration: drop find_vmstate_bs check in hmp_delvm Denis V. Lunev
2015-11-04 17:19 ` [Qemu-devel] [PATCH 07/11] migration: reorder processing in hmp_savevm Denis V. Lunev
2015-11-04 17:19 ` [Qemu-devel] [PATCH 08/11] migration: implement bdrv_all_find_vmstate_bs and bdrv_unlock helpers Denis V. Lunev
2015-11-06 15:18   ` Stefan Hajnoczi
2015-11-06 15:23     ` Denis V. Lunev
2015-11-04 17:19 ` [Qemu-devel] [PATCH 09/11] migration: add missed aio_context_acquire for state writing/reading Denis V. Lunev
2015-11-06 15:37   ` Stefan Hajnoczi
2015-11-04 17:19 ` [Qemu-devel] [PATCH 10/11] snapshot: create bdrv_all_create_snapshot helper Denis V. Lunev
2015-11-04 17:19 ` [Qemu-devel] [PATCH 11/11] monitor: add missed aio_context_acquire into vm_completion call Denis V. Lunev
2015-11-06 15:40   ` Stefan Hajnoczi
2015-11-06 15:54 ` [Qemu-devel] [PATCH 2.5 v5 0/11] dataplane snapshot fixes Stefan Hajnoczi
2015-11-06 16:05   ` Eric Blake
2015-11-06 16:19     ` Denis V. Lunev
2015-11-06 17:29       ` Stefan Hajnoczi
2015-11-06 21:13     ` Denis V. Lunev
2015-11-09 21:05       ` Eric Blake
2015-11-10 12:55         ` Denis V. Lunev
  -- strict thread matches above, loose matches on Subject: below --
2015-11-17  9:08 [Qemu-devel] [PATCH for 2.9 v8 0/10] " Denis V. Lunev
2015-11-17  9:08 ` [Qemu-devel] [PATCH 02/11] snapshot: return error code from bdrv_snapshot_delete_by_id_or_name Denis V. Lunev
2015-11-18 10:59   ` Juan Quintela
2015-11-19  6:42 [Qemu-devel] [PATCH for 2.5 v10 0/10] dataplane snapshot fixes Denis V. Lunev
2015-11-19  6:42 ` [Qemu-devel] [PATCH 02/11] snapshot: return error code from bdrv_snapshot_delete_by_id_or_name Denis V. Lunev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1446657582-21619-3-git-send-email-den@openvz.org \
    --to=den@openvz.org \
    --cc=kwolf@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).