From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
To: Maxim Levitsky <mlevitsk@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>,
qemu-block@nongnu.org, Markus Armbruster <armbru@redhat.com>,
qemu-devel@nongnu.org, Gerd Hoffmann <kraxel@redhat.com>,
Max Reitz <mreitz@redhat.com>
Subject: 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+
Date: Mon, 9 Mar 2020 16:31:13 +0000 [thread overview]
Message-ID: <20200309163113.GH3088@work-vm> (raw)
In-Reply-To: <9cf9655745608e9a12208524dc72196493644290.camel@redhat.com>
* Maxim Levitsky (mlevitsk@redhat.com) 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
> Best regards,
> Maxim Levitsky
>
> On Sun, 2020-03-08 at 11:24 +0200, Maxim Levitsky wrote:
> > Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
> > Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> > ---
> > 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(-)
> >
> > diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
> > index ad727a6b08..d6dd5d97f7 100644
> > --- a/block/monitor/block-hmp-cmds.c
> > +++ b/block/monitor/block-hmp-cmds.c
> > @@ -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);
> > +}
> > diff --git a/include/block/block-hmp-cmds.h b/include/block/block-hmp-cmds.h
> > index 30b0f56415..a64b737b3a 100644
> > --- a/include/block/block-hmp-cmds.h
> > +++ b/include/block/block-hmp-cmds.h
> > @@ -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 <aliguori@us.ibm.com>
> > + *
> > + * 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
> > 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 fb4c2fd2a8..06f0cb4bb9 100644
> > --- a/monitor/hmp-cmds.c
> > +++ b/monitor/hmp-cmds.c
> > @@ -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");
>
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
next prev parent reply other threads:[~2020-03-09 16:32 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-08 9:24 [PATCH v5 00/11] HMP monitor handlers refactoring Maxim Levitsky
2020-03-08 9:24 ` [PATCH v5 01/11] usb/dev-storage: remove unused include Maxim Levitsky
2020-03-08 9:24 ` [PATCH v5 02/11] monitor/hmp: inline add_init_drive Maxim Levitsky
2020-03-08 9:24 ` [PATCH v5 03/11] monitor/hmp: rename device-hotplug.c to block/monitor/block-hmp-cmds.c Maxim Levitsky
2020-03-08 9:24 ` [PATCH v5 04/11] monitor/hmp: move hmp_drive_del and hmp_commit to block-hmp-cmds.c Maxim Levitsky
2020-03-08 9:24 ` [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+ Maxim Levitsky
2020-03-08 9:29 ` Maxim Levitsky
2020-03-09 16:31 ` Dr. David Alan Gilbert [this message]
2020-03-09 16:35 ` Maxim Levitsky
2020-03-08 9:24 ` [PATCH v5 06/11] monitor/hmp: move hmp_block_job* to block-hmp-cmds.c Maxim Levitsky
2020-03-08 9:24 ` [PATCH v5 07/11] monitor/hmp: move hmp_snapshot_* " Maxim Levitsky
2020-03-08 9:24 ` [PATCH v5 08/11] monitor/hmp: move hmp_nbd_server* " Maxim Levitsky
2020-03-08 9:24 ` [PATCH v5 09/11] monitor/hmp: move remaining hmp_block* functions " Maxim Levitsky
2020-03-08 9:24 ` [PATCH v5 10/11] monitor/hmp: move hmp_info_block* " Maxim Levitsky
2020-03-08 9:24 ` [PATCH v5 11/11] monitor/hmp: Move hmp_drive_add_node " Maxim Levitsky
2020-03-09 18:30 ` [PATCH v5 00/11] HMP monitor handlers refactoring Dr. David Alan Gilbert
2020-03-09 18:35 ` Maxim Levitsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200309163113.GH3088@work-vm \
--to=dgilbert@redhat.com \
--cc=armbru@redhat.com \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=mlevitsk@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.