| Message ID | 20200127103647.17761-6-mlevitsk@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | RFC: [for 5.0]: HMP monitor handlers cleanups | expand |
* Maxim Levitsky (mlevitsk@redhat.com) wrote: > Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > block/monitor/block-hmp-cmds.c | 64 ++++++++++++++++++++++++++++++ > include/block/block-hmp-commands.h | 3 ++ > include/monitor/hmp.h | 2 - > monitor/hmp-cmds.c | 58 --------------------------- > 4 files changed, 67 insertions(+), 60 deletions(-) > > diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c > index 9614c67e77..ae3890aaab 100644 > --- a/block/monitor/block-hmp-cmds.c > +++ b/block/monitor/block-hmp-cmds.c > @@ -2,6 +2,10 @@ > * Blockdev HMP commands > * > * Copyright (c) 2004 Fabrice Bellard > + * Copyright IBM, Corp. 2011 > + * > + * Authors: > + * Anthony Liguori <aliguori@us.ibm.com> > * > * This work is licensed under the terms of the GNU GPL, version 2. > * or (at your option) any later version. > @@ -15,12 +19,14 @@ > #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 "block/block_int.h" > #include "block/block-hmp-commands.h" > +#include "monitor/hmp.h" > > void hmp_drive_add(Monitor *mon, const QDict *qdict) > { > @@ -164,3 +170,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); > +} > diff --git a/include/block/block-hmp-commands.h b/include/block/block-hmp-commands.h > index c5e394c0fc..fcaf753118 100644 > --- a/include/block/block-hmp-commands.h > +++ b/include/block/block-hmp-commands.h > @@ -8,4 +8,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 > diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h > index 3d329853b2..c1b363ee57 100644 > --- a/include/monitor/hmp.h > +++ b/include/monitor/hmp.h > @@ -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); > diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c > index d0e0af893a..a70bcb1d16 100644 > --- a/monitor/hmp-cmds.c > +++ b/monitor/hmp-cmds.c > @@ -1337,64 +1337,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"); > -- > 2.17.2 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c index 9614c67e77..ae3890aaab 100644 --- a/block/monitor/block-hmp-cmds.c +++ b/block/monitor/block-hmp-cmds.c @@ -2,6 +2,10 @@ * Blockdev HMP commands * * Copyright (c) 2004 Fabrice Bellard + * Copyright IBM, Corp. 2011 + * + * Authors: + * Anthony Liguori <aliguori@us.ibm.com> * * This work is licensed under the terms of the GNU GPL, version 2. * or (at your option) any later version. @@ -15,12 +19,14 @@ #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 "block/block_int.h" #include "block/block-hmp-commands.h" +#include "monitor/hmp.h" void hmp_drive_add(Monitor *mon, const QDict *qdict) { @@ -164,3 +170,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); +} diff --git a/include/block/block-hmp-commands.h b/include/block/block-hmp-commands.h index c5e394c0fc..fcaf753118 100644 --- a/include/block/block-hmp-commands.h +++ b/include/block/block-hmp-commands.h @@ -8,4 +8,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 diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index 3d329853b2..c1b363ee57 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -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); diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index d0e0af893a..a70bcb1d16 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -1337,64 +1337,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");
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com> --- block/monitor/block-hmp-cmds.c | 64 ++++++++++++++++++++++++++++++ include/block/block-hmp-commands.h | 3 ++ include/monitor/hmp.h | 2 - monitor/hmp-cmds.c | 58 --------------------------- 4 files changed, 67 insertions(+), 60 deletions(-)