diff --git a/migration.c b/migration.c index 9a40b37ca9e63538b2c47cd0c2a8f091b938f5ed..b20beb73026ee84d0c4e1c7c9ce8e2c0616833b3 100644 --- a/migration.c +++ b/migration.c @@ -82,7 +82,7 @@ void do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) } } -void do_migrate_cancel(Monitor *mon, const QDict *qdict) +void do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data) { MigrationState *s = current_migration; diff --git a/migration.h b/migration.h index 40bd610a3244393f1a0a894a28debb454fcb6ca3..2d28b8f395c99cf1978608147780d1b789303ffb 100644 --- a/migration.h +++ b/migration.h @@ -52,7 +52,7 @@ void qemu_start_incoming_migration(const char *uri); void do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data); -void do_migrate_cancel(Monitor *mon, const QDict *qdict); +void do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data); void do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data); diff --git a/qemu-monitor.hx b/qemu-monitor.hx index af1bae5850acc95bf52826afe7f9d1c901915cb3..41fbfd374eeef3811bed2b6d272003182037df67 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -740,7 +740,8 @@ ETEXI .args_type = "", .params = "", .help = "cancel the current VM migration", - .mhandler.cmd = do_migrate_cancel, + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_migrate_cancel, }, STEXI