[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/2] sheepdog: support 'qemu-img snapshot -a'
From: |
Liu Yuan |
Subject: |
[Qemu-devel] [PATCH 2/2] sheepdog: support 'qemu-img snapshot -a' |
Date: |
Thu, 6 Jun 2013 19:57:29 +0800 |
Just call sd_create_branch() to rollback the image is good enough
Cc: address@hidden
Cc: MORITA Kazutaka <address@hidden>
Cc: Kevin Wolf <address@hidden>
Cc: Stefan Hajnoczi <address@hidden>
Signed-off-by: Liu Yuan <address@hidden>
---
block/sheepdog.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/block/sheepdog.c b/block/sheepdog.c
index 94218ac..cb5ca4a 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -2072,9 +2072,11 @@ static int sd_snapshot_goto(BlockDriverState *bs, const
char *snapshot_id)
}
if (!s->inode.vm_state_size) {
- error_report("Invalid snapshot");
- ret = -ENOENT;
- goto out;
+ /* qemu-img asks us to rollback, we need to do it right now */
+ ret = sd_create_branch(s);
+ if (ret) {
+ goto out;
+ }
}
s->is_snapshot = true;
--
1.7.9.5
- [Qemu-devel] [PATCH 0/2] fix 'qemu-img snapshot -a' operation for sheepdog, Liu Yuan, 2013/06/06
- [Qemu-devel] [PATCH 1/2] sheepdog: fix snapshot tag initialization, Liu Yuan, 2013/06/06
- [Qemu-devel] [PATCH 2/2] sheepdog: support 'qemu-img snapshot -a',
Liu Yuan <=
- Re: [Qemu-devel] [PATCH 2/2] sheepdog: support 'qemu-img snapshot -a', Kevin Wolf, 2013/06/06
- Re: [Qemu-devel] [PATCH 2/2] sheepdog: support 'qemu-img snapshot -a', Liu Yuan, 2013/06/06
- Re: [Qemu-devel] [PATCH 2/2] sheepdog: support 'qemu-img snapshot -a', Kevin Wolf, 2013/06/07
- Re: [Qemu-devel] [PATCH 2/2] sheepdog: support 'qemu-img snapshot -a', Liu Yuan, 2013/06/07
- Re: [Qemu-devel] [PATCH 2/2] sheepdog: support 'qemu-img snapshot -a', Kevin Wolf, 2013/06/07
- Re: [Qemu-devel] [PATCH 2/2] sheepdog: support 'qemu-img snapshot -a', Liu Yuan, 2013/06/07
- Re: [Qemu-devel] [PATCH 2/2] sheepdog: support 'qemu-img snapshot -a', Kevin Wolf, 2013/06/07
- Re: [Qemu-devel] [PATCH 2/2] sheepdog: support 'qemu-img snapshot -a', Liu Yuan, 2013/06/07
- Re: [Qemu-devel] [PATCH 2/2] sheepdog: support 'qemu-img snapshot -a', Liu Yuan, 2013/06/06