Re: [Qemu-devel] [PATCH 2/6] monitor: Move hmp_loadvm from monitor.c to hmp.c

[Laurent Vivier]

On 25/04/2017 12:24, Juan Quintela wrote:
> We are going to move the rest of hmp snapshots functions there instead
> of monitor.c.
> 
> Signed-off-by: Juan Quintela <address@hidden>

Reviewed-by: Laurent Vivier <address@hidden>

> ---
>  hmp.c     | 13 +++++++++++++
>  hmp.h     |  1 +
>  monitor.c | 13 -------------
>  3 files changed, 14 insertions(+), 13 deletions(-)
> 
> diff --git a/hmp.c b/hmp.c
> index ab407d6..f6b8738 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -19,6 +19,7 @@
>  #include "net/eth.h"
>  #include "sysemu/char.h"
>  #include "sysemu/block-backend.h"
> +#include "sysemu/sysemu.h"
>  #include "qemu/config-file.h"
>  #include "qemu/option.h"
>  #include "qemu/timer.h"
> @@ -1268,6 +1269,18 @@ void hmp_snapshot_delete_blkdev_internal(Monitor *mon, 
> const QDict *qdict)
>      hmp_handle_error(mon, &err);
>  }
>  
> +void hmp_loadvm(Monitor *mon, const QDict *qdict)
> +{
> +    int saved_vm_running  = runstate_is_running();
> +    const char *name = qdict_get_str(qdict, "name");
> +
> +    vm_stop(RUN_STATE_RESTORE_VM);
> +
> +    if (load_vmstate(name) == 0 && saved_vm_running) {
> +        vm_start();
> +    }
> +}
> +
>  void hmp_migrate_cancel(Monitor *mon, const QDict *qdict)
>  {
>      qmp_migrate_cancel(NULL);
> diff --git a/hmp.h b/hmp.h
> index 799fd37..385332c 100644
> --- a/hmp.h
> +++ b/hmp.h
> @@ -63,6 +63,7 @@ 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_migrate_cancel(Monitor *mon, const QDict *qdict);
>  void hmp_migrate_incoming(Monitor *mon, const QDict *qdict);
>  void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict);
> diff --git a/monitor.c b/monitor.c
> index be282ec..d02900d 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -37,7 +37,6 @@
>  #include "net/slirp.h"
>  #include "sysemu/char.h"
>  #include "ui/qemu-spice.h"
> -#include "sysemu/sysemu.h"
>  #include "sysemu/numa.h"
>  #include "monitor/monitor.h"
>  #include "qemu/config-file.h"
> @@ -1843,18 +1842,6 @@ void qmp_closefd(const char *fdname, Error **errp)
>      error_setg(errp, QERR_FD_NOT_FOUND, fdname);
>  }
>  
> -static void hmp_loadvm(Monitor *mon, const QDict *qdict)
> -{
> -    int saved_vm_running  = runstate_is_running();
> -    const char *name = qdict_get_str(qdict, "name");
> -
> -    vm_stop(RUN_STATE_RESTORE_VM);
> -
> -    if (load_vmstate(name) == 0 && saved_vm_running) {
> -        vm_start();
> -    }
> -}
> -
>  int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp)
>  {
>      mon_fd_t *monfd;
>