[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC V1 09/12] qcow2: Make dedup status persists.
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [RFC V1 09/12] qcow2: Make dedup status persists. |
Date: |
Wed, 16 Jan 2013 17:25:15 +0100 |
---
block/qcow2-dedup.c | 7 +++++++
block/qcow2.c | 5 ++++-
block/qcow2.h | 1 +
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/block/qcow2-dedup.c b/block/qcow2-dedup.c
index 93545af..85ef66f 100644
--- a/block/qcow2-dedup.c
+++ b/block/qcow2-dedup.c
@@ -1323,6 +1323,8 @@ static void coroutine_fn qcow2_co_dedup_resume(void
*opaque)
s->dedup_status = QCOW_DEDUP_STARTED;
qemu_co_mutex_unlock(&s->lock);
+ qcow2_update_header(bs);
+
qcow2_deduplicate_after_resuming(bs);
return;
@@ -1429,6 +1431,10 @@ int qcow2_dedup_init(BlockDriverState *bs)
return 0;
}
+ if (!s->start_dedup) {
+ return 0;
+ }
+
s->dedup_status = QCOW_DEDUP_STARTING;
/* resume deduplication */
@@ -1465,6 +1471,7 @@ void qcow2_pause_dedup(BlockDriverState *bs)
}
s->dedup_status = QCOW_DEDUP_STOPPING;
+ qcow2_update_header(bs);
/* must handle half processed write requests */
qcow2_dedup_reset(bs);
s->dedup_status = QCOW_DEDUP_STOPPED;
diff --git a/block/qcow2.c b/block/qcow2.c
index d5681ad..1e61050 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -168,6 +168,7 @@ static int qcow2_read_extensions(BlockDriverState *bs,
uint64_t start_offset,
s->dedup_table_size =
be32_to_cpu(dedup_table_extension.size);
s->dedup_hash_algo = dedup_table_extension.hash_algo;
+ s->start_dedup = dedup_table_extension.strategies & (1 << 2);
break;
default:
@@ -1221,7 +1222,9 @@ int qcow2_update_header(BlockDriverState *bs)
dedup_table_extension.size = cpu_to_be32(s->dedup_table_size);
dedup_table_extension.hash_algo = s->dedup_hash_algo;
dedup_table_extension.strategies |= 1; /* RAM based lookup */
- dedup_table_extension.strategies |= 1 << 2; /* deduplication running */
+ if (s->has_dedup && s->dedup_status == QCOW_DEDUP_STARTED) {
+ dedup_table_extension.strategies |= 1 << 2;
+ }
ret = header_ext_add(buf,
QCOW2_EXT_MAGIC_DEDUP_TABLE,
&dedup_table_extension,
diff --git a/block/qcow2.h b/block/qcow2.h
index 2b5a7d4..3fdfe14 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -228,6 +228,7 @@ typedef struct BDRVQcowState {
int64_t free_byte_offset;
bool has_dedup;
+ bool start_dedup;
QCowDedupStatus dedup_status;
QCowHashAlgo dedup_hash_algo;
Coroutine *dedup_resume_co;
--
1.7.10.4
- [Qemu-devel] [RFC V1 00/12] QCOW2 asynchronous deduplication, Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V1 01/12] block: Add BlockDriver function prototype to pause and resume deduplication., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V1 02/12] qcow2: Add code to deduplicate cluster flagged with QCOW_OFLAG_TO_DEDUP., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V1 07/12] qcow2: Add qcow2_pause_dedup., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V1 08/12] qcow2: Add qcow2_resume_dedup., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V1 09/12] qcow2: Make dedup status persists.,
Benoît Canet <=
- [Qemu-devel] [RFC V1 12/12] qmp: Add block_resume_dedup., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V1 06/12] block: Add bdrv_pause_dedup., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V1 11/12] qmp: Add block-pause-dedup., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V1 04/12] block: Add bdrv_is_dedup_running., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V1 05/12] block: Add bdrv_resume_dedup., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V1 10/12] qerror: Add QERR_DEVICE_NOT_DEDUPLICATED., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V1 03/12] block: Add bdrv_has_dedup., Benoît Canet, 2013/01/16