Re: [Qemu-devel] [PATCH v2] rbd: wire up snapshot removal and rollback functionality

[Kevin Wolf]

Am 12.01.2012 10:40, schrieb Stefan Hajnoczi:
> On Wed, Jan 11, 2012 at 7:53 PM, Gregory Farnum
>  wrote:
>> Signed-off-by: Greg Farnum 
>> ---
>> Remove redundant warnings and add Kevin to the CC.
>>
>>  block/rbd.c |   22 ++
>>  1 files changed, 22 insertions(+), 0 deletions(-)
> 
> Reviewed-by: Stefan Hajnoczi 

Thanks, applied to the block branch.

Kevin

Re: [Qemu-devel] [PATCH v2] rbd: wire up snapshot removal and rollback functionality

[Stefan Hajnoczi]

On Wed, Jan 11, 2012 at 7:53 PM, Gregory Farnum
 wrote:
> Signed-off-by: Greg Farnum 
> ---
> Remove redundant warnings and add Kevin to the CC.
>
>  block/rbd.c |   22 ++
>  1 files changed, 22 insertions(+), 0 deletions(-)

Reviewed-by: Stefan Hajnoczi 

[Qemu-devel] [PATCH v2] rbd: wire up snapshot removal and rollback functionality

[Gregory Farnum]

Signed-off-by: Greg Farnum 
---
Remove redundant warnings and add Kevin to the CC.

 block/rbd.c |   22 ++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/block/rbd.c b/block/rbd.c
index 7a2384c..475e362 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -787,6 +787,26 @@ static int qemu_rbd_snap_create(BlockDriverState *bs,
 return 0;
 }

+static int qemu_rbd_snap_remove(BlockDriverState *bs,
+const char *snapshot_name)
+{
+BDRVRBDState *s = bs->opaque;
+int r;
+
+r = rbd_snap_remove(s->image, snapshot_name);
+return r;
+}
+
+static int qemu_rbd_snap_rollback(BlockDriverState *bs,
+  const char *snapshot_name)
+{
+BDRVRBDState *s = bs->opaque;
+int r;
+
+r = rbd_snap_rollback(s->image, snapshot_name);
+return r;
+}
+
 static int qemu_rbd_snap_list(BlockDriverState *bs,
   QEMUSnapshotInfo **psn_tab)
 {
@@ -860,7 +880,9 @@ static BlockDriver bdrv_rbd = {
 .bdrv_co_flush_to_disk  = qemu_rbd_co_flush,

 .bdrv_snapshot_create   = qemu_rbd_snap_create,
+.bdrv_snapshot_delete   = qemu_rbd_snap_remove,
 .bdrv_snapshot_list = qemu_rbd_snap_list,
+.bdrv_snapshot_goto = qemu_rbd_snap_rollback,
 };

 static void bdrv_rbd_init(void)
-- 
1.7.2.5