From patchwork Wed Feb 23 00:44:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 84019 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 65940B7111 for ; Wed, 23 Feb 2011 11:46:19 +1100 (EST) Received: from localhost ([127.0.0.1]:43950 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ps2rw-0002nQ-Ck for incoming@patchwork.ozlabs.org; Tue, 22 Feb 2011 19:46:16 -0500 Received: from [140.186.70.92] (port=36532 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ps2qX-0002lx-Vm for qemu-devel@nongnu.org; Tue, 22 Feb 2011 19:44:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ps2qU-0005GS-Vj for qemu-devel@nongnu.org; Tue, 22 Feb 2011 19:44:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34755) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ps2qU-0005EY-LE for qemu-devel@nongnu.org; Tue, 22 Feb 2011 19:44:46 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p1N0ijG3001838 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 22 Feb 2011 19:44:45 -0500 Received: from trasno.mitica (ovpn-113-108.phx2.redhat.com [10.3.113.108]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p1N0ig2r026523; Tue, 22 Feb 2011 19:44:44 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 23 Feb 2011 01:44:15 +0100 Message-Id: <0c9c0708c785a967f7b2d18283e2f5a2ca142d8c.1298421307.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 01/22] migration: Make *start_outgoing_migration return FdMigrationState 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 Signed-off-by: Juan Quintela --- migration-exec.c | 4 ++-- migration-fd.c | 4 ++-- migration-tcp.c | 4 ++-- migration-unix.c | 4 ++-- migration.c | 4 ++-- migration.h | 8 ++++---- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/migration-exec.c b/migration-exec.c index 14718dd..b49a475 100644 --- a/migration-exec.c +++ b/migration-exec.c @@ -62,7 +62,7 @@ static int exec_close(FdMigrationState *s) return ret; } -MigrationState *exec_start_outgoing_migration(Monitor *mon, +FdMigrationState *exec_start_outgoing_migration(Monitor *mon, const char *command, int64_t bandwidth_limit, int detach, @@ -109,7 +109,7 @@ MigrationState *exec_start_outgoing_migration(Monitor *mon, } migrate_fd_connect(s); - return &s->mig_state; + return s; err_after_open: pclose(f); diff --git a/migration-fd.c b/migration-fd.c index 6d14505..bd5e8a9 100644 --- a/migration-fd.c +++ b/migration-fd.c @@ -51,7 +51,7 @@ static int fd_close(FdMigrationState *s) return 0; } -MigrationState *fd_start_outgoing_migration(Monitor *mon, +FdMigrationState *fd_start_outgoing_migration(Monitor *mon, const char *fdname, int64_t bandwidth_limit, int detach, @@ -92,7 +92,7 @@ MigrationState *fd_start_outgoing_migration(Monitor *mon, } migrate_fd_connect(s); - return &s->mig_state; + return s; err_after_open: close(s->fd); diff --git a/migration-tcp.c b/migration-tcp.c index b55f419..355bc37 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -76,7 +76,7 @@ static void tcp_wait_for_connect(void *opaque) } } -MigrationState *tcp_start_outgoing_migration(Monitor *mon, +FdMigrationState *tcp_start_outgoing_migration(Monitor *mon, const char *host_port, int64_t bandwidth_limit, int detach, @@ -132,7 +132,7 @@ MigrationState *tcp_start_outgoing_migration(Monitor *mon, } else if (ret >= 0) migrate_fd_connect(s); - return &s->mig_state; + return s; } static void tcp_accept_incoming_migration(void *opaque) diff --git a/migration-unix.c b/migration-unix.c index 57232c0..b9b0dbf 100644 --- a/migration-unix.c +++ b/migration-unix.c @@ -75,7 +75,7 @@ static void unix_wait_for_connect(void *opaque) } } -MigrationState *unix_start_outgoing_migration(Monitor *mon, +FdMigrationState *unix_start_outgoing_migration(Monitor *mon, const char *path, int64_t bandwidth_limit, int detach, @@ -133,7 +133,7 @@ MigrationState *unix_start_outgoing_migration(Monitor *mon, if (ret >= 0) migrate_fd_connect(s); - return &s->mig_state; + return s; err_after_open: close(s->fd); diff --git a/migration.c b/migration.c index af3a1f2..f9aaadc 100644 --- a/migration.c +++ b/migration.c @@ -78,7 +78,7 @@ void process_incoming_migration(QEMUFile *f) int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) { - MigrationState *s = NULL; + FdMigrationState *s = NULL; const char *p; int detach = qdict_get_try_bool(qdict, "detach", 0); int blk = qdict_get_try_bool(qdict, "blk", 0); @@ -123,7 +123,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) current_migration->release(current_migration); } - current_migration = s; + current_migration = &s->mig_state; notifier_list_notify(&migration_state_notifiers); return 0; } diff --git a/migration.h b/migration.h index 2170792..db0e45a 100644 --- a/migration.h +++ b/migration.h @@ -72,7 +72,7 @@ void do_info_migrate(Monitor *mon, QObject **ret_data); int exec_start_incoming_migration(const char *host_port); -MigrationState *exec_start_outgoing_migration(Monitor *mon, +FdMigrationState *exec_start_outgoing_migration(Monitor *mon, const char *host_port, int64_t bandwidth_limit, int detach, @@ -81,7 +81,7 @@ MigrationState *exec_start_outgoing_migration(Monitor *mon, int tcp_start_incoming_migration(const char *host_port); -MigrationState *tcp_start_outgoing_migration(Monitor *mon, +FdMigrationState *tcp_start_outgoing_migration(Monitor *mon, const char *host_port, int64_t bandwidth_limit, int detach, @@ -90,7 +90,7 @@ MigrationState *tcp_start_outgoing_migration(Monitor *mon, int unix_start_incoming_migration(const char *path); -MigrationState *unix_start_outgoing_migration(Monitor *mon, +FdMigrationState *unix_start_outgoing_migration(Monitor *mon, const char *path, int64_t bandwidth_limit, int detach, @@ -99,7 +99,7 @@ MigrationState *unix_start_outgoing_migration(Monitor *mon, int fd_start_incoming_migration(const char *path); -MigrationState *fd_start_outgoing_migration(Monitor *mon, +FdMigrationState *fd_start_outgoing_migration(Monitor *mon, const char *fdname, int64_t bandwidth_limit, int detach,