|
 |
9ae3a8 |
From ce9a0218020c6f9c97eb787eb3381344759becc9 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
Date: Fri, 17 Jan 2014 03:07:56 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 13/34] qapi: make use of new BlockJobType
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1389928083-8921-12-git-send-email-famz@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 56773
|
|
|
9ae3a8 |
O-Subject: [RHEL-7 qemu-kvm PATCH 11/18] qapi: make use of new BlockJobType
|
|
|
9ae3a8 |
Bugzilla: 1041301
|
|
|
9ae3a8 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Switch the string to enum type BlockJobType in BlockJobDriver.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 79e14bf7782d861d3d773a67680de07a8f354f4e)
|
|
|
9ae3a8 |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Conflicts:
|
|
|
9ae3a8 |
block/backup.c
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Not present downstream.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block/commit.c | 2 +-
|
|
|
9ae3a8 |
block/mirror.c | 2 +-
|
|
|
9ae3a8 |
block/stream.c | 2 +-
|
|
|
9ae3a8 |
blockjob.c | 4 ++--
|
|
|
9ae3a8 |
include/block/blockjob.h | 2 +-
|
|
|
9ae3a8 |
5 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block/commit.c | 2 +-
|
|
|
9ae3a8 |
block/mirror.c | 2 +-
|
|
|
9ae3a8 |
block/stream.c | 2 +-
|
|
|
9ae3a8 |
blockjob.c | 4 ++--
|
|
|
9ae3a8 |
include/block/blockjob.h | 2 +-
|
|
|
9ae3a8 |
5 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/block/commit.c b/block/commit.c
|
|
|
9ae3a8 |
index 28f45e4..d237729 100644
|
|
|
9ae3a8 |
--- a/block/commit.c
|
|
|
9ae3a8 |
+++ b/block/commit.c
|
|
|
9ae3a8 |
@@ -175,7 +175,7 @@ static void commit_set_speed(BlockJob *job, int64_t speed, Error **errp)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static const BlockJobDriver commit_job_driver = {
|
|
|
9ae3a8 |
.instance_size = sizeof(CommitBlockJob),
|
|
|
9ae3a8 |
- .job_type = "commit",
|
|
|
9ae3a8 |
+ .job_type = BLOCK_JOB_TYPE_COMMIT,
|
|
|
9ae3a8 |
.set_speed = commit_set_speed,
|
|
|
9ae3a8 |
};
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/block/mirror.c b/block/mirror.c
|
|
|
9ae3a8 |
index 139be06..8837186 100644
|
|
|
9ae3a8 |
--- a/block/mirror.c
|
|
|
9ae3a8 |
+++ b/block/mirror.c
|
|
|
9ae3a8 |
@@ -527,7 +527,7 @@ static void mirror_complete(BlockJob *job, Error **errp)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static const BlockJobDriver mirror_job_driver = {
|
|
|
9ae3a8 |
.instance_size = sizeof(MirrorBlockJob),
|
|
|
9ae3a8 |
- .job_type = "mirror",
|
|
|
9ae3a8 |
+ .job_type = BLOCK_JOB_TYPE_MIRROR,
|
|
|
9ae3a8 |
.set_speed = mirror_set_speed,
|
|
|
9ae3a8 |
.iostatus_reset= mirror_iostatus_reset,
|
|
|
9ae3a8 |
.complete = mirror_complete,
|
|
|
9ae3a8 |
diff --git a/block/stream.c b/block/stream.c
|
|
|
9ae3a8 |
index ffa4e9a..1420d09 100644
|
|
|
9ae3a8 |
--- a/block/stream.c
|
|
|
9ae3a8 |
+++ b/block/stream.c
|
|
|
9ae3a8 |
@@ -206,7 +206,7 @@ static void stream_set_speed(BlockJob *job, int64_t speed, Error **errp)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static const BlockJobDriver stream_job_driver = {
|
|
|
9ae3a8 |
.instance_size = sizeof(StreamBlockJob),
|
|
|
9ae3a8 |
- .job_type = "stream",
|
|
|
9ae3a8 |
+ .job_type = BLOCK_JOB_TYPE_STREAM,
|
|
|
9ae3a8 |
.set_speed = stream_set_speed,
|
|
|
9ae3a8 |
};
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/blockjob.c b/blockjob.c
|
|
|
9ae3a8 |
index dc0fa6d..a4430a0 100644
|
|
|
9ae3a8 |
--- a/blockjob.c
|
|
|
9ae3a8 |
+++ b/blockjob.c
|
|
|
9ae3a8 |
@@ -209,7 +209,7 @@ void block_job_sleep_ns(BlockJob *job, QEMUClock *clock, int64_t ns)
|
|
|
9ae3a8 |
BlockJobInfo *block_job_query(BlockJob *job)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
BlockJobInfo *info = g_new0(BlockJobInfo, 1);
|
|
|
9ae3a8 |
- info->type = g_strdup(job->driver->job_type);
|
|
|
9ae3a8 |
+ info->type = g_strdup(BlockJobType_lookup[job->driver->job_type]);
|
|
|
9ae3a8 |
info->device = g_strdup(bdrv_get_device_name(job->bs));
|
|
|
9ae3a8 |
info->len = job->len;
|
|
|
9ae3a8 |
info->busy = job->busy;
|
|
|
9ae3a8 |
@@ -236,7 +236,7 @@ QObject *qobject_from_block_job(BlockJob *job)
|
|
|
9ae3a8 |
"'len': %" PRId64 ","
|
|
|
9ae3a8 |
"'offset': %" PRId64 ","
|
|
|
9ae3a8 |
"'speed': %" PRId64 " }",
|
|
|
9ae3a8 |
- job->driver->job_type,
|
|
|
9ae3a8 |
+ BlockJobType_lookup[job->driver->job_type],
|
|
|
9ae3a8 |
bdrv_get_device_name(job->bs),
|
|
|
9ae3a8 |
job->len,
|
|
|
9ae3a8 |
job->offset,
|
|
|
9ae3a8 |
diff --git a/include/block/blockjob.h b/include/block/blockjob.h
|
|
|
9ae3a8 |
index dadcd48..5a7d859 100644
|
|
|
9ae3a8 |
--- a/include/block/blockjob.h
|
|
|
9ae3a8 |
+++ b/include/block/blockjob.h
|
|
|
9ae3a8 |
@@ -37,7 +37,7 @@ typedef struct BlockJobDriver {
|
|
|
9ae3a8 |
size_t instance_size;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
/** String describing the operation, part of query-block-jobs QMP API */
|
|
|
9ae3a8 |
- const char *job_type;
|
|
|
9ae3a8 |
+ BlockJobType job_type;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
/** Optional callback for job types that support setting a speed limit */
|
|
|
9ae3a8 |
void (*set_speed)(BlockJob *job, int64_t speed, Error **errp);
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|