From patchwork Tue May 29 16:05:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: MORITA Kazutaka X-Patchwork-Id: 161766 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DF76AB6FC2 for ; Wed, 30 May 2012 02:06:52 +1000 (EST) Received: from localhost ([::1]:51700 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZOwb-0000qt-5J for incoming@patchwork.ozlabs.org; Tue, 29 May 2012 12:06:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57934) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZOwP-0000qQ-Np for qemu-devel@nongnu.org; Tue, 29 May 2012 12:06:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SZOwM-00062c-PF for qemu-devel@nongnu.org; Tue, 29 May 2012 12:06:37 -0400 Received: from sh.osrg.net ([192.16.179.4]:46151) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZOwM-0005x5-9A for qemu-devel@nongnu.org; Tue, 29 May 2012 12:06:34 -0400 Received: from fs.osrg.net (postfix@fs.osrg.net [10.0.0.12]) by sh.osrg.net (8.14.3/8.14.3/OSRG-NET) with ESMTP id q4TG6P57011375; Wed, 30 May 2012 01:06:25 +0900 Received: from localhost (dfs1401.osrg.net [10.68.14.1]) by fs.osrg.net (Postfix) with ESMTP id 619913E0281; Wed, 30 May 2012 01:06:25 +0900 (JST) From: MORITA Kazutaka To: kwolf@redhat.com Date: Wed, 30 May 2012 01:05:15 +0900 Message-Id: <1338307515-8529-1-git-send-email-morita.kazutaka@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <4FBA6464.8040206@redhat.com> References: <4FBA6464.8040206@redhat.com> X-Dispatcher: imput version 20100215(IM150) Lines: 54 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.3.7 (sh.osrg.net [192.16.179.4]); Wed, 30 May 2012 01:06:26 +0900 (JST) X-Virus-Scanned: clamav-milter 0.97.3 at sh X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 192.16.179.4 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 1.1 v2] sheepdog: fix return value of do_load_save_vm_state 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 bdrv_save_vmstate and bdrv_load_vmstate should return the vmstate size on success, and -errno on error. Signed-off-by: MORITA Kazutaka --- Changes from v1 - return an error for short reads/writes - fix a coding style problem block/sheepdog.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/block/sheepdog.c b/block/sheepdog.c index 6d52277..f46ca8f 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -1957,7 +1957,7 @@ static int do_load_save_vmstate(BDRVSheepdogState *s, uint8_t *data, int64_t pos, int size, int load) { int fd, create; - int ret = 0; + int ret = 0, remaining = size; unsigned int data_len; uint64_t vmstate_oid; uint32_t vdi_index; @@ -1968,11 +1968,11 @@ static int do_load_save_vmstate(BDRVSheepdogState *s, uint8_t *data, return fd; } - while (size) { + while (remaining) { vdi_index = pos / SD_DATA_OBJ_SIZE; offset = pos % SD_DATA_OBJ_SIZE; - data_len = MIN(size, SD_DATA_OBJ_SIZE); + data_len = MIN(remaining, SD_DATA_OBJ_SIZE); vmstate_oid = vid_to_vmstate_oid(s->inode.vdi_id, vdi_index); @@ -1993,9 +1993,9 @@ static int do_load_save_vmstate(BDRVSheepdogState *s, uint8_t *data, } pos += data_len; - size -= data_len; - ret += data_len; + remaining -= data_len; } + ret = size; cleanup: closesocket(fd); return ret;