[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 06/10] qapi/block-core: use JobType for BlockJobInfo's type
From: |
Fiona Ebner |
Subject: |
[PATCH v4 06/10] qapi/block-core: use JobType for BlockJobInfo's type |
Date: |
Tue, 31 Oct 2023 14:54:27 +0100 |
In preparation to turn BlockJobInfo into a union with @type as the
discriminator. That requires it to be an enum. Even without that
requirement, it's nicer to have an enum instead of a str here.
No functional change is intended.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---
Changes in v4:
* Mention that it's nicer to have an enum regardless in commit
message.
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 7645c7e5fb..5b2c597e7a 100644
--- a/block/monitor/block-hmp-cmds.c
+++ b/block/monitor/block-hmp-cmds.c
@@ -846,7 +846,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",
@@ -858,7 +858,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 11bae119bd..9665b02627 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -388,7 +388,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 6369207be2..9d03210664 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1396,7 +1396,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.39.2
- [PATCH v4 08/10] blockjob: query driver-specific info via a new 'query' driver method, (continued)
- [PATCH v4 08/10] blockjob: query driver-specific info via a new 'query' driver method, Fiona Ebner, 2023/10/31
- [PATCH v4 03/10] block/mirror: move dirty bitmap to filter, Fiona Ebner, 2023/10/31
- [PATCH v4 04/10] block/mirror: determine copy_to_target only once, Fiona Ebner, 2023/10/31
- [PATCH v4 01/10] blockjob: introduce block-job-change QMP command, Fiona Ebner, 2023/10/31
- [PATCH v4 02/10] block/mirror: set actively_synced even after the job is ready, Fiona Ebner, 2023/10/31
- [PATCH v4 10/10] iotests: add test for changing mirror's copy_mode, Fiona Ebner, 2023/10/31
- [PATCH v4 09/10] mirror: return mirror-specific information upon query, Fiona Ebner, 2023/10/31
- [PATCH v4 06/10] qapi/block-core: use JobType for BlockJobInfo's type,
Fiona Ebner <=
- [PATCH v4 07/10] qapi/block-core: turn BlockJobInfo into a union, Fiona Ebner, 2023/10/31
- [PATCH v4 05/10] mirror: implement mirror_change method, Fiona Ebner, 2023/10/31
- Re: [PATCH v4 00/10] mirror: allow switching from background to active mode, Kevin Wolf, 2023/10/31