From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33023) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrVCF-0003f0-AX for qemu-devel@nongnu.org; Thu, 20 Nov 2014 12:07:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XrVC9-0000lJ-6z for qemu-devel@nongnu.org; Thu, 20 Nov 2014 12:07:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44478) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrVC9-0000l6-04 for qemu-devel@nongnu.org; Thu, 20 Nov 2014 12:07:01 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sAKH70c4005904 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 20 Nov 2014 12:07:00 -0500 From: Max Reitz Date: Thu, 20 Nov 2014 18:06:25 +0100 Message-Id: <1416503198-17031-10-git-send-email-mreitz@redhat.com> In-Reply-To: <1416503198-17031-1-git-send-email-mreitz@redhat.com> References: <1416503198-17031-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v3 09/22] qcow2: Open images with refcount order != 4 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz No longer refuse to open images with a different refcount entry width than 16 bits; only reject images with a refcount width larger than 64 bits (which is prohibited by the specification). Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- block/qcow2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index d70e927..18c69fb 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -677,10 +677,10 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, } /* Check support for various header values */ - if (header.refcount_order != 4) { - report_unsupported(bs, errp, "%d bit reference counts", - 1 << header.refcount_order); - ret = -ENOTSUP; + if (header.refcount_order > 6) { + error_setg(errp, "Reference count entry width too large; may not " + "exceed 64 bits"); + ret = -EINVAL; goto fail; } s->refcount_order = header.refcount_order; -- 1.9.3