[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 12/26] qcow2: Open images with refcount order !=
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v4 12/26] qcow2: Open images with refcount order != 4 |
Date: |
Wed, 3 Dec 2014 14:37:32 +0100 |
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
---
block/qcow2.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 25d6a66..ff57566 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
- Re: [Qemu-devel] [PATCH v4 07/26] qcow2: Respect error in qcow2_alloc_bytes(), (continued)
- [Qemu-devel] [PATCH v4 09/26] qcow2: Helper for refcount array reallocation, Max Reitz, 2014/12/03
- [Qemu-devel] [PATCH v4 10/26] qcow2: Helper function for refcount modification, Max Reitz, 2014/12/03
- [Qemu-devel] [PATCH v4 11/26] qcow2: More helpers for refcount modification, Max Reitz, 2014/12/03
- [Qemu-devel] [PATCH v4 12/26] qcow2: Open images with refcount order != 4,
Max Reitz <=
- [Qemu-devel] [PATCH v4 13/26] qcow2: refcount_order parameter for qcow2_create2, Max Reitz, 2014/12/03
- [Qemu-devel] [PATCH v4 17/26] progress: Allow regressing progress, Max Reitz, 2014/12/03
- [Qemu-devel] [PATCH v4 16/26] qcow2: Allow creation with refcount order != 4, Max Reitz, 2014/12/03
- [Qemu-devel] [PATCH v4 19/26] qcow2: Use error_report() in qcow2_amend_options(), Max Reitz, 2014/12/03