From patchwork Tue Sep 20 14:19:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 115581 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D56BFB70C7 for ; Wed, 21 Sep 2011 01:29:45 +1000 (EST) Received: from localhost ([::1]:59282 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R61Bw-0005qG-7j for incoming@patchwork.ozlabs.org; Tue, 20 Sep 2011 10:20:56 -0400 Received: from eggs.gnu.org ([140.186.70.92]:39251) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R61BN-0004sX-QC for qemu-devel@nongnu.org; Tue, 20 Sep 2011 10:20:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R61BK-0008Cj-B8 for qemu-devel@nongnu.org; Tue, 20 Sep 2011 10:20:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42784) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R61BJ-0008CU-SF for qemu-devel@nongnu.org; Tue, 20 Sep 2011 10:20:18 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p8KEKGeg015218 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 20 Sep 2011 10:20:16 -0400 Received: from trasno.mitica (ovpn-113-56.phx2.redhat.com [10.3.113.56]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p8KEJv9h015328; Tue, 20 Sep 2011 10:20:15 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 20 Sep 2011 16:19:42 +0200 Message-Id: <615f9ca6cacb057bfb4ea35554e10226a43fdd82.1316526970.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 14/23] migration: Move exported functions to the end of the file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This means we can remove the two forward declarations. Signed-off-by: Juan Quintela --- migration.c | 188 ++++++++++++++++++++++++++++------------------------------ 1 files changed, 91 insertions(+), 97 deletions(-) diff --git a/migration.c b/migration.c index 306ac4e..642fee1 100644 --- a/migration.c +++ b/migration.c @@ -76,91 +76,6 @@ void process_incoming_migration(QEMUFile *f) vm_start(); } -static MigrationState *migrate_create_state(Monitor *mon, - int64_t bandwidth_limit, - int detach, int blk, int inc); - -int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) -{ - MigrationState *s = NULL; - const char *p; - int detach = qdict_get_try_bool(qdict, "detach", 0); - int blk = qdict_get_try_bool(qdict, "blk", 0); - int inc = qdict_get_try_bool(qdict, "inc", 0); - const char *uri = qdict_get_str(qdict, "uri"); - int ret; - - if (current_migration && - current_migration->state == MIG_STATE_ACTIVE) { - monitor_printf(mon, "migration already in progress\n"); - return -1; - } - - if (qemu_savevm_state_blocked(mon)) { - return -1; - } - - s = migrate_create_state(mon, max_throttle, detach, blk, inc); - - if (strstart(uri, "tcp:", &p)) { - ret = tcp_start_outgoing_migration(s, p); -#if !defined(WIN32) - } else if (strstart(uri, "exec:", &p)) { - ret = exec_start_outgoing_migration(s, p); - } else if (strstart(uri, "unix:", &p)) { - ret = unix_start_outgoing_migration(s, p); - } else if (strstart(uri, "fd:", &p)) { - ret = fd_start_outgoing_migration(s, p); -#endif - } else { - monitor_printf(mon, "unknown migration protocol: %s\n", uri); - ret = -EINVAL; - goto free_migrate_state; - } - - if (ret < 0) { - monitor_printf(mon, "migration failed\n"); - goto free_migrate_state; - } - - g_free(current_migration); - current_migration = s; - notifier_list_notify(&migration_state_notifiers, NULL); - return 0; -free_migrate_state: - g_free(s); - return -1; -} - -static void migrate_fd_cancel(MigrationState *s); - -int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data) -{ - if (current_migration) { - migrate_fd_cancel(current_migration); - } - return 0; -} - -int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data) -{ - int64_t d; - MigrationState *s; - - d = qdict_get_int(qdict, "value"); - if (d < 0) { - d = 0; - } - max_throttle = d; - - s = current_migration; - if (s && s->file) { - qemu_file_set_rate_limit(s->file, max_throttle); - } - - return 0; -} - /* amount of nanoseconds we are willing to wait for migration to be down. * the choice of nanoseconds is because it is the maximum resolution that * get_clock() can achieve. It is an internal measure. All user-visible @@ -172,18 +87,6 @@ uint64_t migrate_max_downtime(void) return max_downtime; } -int do_migrate_set_downtime(Monitor *mon, const QDict *qdict, - QObject **ret_data) -{ - double d; - - d = qdict_get_double(qdict, "value") * 1e9; - d = MAX(0, MIN(UINT64_MAX, d)); - max_downtime = (uint64_t)d; - - return 0; -} - static void migrate_print_status(Monitor *mon, const char *name, const QDict *status_dict) { @@ -492,3 +395,94 @@ static MigrationState *migrate_create_state(Monitor *mon, return s; } + +int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) +{ + MigrationState *s = NULL; + const char *p; + int detach = qdict_get_try_bool(qdict, "detach", 0); + int blk = qdict_get_try_bool(qdict, "blk", 0); + int inc = qdict_get_try_bool(qdict, "inc", 0); + const char *uri = qdict_get_str(qdict, "uri"); + int ret; + + if (current_migration && + current_migration->state == MIG_STATE_ACTIVE) { + monitor_printf(mon, "migration already in progress\n"); + return -1; + } + + if (qemu_savevm_state_blocked(mon)) { + return -1; + } + + s = migrate_create_state(mon, max_throttle, detach, blk, inc); + + if (strstart(uri, "tcp:", &p)) { + ret = tcp_start_outgoing_migration(s, p); +#if !defined(WIN32) + } else if (strstart(uri, "exec:", &p)) { + ret = exec_start_outgoing_migration(s, p); + } else if (strstart(uri, "unix:", &p)) { + ret = unix_start_outgoing_migration(s, p); + } else if (strstart(uri, "fd:", &p)) { + ret = fd_start_outgoing_migration(s, p); +#endif + } else { + monitor_printf(mon, "unknown migration protocol: %s\n", uri); + ret = -EINVAL; + goto free_migrate_state; + } + + if (ret < 0) { + monitor_printf(mon, "migration failed\n"); + goto free_migrate_state; + } + + g_free(current_migration); + current_migration = s; + notifier_list_notify(&migration_state_notifiers, NULL); + return 0; +free_migrate_state: + g_free(s); + return -1; +} + +int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data) +{ + if (current_migration) { + migrate_fd_cancel(current_migration); + } + return 0; +} + +int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data) +{ + int64_t d; + MigrationState *s; + + d = qdict_get_int(qdict, "value"); + if (d < 0) { + d = 0; + } + max_throttle = d; + + s = current_migration; + if (s && s->file) { + qemu_file_set_rate_limit(s->file, max_throttle); + } + + return 0; +} + +int do_migrate_set_downtime(Monitor *mon, const QDict *qdict, + QObject **ret_data) +{ + double d; + + d = qdict_get_double(qdict, "value") * 1e9; + d = MAX(0, MIN(UINT64_MAX, d)); + max_downtime = (uint64_t)d; + + return 0; +}