[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.4 4/5] mirror: correct buf_size
From: |
Jeff Cody |
Subject: |
[Qemu-devel] [PULL for-2.4 4/5] mirror: correct buf_size |
Date: |
Tue, 14 Jul 2015 22:26:56 -0400 |
From: Wen Congyang <address@hidden>
If bus_size is less than 0, the command fails.
If buf_size is 0, use DEFAULT_MIRROR_BUF_SIZE.
If buf_size % granularity is not 0, mirror_free_init() will
do dangerous things.
Signed-off-by: Wen Congyang <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>
---
block/mirror.c | 11 ++++++++++-
blockdev.c | 4 +---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index a2700ca..323f747 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -20,6 +20,7 @@
#define SLICE_TIME 100000000ULL /* ns */
#define MAX_IN_FLIGHT 16
+#define DEFAULT_MIRROR_BUF_SIZE (10 << 20)
/* The mirroring buffer is a list of granularity-sized chunks.
* Free chunks are organized in a list.
@@ -701,6 +702,14 @@ static void mirror_start_job(BlockDriverState *bs,
BlockDriverState *target,
return;
}
+ if (buf_size < 0) {
+ error_setg(errp, "Invalid parameter 'buf-size'");
+ return;
+ }
+
+ if (buf_size == 0) {
+ buf_size = DEFAULT_MIRROR_BUF_SIZE;
+ }
s = block_job_create(driver, bs, speed, cb, opaque, errp);
if (!s) {
@@ -714,7 +723,7 @@ static void mirror_start_job(BlockDriverState *bs,
BlockDriverState *target,
s->is_none_mode = is_none_mode;
s->base = base;
s->granularity = granularity;
- s->buf_size = MAX(buf_size, granularity);
+ s->buf_size = ROUND_UP(buf_size, granularity);
s->unmap = unmap;
s->dirty_bitmap = bdrv_create_dirty_bitmap(bs, granularity, NULL, errp);
diff --git a/blockdev.c b/blockdev.c
index 50421c8..62a4586 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2639,8 +2639,6 @@ out:
aio_context_release(aio_context);
}
-#define DEFAULT_MIRROR_BUF_SIZE (10 << 20)
-
void qmp_drive_mirror(const char *device, const char *target,
bool has_format, const char *format,
bool has_node_name, const char *node_name,
@@ -2682,7 +2680,7 @@ void qmp_drive_mirror(const char *device, const char
*target,
granularity = 0;
}
if (!has_buf_size) {
- buf_size = DEFAULT_MIRROR_BUF_SIZE;
+ buf_size = 0;
}
if (!has_unmap) {
unmap = true;
--
1.9.3
- [Qemu-devel] [PULL for-2.4 0/5] Block layer patches for 2.4.0-rc1, Jeff Cody, 2015/07/14
- [Qemu-devel] [PULL for-2.4 1/5] block/mirror: Sleep periodically during bitmap scanning, Jeff Cody, 2015/07/14
- [Qemu-devel] [PULL for-2.4 3/5] block: keep bitmap if incremental backup job is cancelled, Jeff Cody, 2015/07/14
- [Qemu-devel] [PULL for-2.4 2/5] blockdev: no need to drain in qmp_block_commit, Jeff Cody, 2015/07/14
- [Qemu-devel] [PULL for-2.4 4/5] mirror: correct buf_size,
Jeff Cody <=
- [Qemu-devel] [PULL for-2.4 5/5] block/curl: Don't lose original error when a connection fails., Jeff Cody, 2015/07/14
- Re: [Qemu-devel] [PULL for-2.4 0/5] Block layer patches for 2.4.0-rc1, Peter Maydell, 2015/07/15