[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/10] monitor: Convert do_migrate_cancel() to QObje
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 06/10] monitor: Convert do_migrate_cancel() to QObject |
Date: |
Thu, 8 Oct 2009 18:35:43 -0300 |
Signed-off-by: Luiz Capitulino <address@hidden>
---
migration.c | 5 ++++-
migration.h | 2 +-
qemu-monitor.hx | 3 ++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/migration.c b/migration.c
index c2baeea..112a5b6 100644
--- a/migration.c
+++ b/migration.c
@@ -85,7 +85,10 @@ void do_migrate(Monitor *mon, const QDict *qdict, QObject
**ret_data)
}
}
-void do_migrate_cancel(Monitor *mon, const QDict *qdict)
+/**
+ * do_migrate_cancel(): Cancel the current VM migration.
+ */
+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 40bd610..2d28b8f 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 af1bae5..41fbfd3 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
--
1.6.5.rc2.17.gdbc1b
[Qemu-devel] [PATCH 03/10] monitor: Convert do_physical_memory_save() to QObject, Luiz Capitulino, 2009/10/08
[Qemu-devel] [PATCH 04/10] monitor: Convert do_migrate() to QObject, Luiz Capitulino, 2009/10/08
[Qemu-devel] [PATCH 05/10] monitor: Convert do_migrate_set_speed() to QObject, Luiz Capitulino, 2009/10/08
[Qemu-devel] [PATCH 06/10] monitor: Convert do_migrate_cancel() to QObject,
Luiz Capitulino <=
[Qemu-devel] [PATCH 08/10] monitor: Convert bdrv_info() to QObject, Luiz Capitulino, 2009/10/08
Re: [Qemu-devel] [PATCH 08/10] monitor: Convert bdrv_info() to QObject, Anthony Liguori, 2009/10/15
[Qemu-devel] [PATCH 07/10] monitor: Convert do_info_migrate() to QObject, Luiz Capitulino, 2009/10/08
[Qemu-devel] [PATCH 09/10] monitor: Convert pci_device_hot_add() to QObject, Luiz Capitulino, 2009/10/08
[Qemu-devel] [PATCH 10/10] monitor: Convert do_pci_device_hot_remove() to QObject, Luiz Capitulino, 2009/10/08