From patchwork Thu Oct 8 21:35:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 35534 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F38A0B7B6F for ; Fri, 9 Oct 2009 08:50:10 +1100 (EST) Received: from localhost ([127.0.0.1]:41112 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mw0sB-0002jl-5a for incoming@patchwork.ozlabs.org; Thu, 08 Oct 2009 17:50:07 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mw0em-0001AS-Cj for qemu-devel@nongnu.org; Thu, 08 Oct 2009 17:36:16 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mw0eh-000150-Bx for qemu-devel@nongnu.org; Thu, 08 Oct 2009 17:36:15 -0400 Received: from [199.232.76.173] (port=34342 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mw0eg-00013L-5T for qemu-devel@nongnu.org; Thu, 08 Oct 2009 17:36:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25914) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mw0ef-0002yp-Dc for qemu-devel@nongnu.org; Thu, 08 Oct 2009 17:36:09 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n98La8vs019659; Thu, 8 Oct 2009 17:36:08 -0400 Received: from localhost (vpn-13-37.rdu.redhat.com [10.11.13.37]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n98La72A023629; Thu, 8 Oct 2009 17:36:08 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Thu, 8 Oct 2009 18:35:41 -0300 Message-Id: <1255037747-3340-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1255037747-3340-1-git-send-email-lcapitulino@redhat.com> References: <1255037747-3340-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 04/10] monitor: Convert do_migrate() to QObject X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Error is still directly printed, as we are only converting regular output. Signed-off-by: Luiz Capitulino --- 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 7f93e3f..4212f71 100644 --- a/migration.c +++ b/migration.c @@ -52,7 +52,10 @@ void qemu_start_incoming_migration(const char *uri) fprintf(stderr, "unknown migration protocol: %s\n", uri); } -void do_migrate(Monitor *mon, const QDict *qdict) +/** + * do_migrate(): Migrate the VM. + */ +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