[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/9] qapi/block-core: use JobType for BlockJobInfo's type
From: |
Fiona Ebner |
Subject: |
[PATCH 4/9] qapi/block-core: use JobType for BlockJobInfo's type |
Date: |
Fri, 24 Feb 2023 15:48:20 +0100 |
In preparation to turn BlockJobInfo into a union with @type as the
discriminator. That requires it to be an enum.
No functional change is intended.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
block/monitor/block-hmp-cmds.c | 4 ++--
blockjob.c | 2 +-
qapi/block-core.json | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
index 6aa5f1be0c..76e3254e93 100644
--- a/block/monitor/block-hmp-cmds.c
+++ b/block/monitor/block-hmp-cmds.c
@@ -840,7 +840,7 @@ void hmp_info_block_jobs(Monitor *mon, const QDict *qdict)
}
while (list) {
- if (strcmp(list->value->type, "stream") == 0) {
+ if (list->value->type == JOB_TYPE_STREAM) {
monitor_printf(mon, "Streaming device %s: Completed %" PRId64
" of %" PRId64 " bytes, speed limit %" PRId64
" bytes/s\n",
@@ -852,7 +852,7 @@ void hmp_info_block_jobs(Monitor *mon, const QDict *qdict)
monitor_printf(mon, "Type %s, device %s: Completed %" PRId64
" of %" PRId64 " bytes, speed limit %" PRId64
" bytes/s\n",
- list->value->type,
+ JobType_str(list->value->type),
list->value->device,
list->value->offset,
list->value->len,
diff --git a/blockjob.c b/blockjob.c
index b933d1c631..9bd51bc6ae 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -361,7 +361,7 @@ BlockJobInfo *block_job_query_locked(BlockJob *job, Error
**errp)
&progress_total);
info = g_new0(BlockJobInfo, 1);
- info->type = g_strdup(job_type_str(&job->job));
+ info->type = job_type(&job->job);
info->device = g_strdup(job->job.id);
info->busy = job->job.busy;
info->paused = job->job.pause_count > 0;
diff --git a/qapi/block-core.json b/qapi/block-core.json
index f9f464b25a..c1ac6de238 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1343,7 +1343,7 @@
# Since: 1.1
##
{ 'struct': 'BlockJobInfo',
- 'data': {'type': 'str', 'device': 'str', 'len': 'int',
+ 'data': {'type': 'JobType', 'device': 'str', 'len': 'int',
'offset': 'int', 'busy': 'bool', 'paused': 'bool', 'speed': 'int',
'io-status': 'BlockDeviceIoStatus', 'ready': 'bool',
'status': 'JobStatus',
--
2.30.2
- [PATCH 0/9] mirror: allow switching from background to active mode, Fiona Ebner, 2023/02/24
- [PATCH 4/9] qapi/block-core: use JobType for BlockJobInfo's type,
Fiona Ebner <=
- [PATCH 1/9] blockjob: introduce block-job-change QMP command, Fiona Ebner, 2023/02/24
- [PATCH 3/9] mirror: implement mirror_change method, Fiona Ebner, 2023/02/24
- [PATCH 2/9] block/mirror: set actively_synced even after the job is ready, Fiona Ebner, 2023/02/24
- [PATCH 5/9] qapi/block-core: turn BlockJobInfo into a union, Fiona Ebner, 2023/02/24
- [PATCH 6/9] blockjob: query driver-specific info via a new 'query' driver method, Fiona Ebner, 2023/02/24
- [PATCH 8/9] mirror: return the remaining dirty bytes upon query, Fiona Ebner, 2023/02/24
- [PATCH 7/9] mirror: return mirror-specific information upon query, Fiona Ebner, 2023/02/24
- [PATCH 9/9] mirror: return the total number of bytes sent upon query, Fiona Ebner, 2023/02/24