From patchwork Tue Jan 10 20:01:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Farnum X-Patchwork-Id: 135305 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 20CEAB6FC5 for ; Wed, 11 Jan 2012 07:01:21 +1100 (EST) Received: from localhost ([::1]:57599 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rkhsl-0004AB-DV for incoming@patchwork.ozlabs.org; Tue, 10 Jan 2012 15:01:19 -0500 Received: from eggs.gnu.org ([140.186.70.92]:45516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rkhsb-00048v-3D for qemu-devel@nongnu.org; Tue, 10 Jan 2012 15:01:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RkhsZ-0006Tq-Re for qemu-devel@nongnu.org; Tue, 10 Jan 2012 15:01:09 -0500 Received: from mail-iy0-f173.google.com ([209.85.210.173]:62962) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RkhsZ-0006Ti-BT for qemu-devel@nongnu.org; Tue, 10 Jan 2012 15:01:07 -0500 Received: by iagw33 with SMTP id w33so1547394iag.4 for ; Tue, 10 Jan 2012 12:01:05 -0800 (PST) MIME-Version: 1.0 Received: by 10.42.147.6 with SMTP id l6mr22901319icv.17.1326225665389; Tue, 10 Jan 2012 12:01:05 -0800 (PST) Received: by 10.231.59.204 with HTTP; Tue, 10 Jan 2012 12:01:05 -0800 (PST) Date: Tue, 10 Jan 2012 12:01:05 -0800 Message-ID: From: Gregory Farnum To: qemu-devel@nongnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.173 Cc: ceph-devel@vger.kernel.org Subject: [Qemu-devel] [PATCH]: set up rbd snapshot handling 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 rbd: wire up snapshot removal and rollback functionality Signed-off-by: Greg Farnum Reviewed-by: Josh Durgin --- block/rbd.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index 7a2384c..f52c1ca 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -787,6 +787,36 @@ 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); + if (r < 0) { + error_report("failed to remove snap: %s", strerror(-r)); + return r; + } + + return 0; +} + +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); + if (r < 0) { + error_report("failed to rollback to snap: %s", strerror(-r)); + return r; + } + + return 0; +} + static int qemu_rbd_snap_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab) { @@ -860,7 +890,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)