39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From 797ff04d8b30c593c4c4fa218bb58a28b0860087 Mon Sep 17 00:00:00 2001
|
|
From: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
|
|
Date: Thu, 30 Aug 2012 03:39:45 +0900
|
|
Subject: [PATCH] sheepdog: fix savevm and loadvm
|
|
|
|
This patch sets data to be sent to Sheepdog correctly and fixes savevm
|
|
and loadvm operations on a Sheepdog image.
|
|
|
|
Signed-off-by: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
(cherry picked from commit 1f7a48de4467f31afc51169122453318efdb0f33)
|
|
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
---
|
|
block/sheepdog.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/block/sheepdog.c b/block/sheepdog.c
|
|
index df4f441..e0753ee 100644
|
|
--- a/block/sheepdog.c
|
|
+++ b/block/sheepdog.c
|
|
@@ -1986,7 +1986,7 @@ static int do_load_save_vmstate(BDRVSheepdogState *s, uint8_t *data,
|
|
vdi_index = pos / SD_DATA_OBJ_SIZE;
|
|
offset = pos % SD_DATA_OBJ_SIZE;
|
|
|
|
- data_len = MIN(remaining, SD_DATA_OBJ_SIZE);
|
|
+ data_len = MIN(remaining, SD_DATA_OBJ_SIZE - offset);
|
|
|
|
vmstate_oid = vid_to_vmstate_oid(s->inode.vdi_id, vdi_index);
|
|
|
|
@@ -2007,6 +2007,7 @@ static int do_load_save_vmstate(BDRVSheepdogState *s, uint8_t *data,
|
|
}
|
|
|
|
pos += data_len;
|
|
+ data += data_len;
|
|
remaining -= data_len;
|
|
}
|
|
ret = size;
|