[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 02/13] blockjob: consolidate SLICE_TIME definitio
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v2 02/13] blockjob: consolidate SLICE_TIME definition |
Date: |
Fri, 19 Jan 2018 15:58:36 -0500 |
They're all the same. If it actually becomes important to configure it,
it can become a job or driver property.
Signed-off-by: John Snow <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
---
block/backup.c | 1 -
block/commit.c | 2 --
block/mirror.c | 1 -
block/stream.c | 2 --
include/block/blockjob_int.h | 2 ++
5 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/block/backup.c b/block/backup.c
index 4a16a37229..7b1cdd038a 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -27,7 +27,6 @@
#include "qemu/error-report.h"
#define BACKUP_CLUSTER_SIZE_DEFAULT (1 << 16)
-#define SLICE_TIME 100000000ULL /* ns */
typedef struct BackupBlockJob {
BlockJob common;
diff --git a/block/commit.c b/block/commit.c
index bb6c904704..898545b318 100644
--- a/block/commit.c
+++ b/block/commit.c
@@ -31,8 +31,6 @@ enum {
COMMIT_BUFFER_SIZE = 512 * 1024, /* in bytes */
};
-#define SLICE_TIME 100000000ULL /* ns */
-
typedef struct CommitBlockJob {
BlockJob common;
RateLimit limit;
diff --git a/block/mirror.c b/block/mirror.c
index 88f4e8964d..1fb5fc0cb8 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -22,7 +22,6 @@
#include "qemu/ratelimit.h"
#include "qemu/bitmap.h"
-#define SLICE_TIME 100000000ULL /* ns */
#define MAX_IN_FLIGHT 16
#define MAX_IO_BYTES (1 << 20) /* 1 Mb */
#define DEFAULT_MIRROR_BUF_SIZE (MAX_IN_FLIGHT * MAX_IO_BYTES)
diff --git a/block/stream.c b/block/stream.c
index 499cdacdb0..e85af18c54 100644
--- a/block/stream.c
+++ b/block/stream.c
@@ -29,8 +29,6 @@ enum {
STREAM_BUFFER_SIZE = 512 * 1024, /* in bytes */
};
-#define SLICE_TIME 100000000ULL /* ns */
-
typedef struct StreamBlockJob {
BlockJob common;
RateLimit limit;
diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h
index c9b23b0cc9..209fa1bb3e 100644
--- a/include/block/blockjob_int.h
+++ b/include/block/blockjob_int.h
@@ -29,6 +29,8 @@
#include "block/blockjob.h"
#include "block/block.h"
+#define SLICE_TIME 100000000ULL /* ns */
+
/**
* BlockJobDriver:
*
--
2.14.3
- [Qemu-devel] [PATCH v2 00/13] blockjob: refactor mirror_throttle, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 02/13] blockjob: consolidate SLICE_TIME definition,
John Snow <=
- [Qemu-devel] [PATCH v2 03/13] blockjob: create block_job_relax, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 01/13] blockjob: record time of last entrance, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 05/13] block/commit: use block_job_relax, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 04/13] blockjob: allow block_job_throttle to take delay_ns, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 06/13] block/stream: use block_job_relax, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 07/13] block/backup: use block_job_relax, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 08/13] allow block_job_relax to return -ECANCELED, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 09/13] block/backup: remove yield_and_check, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 10/13] block/mirror: condense cancellation and relax calls, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 12/13] blockjob: privatize block_job_sleep_ns, John Snow, 2018/01/19