|
 |
0a122b |
From 7bd51b7f1ea911e7a85f1965495c4299701b5f7c Mon Sep 17 00:00:00 2001
|
|
|
0a122b |
From: Fam Zheng <famz@redhat.com>
|
|
|
0a122b |
Date: Fri, 17 Jan 2014 03:07:53 +0100
|
|
|
0a122b |
Subject: [PATCH 10/34] block: Make BlockJobTypes const
|
|
|
0a122b |
|
|
|
0a122b |
RH-Author: Fam Zheng <famz@redhat.com>
|
|
|
0a122b |
Message-id: <1389928083-8921-9-git-send-email-famz@redhat.com>
|
|
|
0a122b |
Patchwork-id: 56770
|
|
|
0a122b |
O-Subject: [RHEL-7 qemu-kvm PATCH 08/18] block: Make BlockJobTypes const
|
|
|
0a122b |
Bugzilla: 1041301
|
|
|
0a122b |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
0a122b |
|
|
|
0a122b |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
0a122b |
(cherry picked from commit f59fee8d509b446df24843c1145a99b740492725)
|
|
|
0a122b |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
block/commit.c | 2 +-
|
|
|
0a122b |
block/mirror.c | 2 +-
|
|
|
0a122b |
block/stream.c | 2 +-
|
|
|
0a122b |
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
block/commit.c | 2 +-
|
|
|
0a122b |
block/mirror.c | 2 +-
|
|
|
0a122b |
block/stream.c | 2 +-
|
|
|
0a122b |
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
diff --git a/block/commit.c b/block/commit.c
|
|
|
0a122b |
index 74c209a..37572f0 100644
|
|
|
0a122b |
--- a/block/commit.c
|
|
|
0a122b |
+++ b/block/commit.c
|
|
|
0a122b |
@@ -173,7 +173,7 @@ static void commit_set_speed(BlockJob *job, int64_t speed, Error **errp)
|
|
|
0a122b |
ratelimit_set_speed(&s->limit, speed / BDRV_SECTOR_SIZE, SLICE_TIME);
|
|
|
0a122b |
}
|
|
|
0a122b |
|
|
|
0a122b |
-static BlockJobType commit_job_type = {
|
|
|
0a122b |
+static const BlockJobType commit_job_type = {
|
|
|
0a122b |
.instance_size = sizeof(CommitBlockJob),
|
|
|
0a122b |
.job_type = "commit",
|
|
|
0a122b |
.set_speed = commit_set_speed,
|
|
|
0a122b |
diff --git a/block/mirror.c b/block/mirror.c
|
|
|
0a122b |
index 6843e70..342c90d 100644
|
|
|
0a122b |
--- a/block/mirror.c
|
|
|
0a122b |
+++ b/block/mirror.c
|
|
|
0a122b |
@@ -525,7 +525,7 @@ static void mirror_complete(BlockJob *job, Error **errp)
|
|
|
0a122b |
block_job_resume(job);
|
|
|
0a122b |
}
|
|
|
0a122b |
|
|
|
0a122b |
-static BlockJobType mirror_job_type = {
|
|
|
0a122b |
+static const BlockJobType mirror_job_type = {
|
|
|
0a122b |
.instance_size = sizeof(MirrorBlockJob),
|
|
|
0a122b |
.job_type = "mirror",
|
|
|
0a122b |
.set_speed = mirror_set_speed,
|
|
|
0a122b |
diff --git a/block/stream.c b/block/stream.c
|
|
|
0a122b |
index 82fb179..ce16b0b 100644
|
|
|
0a122b |
--- a/block/stream.c
|
|
|
0a122b |
+++ b/block/stream.c
|
|
|
0a122b |
@@ -204,7 +204,7 @@ static void stream_set_speed(BlockJob *job, int64_t speed, Error **errp)
|
|
|
0a122b |
ratelimit_set_speed(&s->limit, speed / BDRV_SECTOR_SIZE, SLICE_TIME);
|
|
|
0a122b |
}
|
|
|
0a122b |
|
|
|
0a122b |
-static BlockJobType stream_job_type = {
|
|
|
0a122b |
+static const BlockJobType stream_job_type = {
|
|
|
0a122b |
.instance_size = sizeof(StreamBlockJob),
|
|
|
0a122b |
.job_type = "stream",
|
|
|
0a122b |
.set_speed = stream_set_speed,
|
|
|
0a122b |
--
|
|
|
0a122b |
1.7.1
|
|
|
0a122b |
|