RFC: [for 5.0]: HMP monitor handlers cleanups
Subsystems (2)
v2 cover RFC: [for 5.0]: HMP monitor handlers cleanups
This patch series is bunch of cleanups
to the hmp monitor code.
This series only touched blockdev related hmp handlers.
No functional changes expected other that
light error message changes by the last patch.
This was inspired by this bugzilla:
https://bugzilla.redhat.com/show_bug.cgi?id=1719169
Basically some users still parse hmp error messages, and they would like to have them prefixed with 'Error:'
In commit 66363e9a43f649360a3f74d2805c9f864da027eb we added the hmp_handle_error which does exactl that but some hmp handlers don't use it.
In this patch series, I moved all the block related hmp handlers into blockdev-hmp-cmds.c, and then made them use this function to report the errors.
I hope I didn't change too much code, I just felt that if I touch this code, I can also make it easier to find these handlers, that were scattered over 3 different files.
Changes from V1:
* move the handlers to block/monitor/block-hmp-cmds.c
* tiny cleanup for the commit messages
Best regards,
Maxim Levitsky
Maxim Levitsky (9):
monitor/hmp: uninline add_init_drive
monitor/hmp: rename device-hotplug.c to block/monitor/block-hmp-cmds.c monitor/hmp: move hmp_drive_del and hmp_commit to block-hmp-cmds.c monitor/hmp: move hmp_drive_mirror and hmp_drive_backup to
block-hmp-cmds.c
monitor/hmp: move hmp_block_job* to block-hmp-cmds.c monitor/hmp: move hmp_snapshot_* to block-hmp-cmds.c monitor/hmp: move remaining hmp_block* functions to block-hmp-cmds.c monitor/hmp: move hmp_info_block* to block-hmp-cmds.c monitor/hmp: Prefer to use hmp_handle_error for error reporting in
block hmp commands
MAINTAINERS | 1 + Makefile.objs | 2 +- block/Makefile.objs | 1 + block/monitor/Makefile.objs | 1 + block/monitor/block-hmp-cmds.c | 656 +++++++++++++++++++++++++++++++++ blockdev.c | 95 ----- device-hotplug.c | 91 ----- monitor/hmp-cmds.c | 465 ----------------------- 8 files changed, 660 insertions(+), 652 deletions(-) create mode 100644 block/monitor/Makefile.objs create mode 100644 block/monitor/block-hmp-cmds.c delete mode 100644 device-hotplug.c
Signature · 1 line
2.17.2
PATCH v2 1/9 monitor/hmp: uninline add_init_drive
This is only used by hmp_drive_add.
The code is just a bit shorter this way.
No functional changes
--- device-hotplug.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-)
device-hotplug.c +13 -20
@@ -34,42 +34,35 @@#include "monitor/monitor.h" #include "block/block_int.h" -static DriveInfo *add_init_drive (const char *optstr) + +void hmp_drive_add (Monitor *mon,const QDict *qdict) {Error *err =NULL ; -DriveInfo *dinfo; +DriveInfo *dinfo =NULL ;QemuOpts *opts;MachineClass *mc; +const char *optstr =qdict_get_str (qdict,"opts" ); +bool node =qdict_get_try_bool (qdict,"node" , false); + +if (node) { +hmp_drive_add_node (mon, optstr); +return ; + } opts =drive_def (optstr);if (!opts) -return NULL ; +return ; mc =MACHINE_GET_CLASS (current_machine); dinfo =drive_new (opts, mc->block_default_type, &err);if (err) {error_report_err (err);qemu_opts_del (opts); -return NULL ; - } - -return dinfo; -} - -void hmp_drive_add (Monitor *mon,const QDict *qdict) -{ -DriveInfo *dinfo =NULL ; -const char *opts =qdict_get_str (qdict,"opts" ); -bool node =qdict_get_try_bool (qdict,"node" , false); - -if (node) { -hmp_drive_add_node (mon, opts); -return ; + goto err; } - dinfo =add_init_drive (opts);if (!dinfo) { - goto err; +return ; }switch (dinfo->type) {
Signature · 1 line
2.17.2
PATCH v2 2/9 monitor/hmp: rename device-hotplug.c to block/monitor/block-hmp-cmds.c
In reply to Maxim LevitskyThese days device-hotplug.c only contains the hmp_drive_add In the next patch, rest of hmp_drive* functions will be moved there.
--- MAINTAINERS | 1 + Makefile.objs | 2 +- block/Makefile.objs | 1 + block/monitor/Makefile.objs | 1 + device-hotplug.c => block/monitor/block-hmp-cmds.c | 2 +- 5 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 block/monitor/Makefile.objs rename device-hotplug.c => block/monitor/block-hmp-cmds.c (98%)
MAINTAINERS +1 -0
@@ -1855,6 +1855,7 @@ Block QAPI, monitor, command line M: Markus Armbruster <[email protected]> S: Supported F: blockdev.c +F: blockdev-hmp-cmds.c F: block/qapi.c F: qapi/block*.json F: qapi/transaction.json
Makefile.objs +1 -1
@@ -49,7 +49,7 @@ common-obj-y += dump/ common-obj-y += job-qmp.o common-obj-y += monitor/ common-obj-y += net/ -common-obj-y += qdev-monitor.o device-hotplug.o +common-obj-y += qdev-monitor.o common-obj-$(CONFIG_WIN32) += os-win32.o common-obj-$(CONFIG_POSIX) += os-posix.o
block/Makefile.objs +1 -0
@@ -43,6 +43,7 @@ block-obj-y += crypto.o block-obj-y += aio_task.o block-obj-y += backup-top.o +common-obj-y += monitor/ common-obj-y += stream.o
block/monitor/Makefile.objs new file +1 -0
@@ -0,0 +1 @@ +common-obj-y += block-hmp-cmds.o
block/monitor/block-hmp-cmds.c renamed from device-hotplug.c +1 -1
@@ -1,5 +1,5 @@/* -* QEMU device hotplug helpers +* Blockdev HMP commands * * Copyright (c) 2004 Fabrice Bellard *
Signature · 1 line
2.17.2
PATCH v2 3/9 monitor/hmp: move hmp_drive_del and hmp_commit to block-hmp-cmds.c
In reply to Maxim Levitsky--- block/monitor/block-hmp-cmds.c | 97 +++++++++++++++++++++++++++++++++- blockdev.c | 95 --------------------------------- 2 files changed, 96 insertions(+), 96 deletions(-)
block/monitor/block-hmp-cmds.c +96 -1
@@ -33,7 +33,7 @@#include "sysemu/sysemu.h" #include "monitor/monitor.h" #include "block/block_int.h" - +#include "qapi/qapi-commands-block.h" void hmp_drive_add (Monitor *mon,const QDict *qdict) {
@@ -82,3 +82,98 @@ err:blk_unref (blk); } } + +void hmp_drive_del (Monitor *mon,const QDict *qdict) +{ +const char *id =qdict_get_str (qdict,"id" ); +BlockBackend *blk; +BlockDriverState *bs; +AioContext *aio_context; +Error *local_err =NULL ; + + bs =bdrv_find_node (id); +if (bs) { +qmp_blockdev_del (id, &local_err); +if (local_err) { +error_report_err (local_err); + } +return ; + } + + blk =blk_by_name (id); +if (!blk) { +error_report ("Device '%s' not found" , id); +return ; + } + +if (!blk_legacy_dinfo (blk)) { +error_report ("Deleting device added with blockdev-add" +" is not supported" ); +return ; + } + + aio_context =blk_get_aio_context (blk); +aio_context_acquire (aio_context); + + bs =blk_bs (blk); +if (bs) { +if (bdrv_op_is_blocked (bs,BLOCK_OP_TYPE_DRIVE_DEL , &local_err)) { +error_report_err (local_err); +aio_context_release (aio_context); +return ; + } + +blk_remove_bs (blk); + } + +/* Make the BlockBackend and the attached BlockDriverState anonymous */ +monitor_remove_blk (blk); + +/* If this BlockBackend has a device attached to it, its refcount will be +* decremented when the device is removed; otherwise we have to do so here. +*/ +if (blk_get_attached_dev (blk)) { +/* Further I/O must not pause the guest */ +blk_set_on_error (blk,BLOCKDEV_ON_ERROR_REPORT , +BLOCKDEV_ON_ERROR_REPORT ); + }else { +blk_unref (blk); + } + +aio_context_release (aio_context); +} + +void hmp_commit (Monitor *mon,const QDict *qdict) +{ +const char *device =qdict_get_str (qdict,"device" ); +BlockBackend *blk; +int ret; + +if (!strcmp (device,"all" )) { + ret =blk_commit_all (); + }else { +BlockDriverState *bs; +AioContext *aio_context; + + blk =blk_by_name (device); +if (!blk) { +error_report ("Device '%s' not found" , device); +return ; + } +if (!blk_is_available (blk)) { +error_report ("Device '%s' has no medium" , device); +return ; + } + + bs =blk_bs (blk); + aio_context =bdrv_get_aio_context (bs); +aio_context_acquire (aio_context); + + ret =bdrv_commit (bs); + +aio_context_release (aio_context); + } +if (ret <0 ) { +error_report ("'commit' error for '%s': %s" , device,strerror (-ret)); + } +}
blockdev.c +0 -95
107 lines not on this page · raw message
Signature · 1 line
2.17.2
PATCH v2 4/9 monitor/hmp: move hmp_drive_mirror and hmp_drive_backup to block-hmp-cmds.c
In reply to Maxim Levitsky--- block/monitor/block-hmp-cmds.c | 61 ++++++++++++++++++++++++++++++++++ monitor/hmp-cmds.c | 58 -------------------------------- 2 files changed, 61 insertions(+), 58 deletions(-)
block/monitor/block-hmp-cmds.c +61 -0
@@ -34,6 +34,8 @@#include "monitor/monitor.h" #include "block/block_int.h" #include "qapi/qapi-commands-block.h" +#include "qapi/qmp/qerror.h" +#include "monitor/hmp.h" void hmp_drive_add (Monitor *mon,const QDict *qdict) {
@@ -177,3 +179,62 @@ void hmp_commit(Monitor *mon, const QDict *qdict)error_report ("'commit' error for '%s': %s" , device,strerror (-ret)); } } + +void hmp_drive_mirror (Monitor *mon,const QDict *qdict) +{ +const char *filename =qdict_get_str (qdict,"target" ); +const char *format =qdict_get_try_str (qdict,"format" ); +bool reuse =qdict_get_try_bool (qdict,"reuse" , false); +bool full =qdict_get_try_bool (qdict,"full" , false); +Error *err =NULL ; +DriveMirror mirror = { + .device = (char *)qdict_get_str (qdict,"device" ), + .target = (char *)filename, + .has_format = !!format, + .format = (char *)format, + .sync = full ?MIRROR_SYNC_MODE_FULL :MIRROR_SYNC_MODE_TOP , + .has_mode = true, + .mode = reuse ?NEW_IMAGE_MODE_EXISTING :NEW_IMAGE_MODE_ABSOLUTE_PATHS , + .unmap = true, + }; + +if (!filename) { +error_setg (&err,QERR_MISSING_PARAMETER ,"target" ); +hmp_handle_error (mon, &err); +return ; + } +qmp_drive_mirror (&mirror, &err); +hmp_handle_error (mon, &err); +} + +void hmp_drive_backup (Monitor *mon,const QDict *qdict) +{ +const char *device =qdict_get_str (qdict,"device" ); +const char *filename =qdict_get_str (qdict,"target" ); +const char *format =qdict_get_try_str (qdict,"format" ); +bool reuse =qdict_get_try_bool (qdict,"reuse" , false); +bool full =qdict_get_try_bool (qdict,"full" , false); +bool compress =qdict_get_try_bool (qdict,"compress" , false); +Error *err =NULL ; +DriveBackup backup = { + .device = (char *)device, + .target = (char *)filename, + .has_format = !!format, + .format = (char *)format, + .sync = full ?MIRROR_SYNC_MODE_FULL :MIRROR_SYNC_MODE_TOP , + .has_mode = true, + .mode = reuse ?NEW_IMAGE_MODE_EXISTING :NEW_IMAGE_MODE_ABSOLUTE_PATHS , + .has_compress = !!compress, + .compress = compress, + }; + +if (!filename) { +error_setg (&err,QERR_MISSING_PARAMETER ,"target" ); +hmp_handle_error (mon, &err); +return ; + } + +qmp_drive_backup (&backup, &err); +hmp_handle_error (mon, &err); +} +
monitor/hmp-cmds.c +0 -58
64 lines not on this page · raw message
Signature · 1 line
2.17.2
PATCH v2 5/9 monitor/hmp: move hmp_block_job* to block-hmp-cmds.c
In reply to Maxim Levitsky--- block/monitor/block-hmp-cmds.c | 52 ++++++++++++++++++++++++++++++++++ monitor/hmp-cmds.c | 52 ---------------------------------- 2 files changed, 52 insertions(+), 52 deletions(-)
block/monitor/block-hmp-cmds.c +52 -0
@@ -238,3 +238,55 @@ void hmp_drive_backup(Monitor *mon, const QDict *qdict)hmp_handle_error (mon, &err); } + +void hmp_block_job_set_speed (Monitor *mon,const QDict *qdict) +{ +Error *error =NULL ; +const char *device =qdict_get_str (qdict,"device" ); +int64_t value =qdict_get_int (qdict,"speed" ); + +qmp_block_job_set_speed (device, value, &error); + +hmp_handle_error (mon, &error); +} + +void hmp_block_job_cancel (Monitor *mon,const QDict *qdict) +{ +Error *error =NULL ; +const char *device =qdict_get_str (qdict,"device" ); +bool force =qdict_get_try_bool (qdict,"force" , false); + +qmp_block_job_cancel (device, true, force, &error); + +hmp_handle_error (mon, &error); +} + +void hmp_block_job_pause (Monitor *mon,const QDict *qdict) +{ +Error *error =NULL ; +const char *device =qdict_get_str (qdict,"device" ); + +qmp_block_job_pause (device, &error); + +hmp_handle_error (mon, &error); +} + +void hmp_block_job_resume (Monitor *mon,const QDict *qdict) +{ +Error *error =NULL ; +const char *device =qdict_get_str (qdict,"device" ); + +qmp_block_job_resume (device, &error); + +hmp_handle_error (mon, &error); +} + +void hmp_block_job_complete (Monitor *mon,const QDict *qdict) +{ +Error *error =NULL ; +const char *device =qdict_get_str (qdict,"device" ); + +qmp_block_job_complete (device, &error); + +hmp_handle_error (mon, &error); +}
monitor/hmp-cmds.c +0 -52
58 lines not on this page · raw message
Signature · 1 line
2.17.2
PATCH v2 6/9 monitor/hmp: move hmp_snapshot_* to block-hmp-cmds.c
In reply to Maxim Levitsky--- block/monitor/block-hmp-cmds.c | 47 ++++++++++++++++++++++++++++++++++ monitor/hmp-cmds.c | 46 --------------------------------- 2 files changed, 47 insertions(+), 46 deletions(-)
block/monitor/block-hmp-cmds.c +47 -0
@@ -290,3 +290,50 @@ void hmp_block_job_complete(Monitor *mon, const QDict *qdict)hmp_handle_error (mon, &error); } + +void hmp_snapshot_blkdev (Monitor *mon,const QDict *qdict) +{ +const char *device =qdict_get_str (qdict,"device" ); +const char *filename =qdict_get_try_str (qdict,"snapshot-file" ); +const char *format =qdict_get_try_str (qdict,"format" ); +bool reuse =qdict_get_try_bool (qdict,"reuse" , false); +enum NewImageMode mode; +Error *err =NULL ; + +if (!filename) { +/* In the future, if 'snapshot-file' is not specified, the snapshot +will be taken internally. Today it's actually required. */ +error_setg (&err,QERR_MISSING_PARAMETER ,"snapshot-file" ); +hmp_handle_error (mon, &err); +return ; + } + + mode = reuse ?NEW_IMAGE_MODE_EXISTING :NEW_IMAGE_MODE_ABSOLUTE_PATHS ; +qmp_blockdev_snapshot_sync (true, device, false,NULL , + filename, false,NULL , + !!format, format, + true, mode, &err); +hmp_handle_error (mon, &err); +} + +void hmp_snapshot_blkdev_internal (Monitor *mon,const QDict *qdict) +{ +const char *device =qdict_get_str (qdict,"device" ); +const char *name =qdict_get_str (qdict,"name" ); +Error *err =NULL ; + +qmp_blockdev_snapshot_internal_sync (device, name, &err); +hmp_handle_error (mon, &err); +} + +void hmp_snapshot_delete_blkdev_internal (Monitor *mon,const QDict *qdict) +{ +const char *device =qdict_get_str (qdict,"device" ); +const char *name =qdict_get_str (qdict,"name" ); +const char *id =qdict_get_try_str (qdict,"id" ); +Error *err =NULL ; + +qmp_blockdev_snapshot_delete_internal_sync (device, !!id, id, + true, name, &err); +hmp_handle_error (mon, &err); +}
monitor/hmp-cmds.c +0 -46
52 lines not on this page · raw message
Signature · 1 line
2.17.2
PATCH v2 7/9 monitor/hmp: move remaining hmp_block* functions to block-hmp-cmds.c
In reply to Maxim Levitsky--- block/monitor/block-hmp-cmds.c | 63 +++++++++++++++++++++++++++++++++ monitor/hmp-cmds.c | 64 ---------------------------------- 2 files changed, 63 insertions(+), 64 deletions(-)
block/monitor/block-hmp-cmds.c +63 -0
@@ -337,3 +337,66 @@ void hmp_snapshot_delete_blkdev_internal(Monitor *mon, const QDict *qdict) true, name, &err);hmp_handle_error (mon, &err); } + +void hmp_block_resize (Monitor *mon,const QDict *qdict) +{ +const char *device =qdict_get_str (qdict,"device" ); +int64_t size =qdict_get_int (qdict,"size" ); +Error *err =NULL ; + +qmp_block_resize (true, device, false,NULL , size, &err); +hmp_handle_error (mon, &err); +} + +void hmp_block_stream (Monitor *mon,const QDict *qdict) +{ +Error *error =NULL ; +const char *device =qdict_get_str (qdict,"device" ); +const char *base =qdict_get_try_str (qdict,"base" ); +int64_t speed =qdict_get_try_int (qdict,"speed" ,0 ); + +qmp_block_stream (true, device, device, base !=NULL , base, false,NULL , + false,NULL ,qdict_haskey (qdict,"speed" ), speed, true, +BLOCKDEV_ON_ERROR_REPORT , false, false, false, false, + &error); + +hmp_handle_error (mon, &error); +} + +void hmp_block_passwd (Monitor *mon,const QDict *qdict) +{ +const char *device =qdict_get_str (qdict,"device" ); +const char *password =qdict_get_str (qdict,"password" ); +Error *err =NULL ; + +qmp_block_passwd (true, device, false,NULL , password, &err); +hmp_handle_error (mon, &err); +} + +void hmp_block_set_io_throttle (Monitor *mon,const QDict *qdict) +{ +Error *err =NULL ; +char *device = (char *)qdict_get_str (qdict,"device" ); +BlockIOThrottle throttle = { + .bps =qdict_get_int (qdict,"bps" ), + .bps_rd =qdict_get_int (qdict,"bps_rd" ), + .bps_wr =qdict_get_int (qdict,"bps_wr" ), + .iops =qdict_get_int (qdict,"iops" ), + .iops_rd =qdict_get_int (qdict,"iops_rd" ), + .iops_wr =qdict_get_int (qdict,"iops_wr" ), + }; + +/* qmp_block_set_io_throttle has separate parameters for the +* (deprecated) block device name and the qdev ID but the HMP +* version has only one, so we must decide which one to pass. */ +if (blk_by_name (device)) { + throttle.has_device = true; + throttle.device = device; + }else { + throttle.has_id = true; + throttle.id = device; + } + +qmp_block_set_io_throttle (&throttle, &err); +hmp_handle_error (mon, &err); +}
monitor/hmp-cmds.c +0 -64
82 lines not on this page · raw message
Signature · 1 line
2.17.2
PATCH v2 8/9 monitor/hmp: move hmp_info_block* to block-hmp-cmds.c
In reply to Maxim Levitsky--- block/monitor/block-hmp-cmds.c | 247 +++++++++++++++++++++++++++++++++ monitor/hmp-cmds.c | 245 -------------------------------- 2 files changed, 247 insertions(+), 245 deletions(-)
block/monitor/block-hmp-cmds.c +247 -0
@@ -33,6 +33,7 @@#include "sysemu/sysemu.h" #include "monitor/monitor.h" #include "block/block_int.h" +#include "block/qapi.h" #include "qapi/qapi-commands-block.h" #include "qapi/qmp/qerror.h" #include "monitor/hmp.h"
@@ -400,3 +401,249 @@ void hmp_block_set_io_throttle(Monitor *mon, const QDict *qdict)qmp_block_set_io_throttle (&throttle, &err);hmp_handle_error (mon, &err); } + +static void print_block_info (Monitor *mon,BlockInfo *info, +BlockDeviceInfo *inserted,bool verbose) +{ +ImageInfo *image_info; + +assert (!info || !info->has_inserted || info->inserted == inserted); + +if (info && *info->device) { +monitor_printf (mon,"%s" , info->device); +if (inserted && inserted->has_node_name) { +monitor_printf (mon," (%s)" , inserted->node_name); + } + }else { +assert (info || inserted); +monitor_printf (mon,"%s" , + inserted && inserted->has_node_name ? inserted->node_name + : info && info->has_qdev ? info->qdev + :"<anonymous>" ); + } + +if (inserted) { +monitor_printf (mon,": %s (%s%s%s)\n" , + inserted->file, + inserted->drv, + inserted->ro ?", read-only" :"" , + inserted->encrypted ?", encrypted" :"" ); + }else { +monitor_printf (mon,": [not inserted]\n" ); + } + +if (info) { +if (info->has_qdev) { +monitor_printf (mon," Attached to: %s\n" , info->qdev); + } +if (info->has_io_status && info->io_status !=BLOCK_DEVICE_IO_STATUS_OK ) { +monitor_printf (mon," I/O status: %s\n" , +BlockDeviceIoStatus_str (info->io_status)); + } + +if (info->removable) { +monitor_printf (mon," Removable device: %slocked, tray %s\n" , + info->locked ?"" :"not " , + info->tray_open ?"open" :"closed" ); + } + } + + +if (!inserted) { +return ; + } + +monitor_printf (mon," Cache mode: %s%s%s\n" , + inserted->cache->writeback ?"writeback" :"writethrough" , + inserted->cache->direct ?", direct" :"" , + inserted->cache->no_flush ?", ignore flushes" :"" ); + +if (inserted->has_backing_file) { +monitor_printf (mon, +" Backing file: %s " +"(chain depth: %" PRId64")\n" , + inserted->backing_file, + inserted->backing_file_depth); + } + +if (inserted->detect_zeroes !=BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF ) { +monitor_printf (mon," Detect zeroes: %s\n" , +BlockdevDetectZeroesOptions_str (inserted->detect_zeroes)); + } + +if (inserted->bps || inserted->bps_rd || inserted->bps_wr || + inserted->iops || inserted->iops_rd || inserted->iops_wr) + { +monitor_printf (mon," I/O throttling: bps=%" PRId64 +" bps_rd=%" PRId64" bps_wr=%" PRId64 +" bps_max=%" PRId64 +" bps_rd_max=%" PRId64 +" bps_wr_max=%" PRId64 +" iops=%" PRId64" iops_rd=%" PRId64 +" iops_wr=%" PRId64 +" iops_max=%" PRId64 +" iops_rd_max=%" PRId64 +" iops_wr_max=%" PRId64 +" iops_size=%" PRId64 +" group=%s\n" , + inserted->bps, + inserted->bps_rd, + inserted->bps_wr, + inserted->bps_max, + inserted->bps_rd_max, + inserted->bps_wr_max, + inserted->iops, + inserted->iops_rd, + inserted->iops_wr, + inserted->iops_max, + inserted->iops_rd_max, + inserted->iops_wr_max, + inserted->iops_size, + inserted->group); + } + +if (verbose) { +monitor_printf (mon,"\nImages:\n" ); + image_info = inserted->image; +while (1 ) { +bdrv_image_info_dump (image_info); +if (image_info->has_backing_image) { + image_info = image_info->backing_image; + }else { +break ; + } + } + } +} + +void hmp_info_block (Monitor *mon,const QDict *qdict) +{ +BlockInfoList *block_list, *info; +BlockDeviceInfoList *blockdev_list, *blockdev; +const char *device =qdict_get_try_str (qdict,"device" ); +bool verbose =qdict_get_try_bool (qdict,"verbose" , false); +bool nodes =qdict_get_try_bool (qdict,"nodes" , false); +bool printed = false; + +/* Print BlockBackend information */ +if (!nodes) { + block_list =qmp_query_block (NULL ); + }else { + block_list =NULL ; + } + +for (info = block_list; info; info = info->next) { +if (device &&strcmp (device, info->value->device)) { +continue ; + } + +if (info != block_list) { +monitor_printf (mon,"\n" ); + } + +print_block_info (mon, info->value, info->value->has_inserted + ? info->value->inserted :NULL , + verbose); + printed = true; + } + +qapi_free_BlockInfoList (block_list); + +if ((!device && !nodes) || printed) { +return ; + } + +/* Print node information */ + blockdev_list =qmp_query_named_block_nodes (NULL ); +for (blockdev = blockdev_list; blockdev; blockdev = blockdev->next) { +assert (blockdev->value->has_node_name); +if (device &&strcmp (device, blockdev->value->node_name)) { +continue ; + } + +if (blockdev != blockdev_list) { +monitor_printf (mon,"\n" ); + } + +print_block_info (mon,NULL , blockdev->value, verbose); + } +qapi_free_BlockDeviceInfoList (blockdev_list); +} + +void hmp_info_blockstats (Monitor *mon,const QDict *qdict) +{ +BlockStatsList *stats_list, *stats; + + stats_list =qmp_query_blockstats (false, false,NULL ); + +for (stats = stats_list; stats; stats = stats->next) { +if (!stats->value->has_device) { +continue ; + } + +monitor_printf (mon,"%s:" , stats->value->device); +monitor_printf (mon," rd_bytes=%" PRId64 +" wr_bytes=%" PRId64 +" rd_operations=%" PRId64 +" wr_operations=%" PRId64 +" flush_operations=%" PRId64 +" wr_total_time_ns=%" PRId64 +" rd_total_time_ns=%" PRId64 +" flush_total_time_ns=%" PRId64 +" rd_merged=%" PRId64 +" wr_merged=%" PRId64 +" idle_time_ns=%" PRId64 +"\n" , + stats->value->stats->rd_bytes, + stats->value->stats->wr_bytes, + stats->value->stats->rd_operations, + stats->value->stats->wr_operations, + stats->value->stats->flush_operations, + stats->value->stats->wr_total_time_ns, + stats->value->stats->rd_total_time_ns, + stats->value->stats->flush_total_time_ns, + stats->value->stats->rd_merged, + stats->value->stats->wr_merged, + stats->value->stats->idle_time_ns); + } + +qapi_free_BlockStatsList (stats_list); +} + +void hmp_info_block_jobs (Monitor *mon,const QDict *qdict) +{ +BlockJobInfoList *list; +Error *err =NULL ; + + list =qmp_query_block_jobs (&err); +assert (!err); + +if (!list) { +monitor_printf (mon,"No active jobs\n" ); +return ; + } + +while (list) { +if (strcmp (list->value->type,"stream" ) ==0 ) { +monitor_printf (mon,"Streaming device %s: Completed %" PRId64 +" of %" PRId64" bytes, speed limit %" PRId64 +" bytes/s\n" , + list->value->device, + list->value->offset, + list->value->len, + list->value->speed); + }else { +monitor_printf (mon,"Type %s, device %s: Completed %" PRId64 +" of %" PRId64" bytes, speed limit %" PRId64 +" bytes/s\n" , + list->value->type, + list->value->device, + list->value->offset, + list->value->len, + list->value->speed); + } + list = list->next; + } + +qapi_free_BlockJobInfoList (list); +}
monitor/hmp-cmds.c +0 -245
257 lines not on this page · raw message
Signature · 1 line
2.17.2
PATCH v2 9/9 monitor/hmp: Prefer to use hmp_handle_error for error reporting in block hmp commands
In reply to Maxim LevitskyThis way they all will be prefixed with 'Error:' which some parsers (e.g libvirt) need
--- block/monitor/block-hmp-cmds.c | 35 ++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-)
block/monitor/block-hmp-cmds.c +21 -14
@@ -59,7 +59,6 @@ void hmp_drive_add(Monitor *mon, const QDict *qdict) mc =MACHINE_GET_CLASS (current_machine); dinfo =drive_new (opts, mc->block_default_type, &err);if (err) { -error_report_err (err);qemu_opts_del (opts); goto err; }
@@ -73,7 +72,7 @@ void hmp_drive_add(Monitor *mon, const QDict *qdict)monitor_printf (mon,"OK\n" );break ;default : -monitor_printf (mon,"Can't hot-add drive to type %d\n" , dinfo->type); +error_setg (&err,"Can't hot-add drive to type %d" , dinfo->type); goto err; }return ;
@@ -84,6 +83,7 @@ err:monitor_remove_blk (blk);blk_unref (blk); } +hmp_handle_error (mon, &err); }void hmp_drive_del (Monitor *mon,const QDict *qdict)
@@ -105,14 +105,14 @@ void hmp_drive_del(Monitor *mon, const QDict *qdict) blk =blk_by_name (id);if (!blk) { -error_report ("Device '%s' not found" , id); -return ; +error_setg (&local_err,"Device '%s' not found" , id); + goto err; }if (!blk_legacy_dinfo (blk)) { -error_report ("Deleting device added with blockdev-add" -" is not supported" ); -return ; +error_setg (&local_err, +"Deleting device added with blockdev-add is not supported" ); + goto err; } aio_context =blk_get_aio_context (blk);
@@ -121,9 +121,8 @@ void hmp_drive_del(Monitor *mon, const QDict *qdict) bs =blk_bs (blk);if (bs) {if (bdrv_op_is_blocked (bs,BLOCK_OP_TYPE_DRIVE_DEL , &local_err)) { -error_report_err (local_err);aio_context_release (aio_context); -return ; + goto err; }blk_remove_bs (blk);
@@ -144,12 +143,15 @@ void hmp_drive_del(Monitor *mon, const QDict *qdict) }aio_context_release (aio_context); +err: +hmp_handle_error (mon, &local_err); }void hmp_commit (Monitor *mon,const QDict *qdict) {const char *device =qdict_get_str (qdict,"device" );BlockBackend *blk; +Error *local_err =NULL ;int ret;if (!strcmp (device,"all" )) {
@@ -160,12 +162,12 @@ void hmp_commit(Monitor *mon, const QDict *qdict) blk =blk_by_name (device);if (!blk) { -error_report ("Device '%s' not found" , device); -return ; +error_setg (&local_err,"Device '%s' not found" , device); + goto err; }if (!blk_is_available (blk)) { -error_report ("Device '%s' has no medium" , device); -return ; +error_setg (&local_err,"Device '%s' has no medium" , device); + goto err; } bs =blk_bs (blk);
@@ -177,8 +179,13 @@ void hmp_commit(Monitor *mon, const QDict *qdict)aio_context_release (aio_context); }if (ret <0 ) { -error_report ("'commit' error for '%s': %s" , device,strerror (-ret)); +error_setg (&local_err, +"'commit' error for '%s': %s" , device,strerror (-ret)); + goto err; } +return ; +err: +hmp_handle_error (mon, &local_err); }void hmp_drive_mirror (Monitor *mon,const QDict *qdict)
Signature · 1 line
2.17.2
Quoted 22 lines · * Maxim Levitsky ([email protected]) wrote:
This patch series is bunch of cleanups
to the hmp monitor code.This series only touched blockdev related hmp handlers.
No functional changes expected other that
light error message changes by the last patch.This was inspired by this bugzilla:
https://bugzilla.redhat.com/show_bug.cgi?id=1719169Basically some users still parse hmp error messages, and they would like to have them prefixed with 'Error:'
In commit
66363e9a43f649360a3f74d2805c9f864da027ebwe added thehmp_handle_errorwhich does exactl that but some hmp handlers don't use it.In this patch series, I moved all the block related hmp handlers into
blockdev-hmp-cmds.c, and then made them use this function to report the errors.
Quoted 7 lines
I hope I didn't change too much code, I just felt that if I touch this code, I can also make it easier to find these handlers, that were scattered over 3 different files.
Changes from V1:
* move the handlers toblock/monitor/block-hmp-cmds.c
* tiny cleanup for the commit messages
OK, so again, from the HMP side:
Quoted 16 lines
Best regards,
Maxim LevitskyMaxim Levitsky (9):
monitor/hmp: uninlineadd_init_drive
monitor/hmp: renamedevice-hotplug.ctoblock/monitor/block-hmp-cmds.cmonitor/hmp: movehmp_drive_delandhmp_committoblock-hmp-cmds.cmonitor/hmp: movehmp_drive_mirrorandhmp_drive_backupto
block-hmp-cmds.c
monitor/hmp: move hmp_block_job* toblock-hmp-cmds.cmonitor/hmp: move hmp_snapshot_* toblock-hmp-cmds.cmonitor/hmp: move remaining hmp_block* functions toblock-hmp-cmds.cmonitor/hmp: move hmp_info_block* toblock-hmp-cmds.cmonitor/hmp: Prefer to usehmp_handle_errorfor error reporting in
block hmp commands
Quoted 16 lines
MAINTAINERS | 1 + Makefile.objs | 2 +- block/Makefile.objs | 1 + block/monitor/Makefile.objs | 1 + block/monitor/block-hmp-cmds.c | 656 +++++++++++++++++++++++++++++++++ blockdev.c | 95 ----- device-hotplug.c | 91 ----- monitor/hmp-cmds.c | 465 ----------------------- 8 files changed, 660 insertions(+), 652 deletions(-) create mode 100644 block/monitor/Makefile.objs create mode 100644 block/monitor/block-hmp-cmds.c delete mode 100644 device-hotplug.cSignature · 1 line
2.17.2
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK