From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Myof6-0007Py-Ce for qemu-devel@nongnu.org; Fri, 16 Oct 2009 11:24:12 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Myoez-0007Ek-Mo for qemu-devel@nongnu.org; Fri, 16 Oct 2009 11:24:10 -0400 Received: from [199.232.76.173] (port=55646 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Myoez-0007E3-7t for qemu-devel@nongnu.org; Fri, 16 Oct 2009 11:24:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60977) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Myoey-0007Wq-Nx for qemu-devel@nongnu.org; Fri, 16 Oct 2009 11:24:05 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9GFO3kZ032027 for ; Fri, 16 Oct 2009 11:24:03 -0400 Received: from localhost (vpn-13-155.rdu.redhat.com [10.11.13.155]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n9GFO2V7023352 for ; Fri, 16 Oct 2009 11:24:03 -0400 From: Luiz Capitulino Date: Fri, 16 Oct 2009 12:23:45 -0300 Message-Id: <1255706631-3742-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1255706631-3742-1-git-send-email-lcapitulino@redhat.com> References: <1255706631-3742-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 3/9] monitor: Convert do_migrate() to QObject List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Error is still directly printed, as we are only converting regular output. Signed-off-by: Luiz Capitulino --- migration.c | 2 +- migration.h | 2 +- qemu-monitor.hx | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/migration.c b/migration.c index 7f93e3f..fb37d1b 100644 --- a/migration.c +++ b/migration.c @@ -52,7 +52,7 @@ void qemu_start_incoming_migration(const char *uri) fprintf(stderr, "unknown migration protocol: %s\n", uri); } -void do_migrate(Monitor *mon, const QDict *qdict) +void do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) { MigrationState *s = NULL; const char *p; diff --git a/migration.h b/migration.h index 53b923d..17ca9ff 100644 --- a/migration.h +++ b/migration.h @@ -50,7 +50,7 @@ struct FdMigrationState void qemu_start_incoming_migration(const char *uri); -void do_migrate(Monitor *mon, const QDict *qdict); +void do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data); void do_migrate_cancel(Monitor *mon, const QDict *qdict); diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 1c605bd..8e7bfd4 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -726,7 +726,8 @@ ETEXI .args_type = "detach:-d,uri:s", .params = "[-d] uri", .help = "migrate to URI (using -d to not wait for completion)", - .mhandler.cmd = do_migrate, + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_migrate, }, STEXI -- 1.6.5.rc3.8.g8ba5e