From c3da39b01cc9427c75eb46a2f6408a05fd26e16a Mon Sep 17 00:00:00 2001
From: Kevin Wolf <kwolf@redhat.com>
Date: Thu, 21 Jan 2010 14:03:00 -0200
Subject: [PATCH 02/10] qcow2: Fix error handling in qcow_save_vmstate

RH-Author: Kevin Wolf <kwolf@redhat.com>
Message-id: <1264082588-10273-3-git-send-email-kwolf@redhat.com>
Patchwork-id: 6511
O-Subject: [RHEL-5.5 KVM PATCH 02/10] qcow2: Fix error handling in
	qcow_save_vmstate
Bugzilla: 537077
RH-Acked-by: Christoph Hellwig <chellwig@redhat.com>
RH-Acked-by: Juan Quintela <quintela@redhat.com>
RH-Acked-by: Gleb Natapov <gleb@redhat.com>
RH-Acked-by: Markus Armbruster <armbru@redhat.com>

Bugzilla: 537077
Upstream status: Submitted

Don't assume success but pass the bdrv_pwrite return value on.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 qemu/block-qcow2.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qemu/block-qcow2.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/qemu/block-qcow2.c b/qemu/block-qcow2.c
index 4ed2ff2..a4e70d6 100644
--- a/qemu/block-qcow2.c
+++ b/qemu/block-qcow2.c
@@ -3083,12 +3083,13 @@ static int qcow_put_buffer(BlockDriverState *bs, const uint8_t *buf,
                            int64_t pos, int size)
 {
     int growable = bs->growable;
+    int ret;
 
     bs->growable = 1;
-    bdrv_pwrite(bs, pos, buf, size);
+    ret = bdrv_pwrite(bs, pos, buf, size);
     bs->growable = growable;
 
-    return size;
+    return ret;
 }
 
 static int qcow_get_buffer(BlockDriverState *bs, uint8_t *buf,
-- 
1.6.3.rc4.29.g8146