mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 01:43:39 +00:00
qapi/block-core: use JobType for BlockJobInfo's type
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> Message-ID: <20231031135431.393137-7-f.ebner@proxmox.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
2d400d15a0
commit
d67c54d05f
|
@ -846,7 +846,7 @@ void hmp_info_block_jobs(Monitor *mon, const QDict *qdict)
|
||||||
}
|
}
|
||||||
|
|
||||||
while (list) {
|
while (list) {
|
||||||
if (strcmp(list->value->type, "stream") == 0) {
|
if (list->value->type == JOB_TYPE_STREAM) {
|
||||||
monitor_printf(mon, "Streaming device %s: Completed %" PRId64
|
monitor_printf(mon, "Streaming device %s: Completed %" PRId64
|
||||||
" of %" PRId64 " bytes, speed limit %" PRId64
|
" of %" PRId64 " bytes, speed limit %" PRId64
|
||||||
" bytes/s\n",
|
" 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
|
monitor_printf(mon, "Type %s, device %s: Completed %" PRId64
|
||||||
" of %" PRId64 " bytes, speed limit %" PRId64
|
" of %" PRId64 " bytes, speed limit %" PRId64
|
||||||
" bytes/s\n",
|
" bytes/s\n",
|
||||||
list->value->type,
|
JobType_str(list->value->type),
|
||||||
list->value->device,
|
list->value->device,
|
||||||
list->value->offset,
|
list->value->offset,
|
||||||
list->value->len,
|
list->value->len,
|
||||||
|
|
|
@ -390,7 +390,7 @@ BlockJobInfo *block_job_query_locked(BlockJob *job, Error **errp)
|
||||||
&progress_total);
|
&progress_total);
|
||||||
|
|
||||||
info = g_new0(BlockJobInfo, 1);
|
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->device = g_strdup(job->job.id);
|
||||||
info->busy = job->job.busy;
|
info->busy = job->job.busy;
|
||||||
info->paused = job->job.pause_count > 0;
|
info->paused = job->job.pause_count > 0;
|
||||||
|
|
|
@ -1396,7 +1396,7 @@
|
||||||
# Since: 1.1
|
# Since: 1.1
|
||||||
##
|
##
|
||||||
{ 'struct': 'BlockJobInfo',
|
{ 'struct': 'BlockJobInfo',
|
||||||
'data': {'type': 'str', 'device': 'str', 'len': 'int',
|
'data': {'type': 'JobType', 'device': 'str', 'len': 'int',
|
||||||
'offset': 'int', 'busy': 'bool', 'paused': 'bool', 'speed': 'int',
|
'offset': 'int', 'busy': 'bool', 'paused': 'bool', 'speed': 'int',
|
||||||
'io-status': 'BlockDeviceIoStatus', 'ready': 'bool',
|
'io-status': 'BlockDeviceIoStatus', 'ready': 'bool',
|
||||||
'status': 'JobStatus',
|
'status': 'JobStatus',
|
||||||
|
|
Loading…
Reference in a new issue