HMP monitor handlers refactoring
Subsystems (2)
v5 cover HMP monitor handlers refactoring
This patch series is bunch of cleanups to the hmp monitor code. It mostly moves the blockdev related hmp handlers to its own file, and does some minor refactoring.
No functional changes expected.
Changes from V1:
* move the handlers to block/monitor/block-hmp-cmds.c
* tiny cleanup for the commit messages
Changes from V2:
* Moved all the function prototypes to new header (blockdev-hmp-cmds.h)
* Set the license of blockdev-hmp-cmds.c to GPLv2+
* Moved hmp_snapshot_* functions to blockdev-hmp-cmds.c
* Moved hmp_drive_add_node to blockdev-hmp-cmds.c
(this change needed some new exports, thus in separate new patch)
* Moved hmp_qemu_io and hmp_eject to blockdev-hmp-cmds.c
* Added 'error:' prefix to vreport, and updated the iotests This is invasive change, but really feels like the right one
* Added minor refactoring patch that drops an unused #include
Changes from V3:
* Dropped the error prefix patches for now due to fact that it seems that libvirt doesn't need that after all. Oh well... I'll send them in a separate series.
* Hopefully correctly merged the copyright info the new files Both files are GPLv2 now (due to code from hmp.h/hmp-cmds.c)
* Addressed review feedback
* Renamed the added header to block-hmp-cmds.h
* Got rid of checkpatch.pl warnings in the moved code (cosmetic code changes only)
* I kept the reviewed-by tags, since the changes I did are minor. I hope that this is right thing to do.
Changes from V4:
* Rebase with recent changes
* Fixed review feedback
Best regards,
Maxim Levitsky
Maxim Levitsky (11):
usb/dev-storage: remove unused include
monitor/hmp: inline 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 Moved code was added after 2012-01-13, thus under GPLv2+
monitor/hmp: move hmp_block_job* to block-hmp-cmds.c monitor/hmp: move hmp_snapshot_* to block-hmp-cmds.c monitor/hmp: move hmp_nbd_server* 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: Move hmp_drive_add_node to block-hmp-cmds.c
MAINTAINERS | 1 + Makefile.objs | 2 +- block/Makefile.objs | 1 + block/monitor/Makefile.objs | 1 + block/monitor/block-hmp-cmds.c | 1015 ++++++++++++++++++++++++++++++++ blockdev.c | 137 +---- device-hotplug.c | 91 --- hw/usb/dev-storage.c | 1 - include/block/block-hmp-cmds.h | 54 ++ include/block/block_int.h | 5 +- include/monitor/hmp.h | 24 - include/sysemu/blockdev.h | 4 - include/sysemu/sysemu.h | 3 - monitor/hmp-cmds.c | 782 ------------------------ monitor/misc.c | 1 + 15 files changed, 1085 insertions(+), 1037 deletions(-) create mode 100644 block/monitor/Makefile.objs create mode 100644 block/monitor/block-hmp-cmds.c delete mode 100644 device-hotplug.c create mode 100644 include/block/block-hmp-cmds.h
Signature · 1 line
2.17.2
PATCH v5 1/11 usb/dev-storage: remove unused include
--- hw/usb/dev-storage.c | 1 - 1 file changed, 1 deletion(-)
hw/usb/dev-storage.c +0 -1
@@ -19,7 +19,6 @@#include "hw/scsi/scsi.h" #include "ui/console.h" #include "migration/vmstate.h" -#include "monitor/monitor.h" #include "sysemu/sysemu.h" #include "sysemu/block-backend.h" #include "qapi/visitor.h"
Signature · 1 line
2.17.2
PATCH v5 2/11 monitor/hmp: inline add_init_drive
In reply to Maxim LevitskyThis function is only used by hmp_drive_add.
The code is just a bit shorter this way.
No functional changes
--- device-hotplug.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-)
device-hotplug.c +12 -19
@@ -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;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 v5 3/11 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.
Also add block-hmp-cmds.h to contain prototypes of these functions
License for block-hmp-cmds.h since it contains the code moved from sysemu.h which lacks license and thus according to LICENSE is under GPLv2+
--- MAINTAINERS | 1 + Makefile.objs | 2 +- block/Makefile.objs | 1 + block/monitor/Makefile.objs | 1 + .../monitor/block-hmp-cmds.c | 3 ++- include/block/block-hmp-cmds.h | 16 ++++++++++++++++ include/sysemu/sysemu.h | 3 --- monitor/misc.c | 1 + 8 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 block/monitor/Makefile.objs rename device-hotplug.c => block/monitor/block-hmp-cmds.c (97%) create mode 100644 include/block/block-hmp-cmds.h
MAINTAINERS +1 -0
@@ -1920,6 +1920,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
@@ -48,7 +48,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
@@ -45,6 +45,7 @@ block-obj-y += crypto.o block-obj-y += aio_task.o block-obj-y += backup-top.o block-obj-y += filter-compress.o +common-obj-y += monitor/ block-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 +2 -1
@@ -1,5 +1,5 @@/* -* QEMU device hotplug helpers +* Blockdev HMP commands * * Copyright (c) 2004 Fabrice Bellard *
@@ -33,6 +33,7 @@#include "sysemu/sysemu.h" #include "monitor/monitor.h" #include "block/block_int.h" +#include "block/block-hmp-cmds.h" void hmp_drive_add (Monitor *mon,const QDict *qdict)
include/block/block-hmp-cmds.h new file +16 -0
@@ -0,0 +1,16 @@ +/* +* HMP commands related to the block layer +* +* Copyright (c) 2020 Red Hat, Inc. +* +* This work is licensed under the terms of the GNU GPL, version 2. +* or (at your option) any later version. +* See the COPYING file in the top-level directory. +*/ + +#ifndef BLOCK_HMP_COMMANDS_H +#define BLOCK_HMP_COMMANDS_H + +void hmp_drive_add (Monitor *mon,const QDict *qdict); + +#endif
include/sysemu/sysemu.h +0 -3
@@ -63,9 +63,6 @@ extern int nb_option_roms;extern const char *prom_envs[MAX_PROM_ENVS ];extern unsigned int nb_prom_envs; -/* generic hotplug */ -void hmp_drive_add (Monitor *mon,const QDict *qdict); -/* pcie aer error injection */ void hmp_pcie_aer_inject_error (Monitor *mon,const QDict *qdict);
monitor/misc.c +1 -0
@@ -66,6 +66,7 @@#include "qemu/option.h" #include "qemu/thread.h" #include "block/qapi.h" +#include "block/block-hmp-cmds.h" #include "qapi/qapi-commands-char.h" #include "qapi/qapi-commands-control.h" #include "qapi/qapi-commands-migration.h"
Signature · 1 line
2.17.2
PATCH v5 4/11 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 | 108 ++++++++++++++++++++++++++++++++- blockdev.c | 96 +---------------------------- include/block/block-hmp-cmds.h | 4 ++ include/sysemu/blockdev.h | 4 -- 4 files changed, 111 insertions(+), 101 deletions(-)
block/monitor/block-hmp-cmds.c +106 -2
@@ -1,7 +1,15 @@/* * Blockdev HMP commands * -* Copyright (c) 2004 Fabrice Bellard +* Copyright (c) 2003-2008 Fabrice Bellard +* +* This work is licensed under the terms of the GNU GPL, version 2 or +* later. See the COPYING file in the top-level directory. +* +* This file incorporates work covered by the following copyright and +* permission notice: +* +* Copyright (c) 2003-2008 Fabrice Bellard * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal
@@ -26,6 +34,7 @@#include "hw/boards.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" +#include "qapi/qapi-commands-block.h" #include "qapi/qmp/qdict.h" #include "qapi/error.h" #include "qemu/config-file.h"
@@ -35,7 +44,6 @@#include "block/block_int.h" #include "block/block-hmp-cmds.h" -void hmp_drive_add (Monitor *mon,const QDict *qdict) {Error *err =NULL ;
@@ -83,3 +91,99 @@ 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 +1 -95
114 lines not on this page · raw message
include/block/block-hmp-cmds.h +4 -0
@@ -1,6 +1,7 @@/* * HMP commands related to the block layer * +* Copyright (c) 2003-2008 Fabrice Bellard * Copyright (c) 2020 Red Hat, Inc. * * This work is licensed under the terms of the GNU GPL, version 2.
@@ -13,4 +14,7 @@void hmp_drive_add (Monitor *mon,const QDict *qdict); +void hmp_commit (Monitor *mon,const QDict *qdict); +void hmp_drive_del (Monitor *mon,const QDict *qdict); +#endif
include/sysemu/blockdev.h +0 -4
@@ -57,8 +57,4 @@ QemuOpts *drive_add(BlockInterfaceType type, int index, const char *file,DriveInfo *drive_new (QemuOpts *arg,BlockInterfaceType block_default_type,Error **errp); -/* device-hotplug */ - -void hmp_commit (Monitor *mon,const QDict *qdict); -void hmp_drive_del (Monitor *mon,const QDict *qdict);#endif
Signature · 1 line
2.17.2
PATCH v5 5/11 monitor/hmp: move hmp_drive_mirror and hmp_drive_backup to block-hmp-cmds.c Moved code was added after 2012-01-13, thus under GPLv2+
In reply to Maxim Levitsky--- block/monitor/block-hmp-cmds.c | 60 ++++++++++++++++++++++++++++++++++ include/block/block-hmp-cmds.h | 12 +++++-- include/monitor/hmp.h | 2 -- monitor/hmp-cmds.c | 58 -------------------------------- 4 files changed, 69 insertions(+), 63 deletions(-)
block/monitor/block-hmp-cmds.c +60 -0
@@ -37,10 +37,12 @@#include "qapi/qapi-commands-block.h" #include "qapi/qmp/qdict.h" #include "qapi/error.h" +#include "qapi/qmp/qerror.h" #include "qemu/config-file.h" #include "qemu/option.h" #include "sysemu/sysemu.h" #include "monitor/monitor.h" +#include "monitor/hmp.h" #include "block/block_int.h" #include "block/block-hmp-cmds.h"
@@ -187,3 +189,61 @@ 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); +}
include/block/block-hmp-cmds.h +9 -3
@@ -3,10 +3,13 @@* * Copyright (c) 2003-2008 Fabrice Bellard * Copyright (c) 2020 Red Hat, Inc. +* Copyright IBM, Corp. 2011 * -* This work is licensed under the terms of the GNU GPL, version 2. -* or (at your option) any later version. -* See the COPYING file in the top-level directory. +* Authors: +* Anthony Liguori <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2. See +* the COPYING file in the top-level directory. */ #ifndef BLOCK_HMP_COMMANDS_H
@@ -17,4 +20,7 @@ void hmp_drive_add(Monitor *mon, const QDict *qdict);void hmp_commit (Monitor *mon,const QDict *qdict);void hmp_drive_del (Monitor *mon,const QDict *qdict); +void hmp_drive_mirror (Monitor *mon,const QDict *qdict); +void hmp_drive_backup (Monitor *mon,const QDict *qdict); +#endif
include/monitor/hmp.h +0 -2
@@ -64,8 +64,6 @@ void hmp_block_resize(Monitor *mon, const QDict *qdict);void hmp_snapshot_blkdev (Monitor *mon,const QDict *qdict);void hmp_snapshot_blkdev_internal (Monitor *mon,const QDict *qdict);void hmp_snapshot_delete_blkdev_internal (Monitor *mon,const QDict *qdict); -void hmp_drive_mirror (Monitor *mon,const QDict *qdict); -void hmp_drive_backup (Monitor *mon,const QDict *qdict);void hmp_loadvm (Monitor *mon,const QDict *qdict);void hmp_savevm (Monitor *mon,const QDict *qdict);void hmp_delvm (Monitor *mon,const QDict *qdict);
monitor/hmp-cmds.c +0 -58
64 lines not on this page · raw message
Signature · 1 line
2.17.2
Re: [PATCH v5 05/11] monitor/hmp: move hmp_drive_mirror and hmp_drive_backup to block-hmp-cmds.c Moved code was added after 2012-01-13, thus under GPLv2+
I see that I have the same issue of long subject line here.
Its because I forgot the space after first line, when adding this. If I need to resend another version of this patchset I'll fix this, but otherwise maybe that can be fixed when applying this to one of maintainer's trees.
Sorry for noise.
Best regards,
Maxim Levitsky
Quoted 199 lines · Maxim Levitsky
Signed-off-by Maxim Levitsky <[email protected]>Reviewed-by Dr. David Alan Gilbert <[email protected]>--- block/monitor/block-hmp-cmds.c | 60 ++++++++++++++++++++++++++++++++++ include/block/block-hmp-cmds.h | 12 +++++-- include/monitor/hmp.h | 2 -- monitor/hmp-cmds.c | 58 -------------------------------- 4 files changed, 69 insertions(+), 63 deletions(-)block/monitor/block-hmp-cmds.c +60
-0@@ -37,10 +37,12 @@#include "qapi/qapi-commands-block.h" #include "qapi/qmp/qdict.h" #include "qapi/error.h" +#include "qapi/qmp/qerror.h" #include "qemu/config-file.h" #include "qemu/option.h" #include "sysemu/sysemu.h" #include "monitor/monitor.h" +#include "monitor/hmp.h" #include "block/block_int.h" #include "block/block-hmp-cmds.h" @@ -187,3 +189,61 @@ 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); +}include/block/block-hmp-cmds.h +9
-3@@ -3,10 +3,13 @@* * Copyright (c) 2003-2008 Fabrice Bellard * Copyright (c) 2020 Red Hat, Inc. +* Copyright IBM, Corp. 2011 * -* This work is licensed under the terms of the GNU GPL, version 2. -* or (at your option) any later version. -* See the COPYING file in the top-level directory. +* Authors: +* Anthony Liguori <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2. See +* the COPYING file in the top-level directory. */ #ifndef BLOCK_HMP_COMMANDS_H @@ -17,4 +20,7 @@ void hmp_drive_add(Monitor *mon, const QDict *qdict);void hmp_commit (Monitor *mon,const QDict *qdict);void hmp_drive_del (Monitor *mon,const QDict *qdict); +void hmp_drive_mirror (Monitor *mon,const QDict *qdict); +void hmp_drive_backup (Monitor *mon,const QDict *qdict); +#endif include/monitor/hmp.h +0
-2@@ -64,8 +64,6 @@ void hmp_block_resize(Monitor *mon, const QDict *qdict);void hmp_snapshot_blkdev (Monitor *mon,const QDict *qdict);void hmp_snapshot_blkdev_internal (Monitor *mon,const QDict *qdict);void hmp_snapshot_delete_blkdev_internal (Monitor *mon,const QDict *qdict); -void hmp_drive_mirror (Monitor *mon,const QDict *qdict); -void hmp_drive_backup (Monitor *mon,const QDict *qdict);void hmp_loadvm (Monitor *mon,const QDict *qdict);void hmp_savevm (Monitor *mon,const QDict *qdict);void hmp_delvm (Monitor *mon,const QDict *qdict);monitor/hmp-cmds.c +0
-58@@ -1342,64 +1342,6 @@ void hmp_block_resize(Monitor *mon, const QDict *qdict)hmp_handle_error (mon, err); } -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); -} -void hmp_snapshot_blkdev (Monitor *mon,const QDict *qdict) {const char *device =qdict_get_str (qdict,"device" );
Re: [PATCH v5 05/11] monitor/hmp: move hmp_drive_mirror and hmp_drive_backup to block-hmp-cmds.c Moved code was added after 2012-01-13, thus under GPLv2+
Quoted 8 lines · * Maxim Levitsky ([email protected]) wrote:
I see that I have the same issue of long subject line here.
Its because I forgot the space after first line, when adding this. If I need to resend another version of this patchset I'll fix this, but otherwise maybe that can be fixed when applying this to one of maintainer's trees.Sorry for noise.
I can just fix the commit message.
Dave
Quoted 195 lines
Best regards,
Maxim LevitskyQuoted 191 lines · Maxim Levitsky
Signed-off-by Maxim Levitsky <[email protected]>Reviewed-by Dr. David Alan Gilbert <[email protected]>--- block/monitor/block-hmp-cmds.c | 60 ++++++++++++++++++++++++++++++++++ include/block/block-hmp-cmds.h | 12 +++++-- include/monitor/hmp.h | 2 -- monitor/hmp-cmds.c | 58 -------------------------------- 4 files changed, 69 insertions(+), 63 deletions(-)block/monitor/block-hmp-cmds.c +60
-0@@ -37,10 +37,12 @@#include "qapi/qapi-commands-block.h" #include "qapi/qmp/qdict.h" #include "qapi/error.h" +#include "qapi/qmp/qerror.h" #include "qemu/config-file.h" #include "qemu/option.h" #include "sysemu/sysemu.h" #include "monitor/monitor.h" +#include "monitor/hmp.h" #include "block/block_int.h" #include "block/block-hmp-cmds.h" @@ -187,3 +189,61 @@ 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); +}include/block/block-hmp-cmds.h +9
-3@@ -3,10 +3,13 @@* * Copyright (c) 2003-2008 Fabrice Bellard * Copyright (c) 2020 Red Hat, Inc. +* Copyright IBM, Corp. 2011 * -* This work is licensed under the terms of the GNU GPL, version 2. -* or (at your option) any later version. -* See the COPYING file in the top-level directory. +* Authors: +* Anthony Liguori <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2. See +* the COPYING file in the top-level directory. */ #ifndef BLOCK_HMP_COMMANDS_H @@ -17,4 +20,7 @@ void hmp_drive_add(Monitor *mon, const QDict *qdict);void hmp_commit (Monitor *mon,const QDict *qdict);void hmp_drive_del (Monitor *mon,const QDict *qdict); +void hmp_drive_mirror (Monitor *mon,const QDict *qdict); +void hmp_drive_backup (Monitor *mon,const QDict *qdict); +#endif include/monitor/hmp.h +0
-2@@ -64,8 +64,6 @@ void hmp_block_resize(Monitor *mon, const QDict *qdict);void hmp_snapshot_blkdev (Monitor *mon,const QDict *qdict);void hmp_snapshot_blkdev_internal (Monitor *mon,const QDict *qdict);void hmp_snapshot_delete_blkdev_internal (Monitor *mon,const QDict *qdict); -void hmp_drive_mirror (Monitor *mon,const QDict *qdict); -void hmp_drive_backup (Monitor *mon,const QDict *qdict);void hmp_loadvm (Monitor *mon,const QDict *qdict);void hmp_savevm (Monitor *mon,const QDict *qdict);void hmp_delvm (Monitor *mon,const QDict *qdict);monitor/hmp-cmds.c +0
-53@@ -1342,64 +1342,6 @@ void hmp_block_resize(Monitor *mon, const QDict *qdict)hmp_handle_error (mon, err); } -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 ; - }
Quoted 10 lines
monitor/hmp-cmds.c void hmp_block_resize(Monitor *mon, const QDict *qdict) · line 1347
Quoted 8 lines
monitor/hmp-cmds.c +0
-5- -qmp_drive_backup (&backup, &err); -hmp_handle_error (mon, err); -} -void hmp_snapshot_blkdev (Monitor *mon,const QDict *qdict) {const char *device =qdict_get_str (qdict,"device" );
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [PATCH v5 05/11] monitor/hmp: move hmp_drive_mirror and hmp_drive_backup to block-hmp-cmds.c Moved code was added after 2012-01-13, thus under GPLv2+
Quoted 11 lines · Dr. David Alan Gilbert
Quoted 8 lines · * Maxim Levitsky ([email protected]) wrote:
I see that I have the same issue of long subject line here.
Its because I forgot the space after first line, when adding this. If I need to resend another version of this patchset I'll fix this, but otherwise maybe that can be fixed when applying this to one of maintainer's trees.Sorry for noise.
I can just fix the commit message.
Thank you!!
Best regards,
Maxim Levitsky
Quoted 211 lines
Dave
Quoted 195 lines
Best regards,
Maxim LevitskyQuoted 191 lines · Maxim Levitsky
Signed-off-by Maxim Levitsky <[email protected]>Reviewed-by Dr. David Alan Gilbert <[email protected]>--- block/monitor/block-hmp-cmds.c | 60 ++++++++++++++++++++++++++++++++++ include/block/block-hmp-cmds.h | 12 +++++-- include/monitor/hmp.h | 2 -- monitor/hmp-cmds.c | 58 -------------------------------- 4 files changed, 69 insertions(+), 63 deletions(-)block/monitor/block-hmp-cmds.c +60
-0@@ -37,10 +37,12 @@#include "qapi/qapi-commands-block.h" #include "qapi/qmp/qdict.h" #include "qapi/error.h" +#include "qapi/qmp/qerror.h" #include "qemu/config-file.h" #include "qemu/option.h" #include "sysemu/sysemu.h" #include "monitor/monitor.h" +#include "monitor/hmp.h" #include "block/block_int.h" #include "block/block-hmp-cmds.h" @@ -187,3 +189,61 @@ 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); +}include/block/block-hmp-cmds.h +9
-3@@ -3,10 +3,13 @@* * Copyright (c) 2003-2008 Fabrice Bellard * Copyright (c) 2020 Red Hat, Inc. +* Copyright IBM, Corp. 2011 * -* This work is licensed under the terms of the GNU GPL, version 2. -* or (at your option) any later version. -* See the COPYING file in the top-level directory. +* Authors: +* Anthony Liguori <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2. See +* the COPYING file in the top-level directory. */ #ifndef BLOCK_HMP_COMMANDS_H @@ -17,4 +20,7 @@ void hmp_drive_add(Monitor *mon, const QDict *qdict);void hmp_commit (Monitor *mon,const QDict *qdict);void hmp_drive_del (Monitor *mon,const QDict *qdict); +void hmp_drive_mirror (Monitor *mon,const QDict *qdict); +void hmp_drive_backup (Monitor *mon,const QDict *qdict); +#endif include/monitor/hmp.h +0
-2@@ -64,8 +64,6 @@ void hmp_block_resize(Monitor *mon, const QDict *qdict);void hmp_snapshot_blkdev (Monitor *mon,const QDict *qdict);void hmp_snapshot_blkdev_internal (Monitor *mon,const QDict *qdict);void hmp_snapshot_delete_blkdev_internal (Monitor *mon,const QDict *qdict); -void hmp_drive_mirror (Monitor *mon,const QDict *qdict); -void hmp_drive_backup (Monitor *mon,const QDict *qdict);void hmp_loadvm (Monitor *mon,const QDict *qdict);void hmp_savevm (Monitor *mon,const QDict *qdict);void hmp_delvm (Monitor *mon,const QDict *qdict);monitor/hmp-cmds.c +0
-53@@ -1342,64 +1342,6 @@ void hmp_block_resize(Monitor *mon, const QDict *qdict)hmp_handle_error (mon, err); } -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 ; - }Quoted 10 lines
monitor/hmp-cmds.c void hmp_block_resize(Monitor *mon, const QDict *qdict) · line 1347
Quoted 8 lines
monitor/hmp-cmds.c +0
-5- -qmp_drive_backup (&backup, &err); -hmp_handle_error (mon, err); -} -void hmp_snapshot_blkdev (Monitor *mon,const QDict *qdict) {const char *device =qdict_get_str (qdict,"device" );--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
PATCH v5 6/11 monitor/hmp: move hmp_block_job* to block-hmp-cmds.c
In reply to Maxim Levitsky--- block/monitor/block-hmp-cmds.c | 52 ++++++++++++++++++++++++++++++++++ include/block/block-hmp-cmds.h | 6 ++++ include/monitor/hmp.h | 5 ---- monitor/hmp-cmds.c | 52 ---------------------------------- 4 files changed, 58 insertions(+), 57 deletions(-)
block/monitor/block-hmp-cmds.c +52 -0
@@ -247,3 +247,55 @@ void hmp_drive_backup(Monitor *mon, const QDict *qdict)qmp_drive_backup (&backup, &err);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); +}
include/block/block-hmp-cmds.h +6 -0
@@ -23,4 +23,10 @@ void hmp_drive_del(Monitor *mon, const QDict *qdict);void hmp_drive_mirror (Monitor *mon,const QDict *qdict);void hmp_drive_backup (Monitor *mon,const QDict *qdict); +void hmp_block_job_set_speed (Monitor *mon,const QDict *qdict); +void hmp_block_job_cancel (Monitor *mon,const QDict *qdict); +void hmp_block_job_pause (Monitor *mon,const QDict *qdict); +void hmp_block_job_resume (Monitor *mon,const QDict *qdict); +void hmp_block_job_complete (Monitor *mon,const QDict *qdict); +#endif
include/monitor/hmp.h +0 -5
@@ -87,11 +87,6 @@ void hmp_eject(Monitor *mon, const QDict *qdict);void hmp_change (Monitor *mon,const QDict *qdict);void hmp_block_set_io_throttle (Monitor *mon,const QDict *qdict);void hmp_block_stream (Monitor *mon,const QDict *qdict); -void hmp_block_job_set_speed (Monitor *mon,const QDict *qdict); -void hmp_block_job_cancel (Monitor *mon,const QDict *qdict); -void hmp_block_job_pause (Monitor *mon,const QDict *qdict); -void hmp_block_job_resume (Monitor *mon,const QDict *qdict); -void hmp_block_job_complete (Monitor *mon,const QDict *qdict);void hmp_migrate (Monitor *mon,const QDict *qdict);void hmp_device_add (Monitor *mon,const QDict *qdict);void hmp_device_del (Monitor *mon,const QDict *qdict);
monitor/hmp-cmds.c +0 -52
58 lines not on this page · raw message
Signature · 1 line
2.17.2
PATCH v5 7/11 monitor/hmp: move hmp_snapshot_* to block-hmp-cmds.c
In reply to Maxim Levitskyhmp_snapshot_blkdev is from GPLv2 version of the hmp-cmds.c thus have to change the licence to GPLv2
--- block/monitor/block-hmp-cmds.c | 58 ++++++++++++++++++++++++++++++++-- include/block/block-hmp-cmds.h | 4 +++ include/monitor/hmp.h | 3 -- monitor/hmp-cmds.c | 47 --------------------------- 4 files changed, 60 insertions(+), 52 deletions(-)
block/monitor/block-hmp-cmds.c +56 -2
@@ -1,10 +1,15 @@/* * Blockdev HMP commands * +* Authors: +* Anthony Liguori <[email protected]> +* * Copyright (c) 2003-2008 Fabrice Bellard * -* This work is licensed under the terms of the GNU GPL, version 2 or -* later. See the COPYING file in the top-level directory. +* This work is licensed under the terms of the GNU GPL, version 2. +* See the COPYING file in the top-level directory. +* Contributions after 2012-01-13 are licensed under the terms of the +* GNU GPL, version 2 or (at your option) any later version. * * This file incorporates work covered by the following copyright and * permission notice:
@@ -299,3 +304,52 @@ 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); +}
include/block/block-hmp-cmds.h +4 -0
@@ -29,4 +29,8 @@ void hmp_block_job_pause(Monitor *mon, const QDict *qdict);void hmp_block_job_resume (Monitor *mon,const QDict *qdict);void hmp_block_job_complete (Monitor *mon,const QDict *qdict); +void hmp_snapshot_blkdev (Monitor *mon,const QDict *qdict); +void hmp_snapshot_blkdev_internal (Monitor *mon,const QDict *qdict); +void hmp_snapshot_delete_blkdev_internal (Monitor *mon,const QDict *qdict); +#endif
include/monitor/hmp.h +0 -3
@@ -61,9 +61,6 @@ void hmp_set_link(Monitor *mon, const QDict *qdict);void hmp_block_passwd (Monitor *mon,const QDict *qdict);void hmp_balloon (Monitor *mon,const QDict *qdict);void hmp_block_resize (Monitor *mon,const QDict *qdict); -void hmp_snapshot_blkdev (Monitor *mon,const QDict *qdict); -void hmp_snapshot_blkdev_internal (Monitor *mon,const QDict *qdict); -void hmp_snapshot_delete_blkdev_internal (Monitor *mon,const QDict *qdict);void hmp_loadvm (Monitor *mon,const QDict *qdict);void hmp_savevm (Monitor *mon,const QDict *qdict);void hmp_delvm (Monitor *mon,const QDict *qdict);
monitor/hmp-cmds.c +0 -47
53 lines not on this page · raw message
Signature · 1 line
2.17.2
PATCH v5 8/11 monitor/hmp: move hmp_nbd_server* to block-hmp-cmds.c
In reply to Maxim Levitsky--- block/monitor/block-hmp-cmds.c | 101 +++++++++++++++++++++++++++++++++ include/block/block-hmp-cmds.h | 5 ++ include/monitor/hmp.h | 4 -- monitor/hmp-cmds.c | 100 -------------------------------- 4 files changed, 106 insertions(+), 104 deletions(-)
block/monitor/block-hmp-cmds.c +101 -0
@@ -45,9 +45,11 @@#include "qapi/qmp/qerror.h" #include "qemu/config-file.h" #include "qemu/option.h" +#include "qemu/sockets.h" #include "sysemu/sysemu.h" #include "monitor/monitor.h" #include "monitor/hmp.h" +#include "block/nbd.h" #include "block/block_int.h" #include "block/block-hmp-cmds.h"
@@ -353,3 +355,102 @@ void hmp_snapshot_delete_blkdev_internal(Monitor *mon, const QDict *qdict) true, name, &err);hmp_handle_error (mon, err); } + +void hmp_nbd_server_start (Monitor *mon,const QDict *qdict) +{ +const char *uri =qdict_get_str (qdict,"uri" ); +bool writable =qdict_get_try_bool (qdict,"writable" , false); +bool all =qdict_get_try_bool (qdict,"all" , false); +Error *local_err =NULL ; +BlockInfoList *block_list, *info; +SocketAddress *addr; +BlockExportNbd export; + +if (writable && !all) { +error_setg (&local_err,"-w only valid together with -a" ); + goto exit; + } + +/* First check if the address is valid and start the server. */ + addr =socket_parse (uri, &local_err); +if (local_err !=NULL ) { + goto exit; + } + +nbd_server_start (addr,NULL ,NULL , &local_err); +qapi_free_SocketAddress (addr); +if (local_err !=NULL ) { + goto exit; + } + +if (!all) { +return ; + } + +/* Then try adding all block devices. If one fails, close all and +* exit. +*/ + block_list =qmp_query_block (NULL ); + +for (info = block_list; info; info = info->next) { +if (!info->value->has_inserted) { +continue ; + } + + export = (BlockExportNbd ) { + .device = info->value->device, + .has_writable = true, + .writable = writable, + }; + +qmp_nbd_server_add (&export, &local_err); + +if (local_err !=NULL ) { +qmp_nbd_server_stop (NULL ); +break ; + } + } + +qapi_free_BlockInfoList (block_list); + +exit: +hmp_handle_error (mon, local_err); +} + +void hmp_nbd_server_add (Monitor *mon,const QDict *qdict) +{ +const char *device =qdict_get_str (qdict,"device" ); +const char *name =qdict_get_try_str (qdict,"name" ); +bool writable =qdict_get_try_bool (qdict,"writable" , false); +Error *local_err =NULL ; + +BlockExportNbd export = { + .device = (char *) device, + .has_name = !!name, + .name = (char *) name, + .has_writable = true, + .writable = writable, + }; + +qmp_nbd_server_add (&export, &local_err); +hmp_handle_error (mon, local_err); +} + +void hmp_nbd_server_remove (Monitor *mon,const QDict *qdict) +{ +const char *name =qdict_get_str (qdict,"name" ); +bool force =qdict_get_try_bool (qdict,"force" , false); +Error *err =NULL ; + +/* Rely on NBD_SERVER_REMOVE_MODE_SAFE being the default */ +qmp_nbd_server_remove (name, force,NBD_SERVER_REMOVE_MODE_HARD , &err); +hmp_handle_error (mon, err); +} + +void hmp_nbd_server_stop (Monitor *mon,const QDict *qdict) +{ +Error *err =NULL ; + +qmp_nbd_server_stop (&err); +hmp_handle_error (mon, err); +}
include/block/block-hmp-cmds.h +5 -0
@@ -33,4 +33,9 @@ void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict);void hmp_snapshot_blkdev_internal (Monitor *mon,const QDict *qdict);void hmp_snapshot_delete_blkdev_internal (Monitor *mon,const QDict *qdict); +void hmp_nbd_server_start (Monitor *mon,const QDict *qdict); +void hmp_nbd_server_add (Monitor *mon,const QDict *qdict); +void hmp_nbd_server_remove (Monitor *mon,const QDict *qdict); +void hmp_nbd_server_stop (Monitor *mon,const QDict *qdict); +#endif
include/monitor/hmp.h +0 -4
@@ -94,10 +94,6 @@ void hmp_getfd(Monitor *mon, const QDict *qdict);void hmp_closefd (Monitor *mon,const QDict *qdict);void hmp_sendkey (Monitor *mon,const QDict *qdict);void hmp_screendump (Monitor *mon,const QDict *qdict); -void hmp_nbd_server_start (Monitor *mon,const QDict *qdict); -void hmp_nbd_server_add (Monitor *mon,const QDict *qdict); -void hmp_nbd_server_remove (Monitor *mon,const QDict *qdict); -void hmp_nbd_server_stop (Monitor *mon,const QDict *qdict);void hmp_chardev_add (Monitor *mon,const QDict *qdict);void hmp_chardev_change (Monitor *mon,const QDict *qdict);void hmp_chardev_remove (Monitor *mon,const QDict *qdict);
monitor/hmp-cmds.c +0 -100
112 lines not on this page · raw message
Signature · 1 line
2.17.2
PATCH v5 9/11 monitor/hmp: move remaining hmp_block* functions to block-hmp-cmds.c
In reply to Maxim Levitsky--- block/monitor/block-hmp-cmds.c | 140 +++++++++++++++++++++++++++++++++ include/block/block-hmp-cmds.h | 9 +++ include/monitor/hmp.h | 6 -- monitor/hmp-cmds.c | 137 -------------------------------- 4 files changed, 149 insertions(+), 143 deletions(-)
block/monitor/block-hmp-cmds.c +140 -0
@@ -52,6 +52,7 @@#include "block/nbd.h" #include "block/block_int.h" #include "block/block-hmp-cmds.h" +#include "qemu-io.h" void hmp_drive_add (Monitor *mon,const QDict *qdict) {
@@ -454,3 +455,142 @@ void hmp_nbd_server_stop(Monitor *mon, const QDict *qdict)qmp_nbd_server_stop (&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); +} + +void hmp_eject (Monitor *mon,const QDict *qdict) +{ +bool force =qdict_get_try_bool (qdict,"force" , false); +const char *device =qdict_get_str (qdict,"device" ); +Error *err =NULL ; + +qmp_eject (true, device, false,NULL , true, force, &err); +hmp_handle_error (mon, err); +} + +void hmp_qemu_io (Monitor *mon,const QDict *qdict) +{ +BlockBackend *blk; +BlockBackend *local_blk =NULL ; +bool qdev =qdict_get_try_bool (qdict,"qdev" , false); +const char *device =qdict_get_str (qdict,"device" ); +const char *command =qdict_get_str (qdict,"command" ); +Error *err =NULL ; +int ret; + +if (qdev) { + blk =blk_by_qdev_id (device, &err); +if (!blk) { + goto fail; + } + }else { + blk =blk_by_name (device); +if (!blk) { +BlockDriverState *bs =bdrv_lookup_bs (NULL , device, &err); +if (bs) { + blk = local_blk =blk_new (bdrv_get_aio_context (bs), +0 ,BLK_PERM_ALL ); + ret =blk_insert_bs (blk, bs, &err); +if (ret <0 ) { + goto fail; + } + }else { + goto fail; + } + } + } + +/* +* Notably absent: Proper permission management. This is sad, but it seems +* almost impossible to achieve without changing the semantics and thereby +* limiting the use cases of the qemu-io HMP command. +* +* In an ideal world we would unconditionally create a new BlockBackend for +* qemuio_command(), but we have commands like 'reopen' and want them to +* take effect on the exact BlockBackend whose name the user passed instead +* of just on a temporary copy of it. +* +* Another problem is that deleting the temporary BlockBackend involves +* draining all requests on it first, but some qemu-iotests cases want to +* issue multiple aio_read/write requests and expect them to complete in +* the background while the monitor has already returned. +* +* This is also what prevents us from saving the original permissions and +* restoring them later: We can't revoke permissions until all requests +* have completed, and we don't know when that is nor can we really let +* anything else run before we have revoken them to avoid race conditions. +* +* What happens now is that command() in qemu-io-cmds.c can extend the +* permissions if necessary for the qemu-io command. And they simply stay +* extended, possibly resulting in a read-only guest device keeping write +* permissions. Ugly, but it appears to be the lesser evil. +*/ +qemuio_command (blk, command); + +fail: +blk_unref (local_blk); +hmp_handle_error (mon, err); +}
include/block/block-hmp-cmds.h +9 -0
@@ -38,4 +38,13 @@ void hmp_nbd_server_add(Monitor *mon, const QDict *qdict);void hmp_nbd_server_remove (Monitor *mon,const QDict *qdict);void hmp_nbd_server_stop (Monitor *mon,const QDict *qdict); +void hmp_block_resize (Monitor *mon,const QDict *qdict); +void hmp_block_stream (Monitor *mon,const QDict *qdict); +void hmp_block_passwd (Monitor *mon,const QDict *qdict); +void hmp_block_set_io_throttle (Monitor *mon,const QDict *qdict); +void hmp_eject (Monitor *mon,const QDict *qdict); + +void hmp_qemu_io (Monitor *mon,const QDict *qdict); + +#endif
include/monitor/hmp.h +0 -6
@@ -58,9 +58,7 @@ void hmp_cont(Monitor *mon, const QDict *qdict);void hmp_system_wakeup (Monitor *mon,const QDict *qdict);void hmp_nmi (Monitor *mon,const QDict *qdict);void hmp_set_link (Monitor *mon,const QDict *qdict); -void hmp_block_passwd (Monitor *mon,const QDict *qdict);void hmp_balloon (Monitor *mon,const QDict *qdict); -void hmp_block_resize (Monitor *mon,const QDict *qdict);void hmp_loadvm (Monitor *mon,const QDict *qdict);void hmp_savevm (Monitor *mon,const QDict *qdict);void hmp_delvm (Monitor *mon,const QDict *qdict);
@@ -80,10 +78,7 @@ void hmp_migrate_start_postcopy(Monitor *mon, const QDict *qdict);void hmp_x_colo_lost_heartbeat (Monitor *mon,const QDict *qdict);void hmp_set_password (Monitor *mon,const QDict *qdict);void hmp_expire_password (Monitor *mon,const QDict *qdict); -void hmp_eject (Monitor *mon,const QDict *qdict);void hmp_change (Monitor *mon,const QDict *qdict); -void hmp_block_set_io_throttle (Monitor *mon,const QDict *qdict); -void hmp_block_stream (Monitor *mon,const QDict *qdict);void hmp_migrate (Monitor *mon,const QDict *qdict);void hmp_device_add (Monitor *mon,const QDict *qdict);void hmp_device_del (Monitor *mon,const QDict *qdict);
@@ -98,7 +93,6 @@ void hmp_chardev_add(Monitor *mon, const QDict *qdict);void hmp_chardev_change (Monitor *mon,const QDict *qdict);void hmp_chardev_remove (Monitor *mon,const QDict *qdict);void hmp_chardev_send_break (Monitor *mon,const QDict *qdict); -void hmp_qemu_io (Monitor *mon,const QDict *qdict);void hmp_cpu_add (Monitor *mon,const QDict *qdict);void hmp_object_add (Monitor *mon,const QDict *qdict);void hmp_object_del (Monitor *mon,const QDict *qdict);
monitor/hmp-cmds.c +0 -137
173 lines not on this page · raw message
Signature · 1 line
2.17.2
PATCH v5 10/11 monitor/hmp: move hmp_info_block* to block-hmp-cmds.c
In reply to Maxim Levitsky--- block/monitor/block-hmp-cmds.c | 389 +++++++++++++++++++++++++++++++++ include/block/block-hmp-cmds.h | 4 + include/monitor/hmp.h | 4 - monitor/hmp-cmds.c | 388 -------------------------------- 4 files changed, 393 insertions(+), 392 deletions(-)
block/monitor/block-hmp-cmds.c +389 -0
@@ -46,10 +46,12 @@#include "qemu/config-file.h" #include "qemu/option.h" #include "qemu/sockets.h" +#include "qemu/cutils.h" #include "sysemu/sysemu.h" #include "monitor/monitor.h" #include "monitor/hmp.h" #include "block/nbd.h" +#include "block/qapi.h" #include "block/block_int.h" #include "block/block-hmp-cmds.h" #include "qemu-io.h"
@@ -594,3 +596,390 @@ fail:blk_unref (local_blk);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 (false, false,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); +} + +void hmp_info_snapshots (Monitor *mon,const QDict *qdict) +{ +BlockDriverState *bs, *bs1; +BdrvNextIterator it1; +QEMUSnapshotInfo *sn_tab, *sn; +bool no_snapshot = true; +int nb_sns, i; +int total; +int *global_snapshots; +AioContext *aio_context; + +typedef struct SnapshotEntry { +QEMUSnapshotInfo sn; +QTAILQ_ENTRY (SnapshotEntry) next; + }SnapshotEntry ; + +typedef struct ImageEntry { +const char *imagename; +QTAILQ_ENTRY (ImageEntry) next; + QTAILQ_HEAD(, SnapshotEntry) snapshots; + }ImageEntry ; + + QTAILQ_HEAD(, ImageEntry) image_list = +QTAILQ_HEAD_INITIALIZER (image_list); + +ImageEntry *image_entry, *next_ie; +SnapshotEntry *snapshot_entry; + + bs =bdrv_all_find_vmstate_bs (); +if (!bs) { +monitor_printf (mon,"No available block device supports snapshots\n" ); +return ; + } + aio_context =bdrv_get_aio_context (bs); + +aio_context_acquire (aio_context); + nb_sns =bdrv_snapshot_list (bs, &sn_tab); +aio_context_release (aio_context); + +if (nb_sns <0 ) { +monitor_printf (mon,"bdrv_snapshot_list: error %d\n" , nb_sns); +return ; + } + +for (bs1 =bdrv_first (&it1); bs1; bs1 =bdrv_next (&it1)) { +int bs1_nb_sns =0 ; +ImageEntry *ie; +SnapshotEntry *se; +AioContext *ctx =bdrv_get_aio_context (bs1); + +aio_context_acquire (ctx); +if (bdrv_can_snapshot (bs1)) { + sn =NULL ; + bs1_nb_sns =bdrv_snapshot_list (bs1, &sn); +if (bs1_nb_sns >0 ) { + no_snapshot = false; + ie =g_new0 (ImageEntry,1 ); + ie->imagename =bdrv_get_device_name (bs1); +QTAILQ_INIT (&ie->snapshots); +QTAILQ_INSERT_TAIL (&image_list, ie, next); +for (i =0 ; i < bs1_nb_sns; i++) { + se =g_new0 (SnapshotEntry,1 ); + se->sn = sn[i]; +QTAILQ_INSERT_TAIL (&ie->snapshots, se, next); + } + } +g_free (sn); + } +aio_context_release (ctx); + } + +if (no_snapshot) { +monitor_printf (mon,"There is no snapshot available.\n" ); +return ; + } + + global_snapshots =g_new0 (int, nb_sns); + total =0 ; +for (i =0 ; i < nb_sns; i++) { +SnapshotEntry *next_sn; +if (bdrv_all_find_snapshot (sn_tab[i].name, &bs1) ==0 ) { + global_snapshots[total] = i; + total++; + QTAILQ_FOREACH(image_entry, &image_list, next) { +QTAILQ_FOREACH_SAFE (snapshot_entry, &image_entry->snapshots, + next, next_sn) { +if (!strcmp (sn_tab[i].name, snapshot_entry->sn.name)) { +QTAILQ_REMOVE (&image_entry->snapshots, snapshot_entry, + next); +g_free (snapshot_entry); + } + } + } + } + } +monitor_printf (mon,"List of snapshots present on all disks:\n" ); + +if (total >0 ) { +bdrv_snapshot_dump (NULL ); +monitor_printf (mon,"\n" ); +for (i =0 ; i < total; i++) { + sn = &sn_tab[global_snapshots[i]]; +/* +* The ID is not guaranteed to be the same on all images, so +* overwrite it. +*/ +pstrcpy (sn->id_str,sizeof (sn->id_str),"--" ); +bdrv_snapshot_dump (sn); +monitor_printf (mon,"\n" ); + } + }else { +monitor_printf (mon,"None\n" ); + } + + QTAILQ_FOREACH(image_entry, &image_list, next) { +if (QTAILQ_EMPTY (&image_entry->snapshots)) { +continue ; + } +monitor_printf (mon, +"\nList of partial (non-loadable) snapshots on '%s':\n" , + image_entry->imagename); +bdrv_snapshot_dump (NULL ); +monitor_printf (mon,"\n" ); + QTAILQ_FOREACH(snapshot_entry, &image_entry->snapshots, next) { +bdrv_snapshot_dump (&snapshot_entry->sn); +monitor_printf (mon,"\n" ); + } + } + + QTAILQ_FOREACH_SAFE(image_entry, &image_list, next, next_ie) { +SnapshotEntry *next_sn; +QTAILQ_FOREACH_SAFE (snapshot_entry, &image_entry->snapshots, next, + next_sn) { +g_free (snapshot_entry); + } +g_free (image_entry); + } +g_free (sn_tab); +g_free (global_snapshots); +}
include/block/block-hmp-cmds.h +4 -0
@@ -46,5 +46,9 @@ void hmp_eject(Monitor *mon, const QDict *qdict);void hmp_qemu_io (Monitor *mon,const QDict *qdict); +void hmp_info_block (Monitor *mon,const QDict *qdict); +void hmp_info_blockstats (Monitor *mon,const QDict *qdict); +void hmp_info_block_jobs (Monitor *mon,const QDict *qdict); +void hmp_info_snapshots (Monitor *mon,const QDict *qdict);#endif
include/monitor/hmp.h +0 -4
@@ -30,8 +30,6 @@ void hmp_info_migrate_capabilities(Monitor *mon, const QDict *qdict);void hmp_info_migrate_parameters (Monitor *mon,const QDict *qdict);void hmp_info_migrate_cache_size (Monitor *mon,const QDict *qdict);void hmp_info_cpus (Monitor *mon,const QDict *qdict); -void hmp_info_block (Monitor *mon,const QDict *qdict); -void hmp_info_blockstats (Monitor *mon,const QDict *qdict);void hmp_info_vnc (Monitor *mon,const QDict *qdict);void hmp_info_spice (Monitor *mon,const QDict *qdict);void hmp_info_balloon (Monitor *mon,const QDict *qdict);
@@ -39,7 +37,6 @@ void hmp_info_irq(Monitor *mon, const QDict *qdict);void hmp_info_pic (Monitor *mon,const QDict *qdict);void hmp_info_rdma (Monitor *mon,const QDict *qdict);void hmp_info_pci (Monitor *mon,const QDict *qdict); -void hmp_info_block_jobs (Monitor *mon,const QDict *qdict);void hmp_info_tpm (Monitor *mon,const QDict *qdict);void hmp_info_iothreads (Monitor *mon,const QDict *qdict);void hmp_quit (Monitor *mon,const QDict *qdict);
@@ -62,7 +59,6 @@ void hmp_balloon(Monitor *mon, const QDict *qdict);void hmp_loadvm (Monitor *mon,const QDict *qdict);void hmp_savevm (Monitor *mon,const QDict *qdict);void hmp_delvm (Monitor *mon,const QDict *qdict); -void hmp_info_snapshots (Monitor *mon,const QDict *qdict);void hmp_migrate_cancel (Monitor *mon,const QDict *qdict);void hmp_migrate_continue (Monitor *mon,const QDict *qdict);void hmp_migrate_incoming (Monitor *mon,const QDict *qdict);
monitor/hmp-cmds.c +0 -388
412 lines not on this page · raw message
Signature · 1 line
2.17.2
PATCH v5 11/11 monitor/hmp: Move hmp_drive_add_node to block-hmp-cmds.c
In reply to Maxim Levitsky--- block/monitor/block-hmp-cmds.c | 30 ++++++++++++++++++++++++ blockdev.c | 43 +++++++--------------------------- include/block/block_int.h | 5 ++-- 3 files changed, 41 insertions(+), 37 deletions(-)
block/monitor/block-hmp-cmds.c +30 -0
@@ -56,6 +56,36 @@#include "block/block-hmp-cmds.h" #include "qemu-io.h" +static void hmp_drive_add_node (Monitor *mon,const char *optstr) +{ +QemuOpts *opts; +QDict *qdict; +Error *local_err =NULL ; + + opts =qemu_opts_parse_noisily (&qemu_drive_opts, optstr, false); +if (!opts) { +return ; + } + + qdict =qemu_opts_to_qdict (opts,NULL ); + +if (!qdict_get_try_str (qdict,"node-name" )) { +qobject_unref (qdict); +error_report ("'node-name' needs to be specified" ); + goto out; + } + +BlockDriverState *bs =bds_tree_init (qdict, &local_err); +if (!bs) { +error_report_err (local_err); + goto out; + } + +bdrv_set_monitor_owned (bs); +out: +qemu_opts_del (opts); +} +void hmp_drive_add (Monitor *mon,const QDict *qdict) {Error *err =NULL ;
blockdev.c +8 -35
69 lines not on this page · raw message
include/block/block_int.h +3 -2
@@ -1216,8 +1216,6 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, BlockCompletionFunc *cb, void *opaque, JobTxn *txn, Error **errp); -void hmp_drive_add_node (Monitor *mon,const char *optstr); - BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs, const char *child_name, const BdrvChildRole *child_role,
@@ -1322,4 +1320,7 @@ int coroutine_fn bdrv_co_copy_range_to(BdrvChild *src, uint64_t src_offset,int refresh_total_sectors (BlockDriverState *bs,int64_t hint); +void bdrv_set_monitor_owned (BlockDriverState *bs); +BlockDriverState *bds_tree_init (QDict *bs_opts,Error **errp); +#endif /* BLOCK_INT_H */
Signature · 1 line
2.17.2
Quoted 5 lines · * Maxim Levitsky ([email protected]) wrote:
This patch series is bunch of cleanups to the hmp monitor code. It mostly moves the blockdev related hmp handlers to its own file, and does some minor refactoring.
No functional changes expected.
Queued for HMP, with the commit message fix up in 05.
Dave
Quoted 66 lines
Changes from V1:
* move the handlers toblock/monitor/block-hmp-cmds.c
* tiny cleanup for the commit messagesChanges from V2:
* Moved all the function prototypes to new header (blockdev-hmp-cmds.h)
* Set the license ofblockdev-hmp-cmds.cto GPLv2+
* Moved hmp_snapshot_* functions toblockdev-hmp-cmds.c
* Movedhmp_drive_add_nodetoblockdev-hmp-cmds.c
(this change needed some new exports, thus in separate new patch)
* Movedhmp_qemu_ioandhmp_ejecttoblockdev-hmp-cmds.c
* Added 'error:' prefix to vreport, and updated the iotests This is invasive change, but really feels like the right one
* Added minor refactoring patch that drops an unused #includeChanges from V3:
* Dropped the error prefix patches for now due to fact that it seems that libvirt doesn't need that after all. Oh well... I'll send them in a separate series.* Hopefully correctly merged the copyright info the new files Both files are GPLv2 now (due to code from
hmp.h/hmp-cmds.c)* Addressed review feedback
* Renamed the added header toblock-hmp-cmds.h* Got rid of checkpatch.pl warnings in the moved code (cosmetic code changes only)
* I kept the reviewed-by tags, since the changes I did are minor. I hope that this is right thing to do.
Changes from V4:
* Rebase with recent changes
* Fixed review feedbackBest regards,
Maxim LevitskyMaxim Levitsky (11):
usb/dev-storage: remove unused include
monitor/hmp: inlineadd_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.cMoved code was added after 2012-01-13, thus under GPLv2+
monitor/hmp: move hmp_block_job* toblock-hmp-cmds.cmonitor/hmp: move hmp_snapshot_* toblock-hmp-cmds.cmonitor/hmp: move hmp_nbd_server* toblock-hmp-cmds.cmonitor/hmp: move remaining hmp_block* functions toblock-hmp-cmds.cmonitor/hmp: move hmp_info_block* toblock-hmp-cmds.cmonitor/hmp: Movehmp_drive_add_nodetoblock-hmp-cmds.cMAINTAINERS | 1 + Makefile.objs | 2 +- block/Makefile.objs | 1 + block/monitor/Makefile.objs | 1 + block/monitor/block-hmp-cmds.c | 1015 ++++++++++++++++++++++++++++++++ blockdev.c | 137 +---- device-hotplug.c | 91 --- hw/usb/dev-storage.c | 1 - include/block/block-hmp-cmds.h | 54 ++ include/block/block_int.h | 5 +- include/monitor/hmp.h | 24 - include/sysemu/blockdev.h | 4 -
Quoted 12 lines
include/sysemu/sysemu.h | 3 - monitor/hmp-cmds.c | 782 ------------------------ monitor/misc.c | 1 + 15 files changed, 1085 insertions(+), 1037 deletions(-) create mode 100644 block/monitor/Makefile.objs create mode 100644 block/monitor/block-hmp-cmds.c delete mode 100644 device-hotplug.c create mode 100644 include/block/block-hmp-cmds.hSignature · 1 line
2.17.2
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Quoted 8 lines · Dr. David Alan Gilbert
Quoted 5 lines · * Maxim Levitsky ([email protected]) wrote:
This patch series is bunch of cleanups to the hmp monitor code. It mostly moves the blockdev related hmp handlers to its own file, and does some minor refactoring.
No functional changes expected.
Queued for HMP, with the commit message fix up in 05.
Thanks a million!
Best regards,
Maxim Levitsky
Quoted 84 lines
Dave
Quoted 66 lines
Changes from V1:
* move the handlers toblock/monitor/block-hmp-cmds.c
* tiny cleanup for the commit messagesChanges from V2:
* Moved all the function prototypes to new header (blockdev-hmp-cmds.h)
* Set the license ofblockdev-hmp-cmds.cto GPLv2+
* Moved hmp_snapshot_* functions toblockdev-hmp-cmds.c
* Movedhmp_drive_add_nodetoblockdev-hmp-cmds.c
(this change needed some new exports, thus in separate new patch)
* Movedhmp_qemu_ioandhmp_ejecttoblockdev-hmp-cmds.c
* Added 'error:' prefix to vreport, and updated the iotests This is invasive change, but really feels like the right one
* Added minor refactoring patch that drops an unused #includeChanges from V3:
* Dropped the error prefix patches for now due to fact that it seems that libvirt doesn't need that after all. Oh well... I'll send them in a separate series.* Hopefully correctly merged the copyright info the new files Both files are GPLv2 now (due to code from
hmp.h/hmp-cmds.c)* Addressed review feedback
* Renamed the added header toblock-hmp-cmds.h* Got rid of checkpatch.pl warnings in the moved code (cosmetic code changes only)
* I kept the reviewed-by tags, since the changes I did are minor. I hope that this is right thing to do.
Changes from V4:
* Rebase with recent changes
* Fixed review feedbackBest regards,
Maxim LevitskyMaxim Levitsky (11):
usb/dev-storage: remove unused include
monitor/hmp: inlineadd_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.cMoved code was added after 2012-01-13, thus under GPLv2+
monitor/hmp: move hmp_block_job* toblock-hmp-cmds.cmonitor/hmp: move hmp_snapshot_* toblock-hmp-cmds.cmonitor/hmp: move hmp_nbd_server* toblock-hmp-cmds.cmonitor/hmp: move remaining hmp_block* functions toblock-hmp-cmds.cmonitor/hmp: move hmp_info_block* toblock-hmp-cmds.cmonitor/hmp: Movehmp_drive_add_nodetoblock-hmp-cmds.cMAINTAINERS | 1 + Makefile.objs | 2 +- block/Makefile.objs | 1 + block/monitor/Makefile.objs | 1 + block/monitor/block-hmp-cmds.c | 1015 ++++++++++++++++++++++++++++++++ blockdev.c | 137 +---- device-hotplug.c | 91 --- hw/usb/dev-storage.c | 1 - include/block/block-hmp-cmds.h | 54 ++ include/block/block_int.h | 5 +- include/monitor/hmp.h | 24 - include/sysemu/blockdev.h | 4 -Quoted 12 lines
include/sysemu/sysemu.h | 3 - monitor/hmp-cmds.c | 782 ------------------------ monitor/misc.c | 1 + 15 files changed, 1085 insertions(+), 1037 deletions(-) create mode 100644 block/monitor/Makefile.objs create mode 100644 block/monitor/block-hmp-cmds.c delete mode 100644 device-hotplug.c create mode 100644 include/block/block-hmp-cmds.hSignature · 1 line
2.17.2--
Dr. David Alan Gilbert / [email protected] / Manchester, UK