From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53612) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAafE-0001Q7-2S for qemu-devel@nongnu.org; Thu, 02 Jul 2015 05:20:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZAaf9-0000Cl-UU for qemu-devel@nongnu.org; Thu, 02 Jul 2015 05:20:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45011) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAaf9-0000CI-QA for qemu-devel@nongnu.org; Thu, 02 Jul 2015 05:20:07 -0400 From: Stefan Hajnoczi Date: Thu, 2 Jul 2015 10:19:34 +0100 Message-Id: <1435828789-9647-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1435828789-9647-1-git-send-email-stefanha@redhat.com> References: <1435828789-9647-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 02/17] qcow2: Handle EAGAIN returned from update_refcount List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Maydell , Stefan Hajnoczi , =?UTF-8?q?Jind=C5=99ich=20Makovi=C4=8Dka?= From: Jind=C5=99ich Makovi=C4=8Dka Fixes a crash during image compression Signed-off-by: Jind=C5=99ich Makovi=C4=8Dka Tested-by: Richard W.M. Jones Reviewed-by: Max Reitz Signed-off-by: Stefan Hajnoczi --- block/qcow2-refcount.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 0632fc3..b0ee42d 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -940,19 +940,21 @@ int64_t qcow2_alloc_bytes(BlockDriverState *bs, int= size) } =20 free_in_cluster =3D s->cluster_size - offset_into_cluster(s, offset)= ; - if (!offset || free_in_cluster < size) { - int64_t new_cluster =3D alloc_clusters_noref(bs, s->cluster_size= ); - if (new_cluster < 0) { - return new_cluster; - } + do { + if (!offset || free_in_cluster < size) { + int64_t new_cluster =3D alloc_clusters_noref(bs, s->cluster_= size); + if (new_cluster < 0) { + return new_cluster; + } =20 - if (!offset || ROUND_UP(offset, s->cluster_size) !=3D new_cluste= r) { - offset =3D new_cluster; + if (!offset || ROUND_UP(offset, s->cluster_size) !=3D new_cl= uster) { + offset =3D new_cluster; + } } - } =20 - assert(offset); - ret =3D update_refcount(bs, offset, size, 1, false, QCOW2_DISCARD_NE= VER); + assert(offset); + ret =3D update_refcount(bs, offset, size, 1, false, QCOW2_DISCAR= D_NEVER); + } while (ret =3D=3D -EAGAIN); if (ret < 0) { return ret; } --=20 2.4.3