OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qapi: Convert migrate_cancel

Browse Source 
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Luiz Capitulino 2011-11-27 22:54:09 -02:00
parent d51a67b4d3
commit 6cdedb075f
7 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hmp-commands.hx
View File

@ -771,8 +771,7 @@ ETEXI
.args_type = "", .args_type = "",
.params = "", .params = "",
.help = "cancel the current VM migration", .help = "cancel the current VM migration",
.user_print = monitor_user_noop, .mhandler.cmd = hmp_migrate_cancel,
.mhandler.cmd_new = do_migrate_cancel,
}, },
STEXI STEXI

5
hmp.c
View File

@ -662,3 +662,8 @@ void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict)
qmp_blockdev_snapshot_sync(device, filename, !!format, format, &errp); qmp_blockdev_snapshot_sync(device, filename, !!format, format, &errp);
hmp_handle_error(mon, &errp); hmp_handle_error(mon, &errp);
} }
void hmp_migrate_cancel(Monitor *mon, const QDict *qdict)
{
qmp_migrate_cancel(NULL);
}

1
hmp.h
View File

@ -46,5 +46,6 @@ void hmp_block_passwd(Monitor *mon, const QDict *qdict);
void hmp_balloon(Monitor *mon, const QDict *qdict); void hmp_balloon(Monitor *mon, const QDict *qdict);
void hmp_block_resize(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(Monitor *mon, const QDict *qdict);
void hmp_migrate_cancel(Monitor *mon, const QDict *qdict);
#endif #endif

3
migration.c
View File

@ -468,10 +468,9 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
return 0; return 0;
} }
int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data) void qmp_migrate_cancel(Error **errp)
{ {
migrate_fd_cancel(migrate_get_current()); migrate_fd_cancel(migrate_get_current());
return 0;
} }
int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data) int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data)

2
migration.h
View File

@ -42,8 +42,6 @@ int qemu_start_incoming_migration(const char *uri);
int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data); int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data);
int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data);
int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data); int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data);
uint64_t migrate_max_downtime(void); uint64_t migrate_max_downtime(void);

13
qapi-schema.json
View File

@ -1127,3 +1127,16 @@
{ 'command': 'human-monitor-command', { 'command': 'human-monitor-command',
'data': {'command-line': 'str', '*cpu-index': 'int'}, 'data': {'command-line': 'str', '*cpu-index': 'int'},
'returns': 'str' } 'returns': 'str' }
##
# @migrate_cancel
#
# Cancel the current executing migration process.
#
# Returns: nothing on success
#
# Notes: This command succeeds even if there is no migration process running.
#
# Since: 0.14.0
##
{ 'command': 'migrate_cancel' }

5
qmp-commands.hx
View File

@ -471,10 +471,7 @@ EQMP
{ {
.name = "migrate_cancel", .name = "migrate_cancel",
.args_type = "", .args_type = "",
.params = "", .mhandler.cmd_new = qmp_marshal_input_migrate_cancel,
.help = "cancel the current VM migration",
.user_print = monitor_user_noop,
.mhandler.cmd_new = do_migrate_cancel,
}, },
SQMP SQMP