[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 09/21] qcow2: Open images with refcount order !=
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 09/21] qcow2: Open images with refcount order != 4 |
Date: |
Fri, 14 Nov 2014 14:06:02 +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>
---
block/qcow2.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index d70e927..528d696 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 bit");
+ ret = -EINVAL;
goto fail;
}
s->refcount_order = header.refcount_order;
--
1.9.3
- [Qemu-devel] [PATCH v2 05/21] qcow2: Refcount overflow and qcow2_alloc_bytes(), (continued)
- [Qemu-devel] [PATCH v2 05/21] qcow2: Refcount overflow and qcow2_alloc_bytes(), Max Reitz, 2014/11/14
- [Qemu-devel] [PATCH v2 06/21] qcow2: Helper for refcount array reallocation, Max Reitz, 2014/11/14
- [Qemu-devel] [PATCH v2 07/21] qcow2: Helper function for refcount modification, Max Reitz, 2014/11/14
- [Qemu-devel] [PATCH v2 08/21] qcow2: More helpers for refcount modification, Max Reitz, 2014/11/14
- [Qemu-devel] [PATCH v2 09/21] qcow2: Open images with refcount order != 4,
Max Reitz <=
- [Qemu-devel] [PATCH v2 11/21] iotests: Prepare for refcount_width option, Max Reitz, 2014/11/14
- [Qemu-devel] [PATCH v2 12/21] qcow2: Allow creation with refcount order != 4, Max Reitz, 2014/11/14
- [Qemu-devel] [PATCH v2 10/21] qcow2: refcount_order parameter for qcow2_create2, Max Reitz, 2014/11/14
- [Qemu-devel] [PATCH v2 13/21] block: Add opaque value to the amend CB, Max Reitz, 2014/11/14
- [Qemu-devel] [PATCH v2 15/21] qcow2: Use abort() instead of assert(false), Max Reitz, 2014/11/14
- [Qemu-devel] [PATCH v2 16/21] qcow2: Split upgrade/downgrade paths for amend, Max Reitz, 2014/11/14
- [Qemu-devel] [PATCH v2 14/21] qcow2: Use error_report() in qcow2_amend_options(), Max Reitz, 2014/11/14