From: MORITA Kazutaka <morita.kazut...@lab.ntt.co.jp> 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.kazut...@lab.ntt.co.jp> Signed-off-by: Kevin Wolf <kw...@redhat.com> --- block/sheepdog.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) 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; -- 1.7.6.5