From patchwork Wed Jan 20 14:02:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 43286 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E91A2B7CBB for ; Thu, 21 Jan 2010 01:16:22 +1100 (EST) Received: from localhost ([127.0.0.1]:50752 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXbLp-0000MO-0f for incoming@patchwork.ozlabs.org; Wed, 20 Jan 2010 09:16:05 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NXbAK-00070I-6Y for qemu-devel@nongnu.org; Wed, 20 Jan 2010 09:04:12 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NXbAD-0006tm-Va for qemu-devel@nongnu.org; Wed, 20 Jan 2010 09:04:10 -0500 Received: from [199.232.76.173] (port=43294 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXbAD-0006tY-Pl for qemu-devel@nongnu.org; Wed, 20 Jan 2010 09:04:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:32673) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NXbAD-0003LH-4f for qemu-devel@nongnu.org; Wed, 20 Jan 2010 09:04:05 -0500 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0KE443I014251 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 20 Jan 2010 09:04:04 -0500 Received: from localhost.localdomain (dhcp-5-175.str.redhat.com [10.32.5.175]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0KE40Px030534; Wed, 20 Jan 2010 09:04:03 -0500 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Wed, 20 Jan 2010 15:02:59 +0100 Message-Id: <1263996186-6623-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1263996186-6623-1-git-send-email-kwolf@redhat.com> References: <1263996186-6623-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Kevin Wolf Subject: [Qemu-devel] [PATCH v2 02/10] qcow2: Fix error handling in qcow_save_vmstate X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Don't assume success but pass the bdrv_pwrite return value on. Signed-off-by: Kevin Wolf --- block/qcow2.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 6622eba..e06f4dd 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1163,12 +1163,13 @@ static int qcow_save_vmstate(BlockDriverState *bs, const uint8_t *buf, { BDRVQcowState *s = bs->opaque; int growable = bs->growable; + int ret; bs->growable = 1; - bdrv_pwrite(bs, qcow_vm_state_offset(s) + pos, buf, size); + ret = bdrv_pwrite(bs, qcow_vm_state_offset(s) + pos, buf, size); bs->growable = growable; - return size; + return ret; } static int qcow_load_vmstate(BlockDriverState *bs, uint8_t *buf,