From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54210) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCVBC-0007kK-0z for qemu-devel@nongnu.org; Fri, 14 Sep 2012 08:39:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TCVB0-0004po-LW for qemu-devel@nongnu.org; Fri, 14 Sep 2012 08:39:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15089) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCVB0-0004pk-D8 for qemu-devel@nongnu.org; Fri, 14 Sep 2012 08:39:18 -0400 From: Kevin Wolf Date: Fri, 14 Sep 2012 14:39:02 +0200 Message-Id: <1347626352-6023-2-git-send-email-kwolf@redhat.com> In-Reply-To: <1347626352-6023-1-git-send-email-kwolf@redhat.com> References: <1347626352-6023-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 01/11] sheepdog: fix savevm and loadvm List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: MORITA Kazutaka 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 Signed-off-by: Kevin Wolf --- 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