Commit fce2b91f authored by Maxim Levitsky's avatar Maxim Levitsky Committed by Dr. David Alan Gilbert
Browse files

monitor/hmp: move hmp_snapshot_* to block-hmp-cmds.c 



hmp_snapshot_blkdev is from GPLv2 version of the hmp-cmds.c thus
have to change the licence to GPLv2

Signed-off-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20200308092440.23564-8-mlevitsk@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 6b7fbf61

block/monitor/block-hmp-cmds.c

+56 −2
Original line number Diff line number Diff line 
/*

 * Blockdev HMP commands

 *

 *  Authors:

 *  Anthony Liguori   <aliguori@us.ibm.com>

 *

 * 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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -1342,53 +1342,6 @@ void hmp_block_resize(Monitor *mon, const QDict *qdict) 
    hmp_handle_error(mon, err);

}



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);

}



void hmp_loadvm(Monitor *mon, const QDict *qdict)

{

    int saved_vm_running  = runstate_is_running();