[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/33] qcow2: Save refcount order in BDRVQcowState
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 07/33] qcow2: Save refcount order in BDRVQcowState |
Date: |
Fri, 13 Sep 2013 13:50:37 +0200 |
From: Max Reitz <address@hidden>
Save the image refcount order in BDRVQcowState. This will be relevant
for future code supporting different refcount orders than four and also
for code that needs to verify a certain refcount order for an opened
image.
Signed-off-by: Max Reitz <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow2.c | 3 ++-
block/qcow2.h | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index c9e266e..27203f8 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -455,6 +455,7 @@ static int qcow2_open(BlockDriverState *bs, QDict *options,
int flags)
ret = -ENOTSUP;
goto fail;
}
+ s->refcount_order = header.refcount_order;
if (header.cluster_bits < MIN_CLUSTER_BITS ||
header.cluster_bits > MAX_CLUSTER_BITS) {
@@ -1143,7 +1144,7 @@ int qcow2_update_header(BlockDriverState *bs)
.incompatible_features = cpu_to_be64(s->incompatible_features),
.compatible_features = cpu_to_be64(s->compatible_features),
.autoclear_features = cpu_to_be64(s->autoclear_features),
- .refcount_order = cpu_to_be32(3 + REFCOUNT_SHIFT),
+ .refcount_order = cpu_to_be32(s->refcount_order),
.header_length = cpu_to_be32(header_length),
};
diff --git a/block/qcow2.h b/block/qcow2.h
index 48080fd..bea6ddb 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -199,6 +199,7 @@ typedef struct BDRVQcowState {
int flags;
int qcow_version;
bool use_lazy_refcounts;
+ int refcount_order;
bool discard_passthrough[QCOW2_DISCARD_MAX];
--
1.8.1.4
- [Qemu-devel] [PULL 00/33] Block patches, Kevin Wolf, 2013/09/13
- [Qemu-devel] [PULL 03/33] raw-win32.c: Fix incorrect handling behaviour of small block files, Kevin Wolf, 2013/09/13
- [Qemu-devel] [PULL 04/33] block: Image file option amendment, Kevin Wolf, 2013/09/13
- [Qemu-devel] [PULL 06/33] qcow2-cluster: Expand zero clusters, Kevin Wolf, 2013/09/13
- [Qemu-devel] [PULL 05/33] qcow2-cache: Empty cache, Kevin Wolf, 2013/09/13
- [Qemu-devel] [PULL 07/33] qcow2: Save refcount order in BDRVQcowState,
Kevin Wolf <=
- [Qemu-devel] [PULL 01/33] qcow2: Pass discard type to qcow2_discard_clusters(), Kevin Wolf, 2013/09/13
- [Qemu-devel] [PULL 02/33] qcow2: Discard VM state in active L1 after creating snapshot, Kevin Wolf, 2013/09/13
- [Qemu-devel] [PULL 11/33] qemu-iotests: add infrastructure of fd passing via SCM, Kevin Wolf, 2013/09/13
- [Qemu-devel] [PULL 10/33] qemu-iotests: add unix socket help program, Kevin Wolf, 2013/09/13
- [Qemu-devel] [PULL 09/33] qemu-iotest: qcow2 image option amendment, Kevin Wolf, 2013/09/13
- [Qemu-devel] [PULL 08/33] qcow2: Implement bdrv_amend_options, Kevin Wolf, 2013/09/13
- [Qemu-devel] [PULL 12/33] qemu-iotests: add tests for runtime fd passing via SCM rights, Kevin Wolf, 2013/09/13
- [Qemu-devel] [PULL 13/33] qemu-iotests: New test case in 061, Kevin Wolf, 2013/09/13
- [Qemu-devel] [PULL 15/33] snapshot: distinguish id and name in snapshot delete, Kevin Wolf, 2013/09/13