[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 10/24] qcow2: Open images with refcount order !=
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v6 10/24] qcow2: Open images with refcount order != 4 |
Date: |
Tue, 10 Feb 2015 15:28:52 -0500 |
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 830c903..e563a30 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;
--
2.1.0
- Re: [Qemu-devel] [PATCH v6 01/24] qcow2: Add two new fields to BDRVQcowState, (continued)
- [Qemu-devel] [PATCH v6 03/24] qcow2: Do not return new value after refcount update, Max Reitz, 2015/02/10
- [Qemu-devel] [PATCH v6 02/24] qcow2: Add refcount_bits to format-specific info, Max Reitz, 2015/02/10
- [Qemu-devel] [PATCH v6 04/24] qcow2: Only return status from qcow2_get_refcount, Max Reitz, 2015/02/10
- [Qemu-devel] [PATCH v6 05/24] qcow2: Use unsigned addend for update_refcount(), Max Reitz, 2015/02/10
- [Qemu-devel] [PATCH v6 06/24] qcow2: Use 64 bits for refcount values, Max Reitz, 2015/02/10
- [Qemu-devel] [PATCH v6 10/24] qcow2: Open images with refcount order != 4,
Max Reitz <=
- [Qemu-devel] [PATCH v6 08/24] qcow2: Helper function for refcount modification, Max Reitz, 2015/02/10
- [Qemu-devel] [PATCH v6 12/24] qcow2: Use symbolic macros in qcow2_amend_options, Max Reitz, 2015/02/10
- [Qemu-devel] [PATCH v6 07/24] qcow2: Helper for refcount array reallocation, Max Reitz, 2015/02/10
- [Qemu-devel] [PATCH v6 09/24] qcow2: More helpers for refcount modification, Max Reitz, 2015/02/10
- [Qemu-devel] [PATCH v6 13/24] iotests: Prepare for refcount_bits option, Max Reitz, 2015/02/10
- [Qemu-devel] [PATCH v6 15/24] progress: Allow regressing progress, Max Reitz, 2015/02/10