diff options
| author | Max Reitz <mreitz@redhat.com> | 2015-02-10 15:28:52 -0500 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-03-10 14:02:21 +0100 |
| commit | b72faf9f78377e38342f78ffacdfa0726f5e7511 (patch) | |
| tree | 80f88a1457d2817c1f1a657acb6491089ec52828 /block | |
| parent | 59c0cb7830be68080c6a0d1449253b954350e57d (diff) | |
qcow2: Open images with refcount order != 4
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 <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/qcow2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index 5c92803fff..52731ab67b 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; |