[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/22] migration: move migrate_create_state to do_mi
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 07/22] migration: move migrate_create_state to do_migrate |
Date: |
Wed, 23 Feb 2011 01:44:21 +0100 |
Once there, remove all parameters that don't need to be passed to
*start_outgoing_migration() functions
Signed-off-by: Juan Quintela <address@hidden>
---
migration-exec.c | 19 +++++--------------
migration-fd.c | 22 ++++++----------------
migration-tcp.c | 20 ++++++--------------
migration-unix.c | 19 +++++--------------
migration.c | 32 +++++++++++++++++++-------------
migration.h | 31 ++++---------------------------
6 files changed, 45 insertions(+), 98 deletions(-)
diff --git a/migration-exec.c b/migration-exec.c
index 67dec27..ed0798b 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -62,22 +62,14 @@ static int exec_close(MigrationState *s)
return ret;
}
-MigrationState *exec_start_outgoing_migration(Monitor *mon,
- const char *command,
- int64_t bandwidth_limit,
- int detach,
- int blk,
- int inc)
+int exec_start_outgoing_migration(MigrationState *s, const char *command)
{
- MigrationState *s;
FILE *f;
- s = migrate_create_state(mon, bandwidth_limit, detach, blk, inc);
-
f = popen(command, "w");
if (f == NULL) {
DPRINTF("Unable to popen exec target\n");
- goto err_after_alloc;
+ goto err_after_popen;
}
s->fd = fileno(f);
@@ -95,13 +87,12 @@ MigrationState *exec_start_outgoing_migration(Monitor *mon,
s->write = file_write;
migrate_fd_connect(s);
- return s;
+ return 0;
err_after_open:
pclose(f);
-err_after_alloc:
- qemu_free(s);
- return NULL;
+err_after_popen:
+ return -1;
}
static void exec_accept_incoming_migration(void *opaque)
diff --git a/migration-fd.c b/migration-fd.c
index 1deedd7..e2dd61f 100644
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -51,21 +51,12 @@ static int fd_close(MigrationState *s)
return 0;
}
-MigrationState *fd_start_outgoing_migration(Monitor *mon,
- const char *fdname,
- int64_t bandwidth_limit,
- int detach,
- int blk,
- int inc)
+int fd_start_outgoing_migration(MigrationState *s, const char *fdname)
{
- MigrationState *s;
-
- s = migrate_create_state(mon, bandwidth_limit, detach, blk, inc);
-
- s->fd = monitor_get_fd(mon, fdname);
+ s->fd = monitor_get_fd(s->mon, fdname);
if (s->fd == -1) {
DPRINTF("fd_migration: invalid file descriptor identifier\n");
- goto err_after_alloc;
+ goto err_after_get_fd;
}
if (fcntl(s->fd, F_SETFL, O_NONBLOCK) == -1) {
@@ -78,13 +69,12 @@ MigrationState *fd_start_outgoing_migration(Monitor *mon,
s->close = fd_close;
migrate_fd_connect(s);
- return s;
+ return 0;
err_after_open:
close(s->fd);
-err_after_alloc:
- qemu_free(s);
- return NULL;
+err_after_get_fd:
+ return -1;
}
static void fd_accept_incoming_migration(void *opaque)
diff --git a/migration-tcp.c b/migration-tcp.c
index c1c7bc3..ac69681 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -76,21 +76,14 @@ static void tcp_wait_for_connect(void *opaque)
}
}
-MigrationState *tcp_start_outgoing_migration(Monitor *mon,
- const char *host_port,
- int64_t bandwidth_limit,
- int detach,
- int blk,
- int inc)
+int tcp_start_outgoing_migration(MigrationState *s, const char *host_port)
{
struct sockaddr_in addr;
- MigrationState *s;
int ret;
- if (parse_host_port(&addr, host_port) < 0)
- return NULL;
-
- s = migrate_create_state(mon, bandwidth_limit, detach, blk, inc);
+ ret = parse_host_port(&addr, host_port);
+ if (ret < 0)
+ return ret;
s->get_error = socket_errno;
s->write = socket_write;
@@ -98,8 +91,7 @@ MigrationState *tcp_start_outgoing_migration(Monitor *mon,
s->fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
if (s->fd == -1) {
- qemu_free(s);
- return NULL;
+ return -1;
}
socket_set_nonblock(s->fd);
@@ -119,7 +111,7 @@ MigrationState *tcp_start_outgoing_migration(Monitor *mon,
} else if (ret >= 0)
migrate_fd_connect(s);
- return s;
+ return 0;
}
static void tcp_accept_incoming_migration(void *opaque)
diff --git a/migration-unix.c b/migration-unix.c
index 94995af..d562456 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -75,22 +75,14 @@ static void unix_wait_for_connect(void *opaque)
}
}
-MigrationState *unix_start_outgoing_migration(Monitor *mon,
- const char *path,
- int64_t bandwidth_limit,
- int detach,
- int blk,
- int inc)
+int unix_start_outgoing_migration(MigrationState *s, const char *path)
{
- MigrationState *s;
struct sockaddr_un addr;
int ret;
addr.sun_family = AF_UNIX;
snprintf(addr.sun_path, sizeof(addr.sun_path), "%s", path);
- s = migrate_create_state(mon, bandwidth_limit, detach, blk, inc);
-
s->get_error = unix_errno;
s->write = unix_write;
s->close = unix_close;
@@ -98,7 +90,7 @@ MigrationState *unix_start_outgoing_migration(Monitor *mon,
s->fd = qemu_socket(PF_UNIX, SOCK_STREAM, 0);
if (s->fd < 0) {
DPRINTF("Unable to open socket");
- goto err_after_alloc;
+ goto err_after_socket;
}
socket_set_nonblock(s->fd);
@@ -120,14 +112,13 @@ MigrationState *unix_start_outgoing_migration(Monitor
*mon,
if (ret >= 0)
migrate_fd_connect(s);
- return s;
+ return 0;
err_after_open:
close(s->fd);
-err_after_alloc:
- qemu_free(s);
- return NULL;
+err_after_socket:
+ return -1;
}
static void unix_accept_incoming_migration(void *opaque)
diff --git a/migration.c b/migration.c
index 1853380..397a0b9 100644
--- a/migration.c
+++ b/migration.c
@@ -76,6 +76,9 @@ 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;
@@ -84,6 +87,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject
**ret_data)
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->get_status(current_migration) == MIG_STATE_ACTIVE) {
@@ -95,28 +99,27 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject
**ret_data)
return -1;
}
+ s = migrate_create_state(mon, max_throttle, detach, blk, inc);
+
if (strstart(uri, "tcp:", &p)) {
- s = tcp_start_outgoing_migration(mon, p, max_throttle, detach,
- blk, inc);
+ ret = tcp_start_outgoing_migration(s, p);
#if !defined(WIN32)
} else if (strstart(uri, "exec:", &p)) {
- s = exec_start_outgoing_migration(mon, p, max_throttle, detach,
- blk, inc);
+ ret = exec_start_outgoing_migration(s, p);
} else if (strstart(uri, "unix:", &p)) {
- s = unix_start_outgoing_migration(mon, p, max_throttle, detach,
- blk, inc);
+ ret = unix_start_outgoing_migration(s, p);
} else if (strstart(uri, "fd:", &p)) {
- s = fd_start_outgoing_migration(mon, p, max_throttle, detach,
- blk, inc);
+ ret = fd_start_outgoing_migration(s, p);
#endif
} else {
monitor_printf(mon, "unknown migration protocol: %s\n", uri);
- return -1;
+ ret = -EINVAL;
+ goto free_migrate_state;
}
- if (s == NULL) {
+ if (ret < 0) {
monitor_printf(mon, "migration failed\n");
- return -1;
+ goto free_migrate_state;
}
if (current_migration) {
@@ -126,6 +129,9 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject
**ret_data)
current_migration = s;
notifier_list_notify(&migration_state_notifiers);
return 0;
+free_migrate_state:
+ qemu_free(s);
+ return -1;
}
int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data)
@@ -477,8 +483,8 @@ void migrate_fd_connect(MigrationState *s)
migrate_fd_put_ready(s);
}
-MigrationState *migrate_create_state(Monitor *mon, int64_t bandwidth_limit,
- int detach, int blk, int inc)
+static MigrationState *migrate_create_state(Monitor *mon, int64_t
bandwidth_limit,
+ int detach, int blk, int inc)
{
MigrationState *s = qemu_mallocz(sizeof(*s));
diff --git a/migration.h b/migration.h
index 048ee46..7d28dd3 100644
--- a/migration.h
+++ b/migration.h
@@ -64,47 +64,24 @@ 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,
- const char *host_port,
- int64_t bandwidth_limit,
- int detach,
- int blk,
- int inc);
+int exec_start_outgoing_migration(MigrationState *s, const char *host_port);
int tcp_start_incoming_migration(const char *host_port);
-MigrationState *tcp_start_outgoing_migration(Monitor *mon,
- const char *host_port,
- int64_t bandwidth_limit,
- int detach,
- int blk,
- int inc);
+int tcp_start_outgoing_migration(MigrationState *s, const char *host_port);
int unix_start_incoming_migration(const char *path);
-MigrationState *unix_start_outgoing_migration(Monitor *mon,
- const char *path,
- int64_t bandwidth_limit,
- int detach,
- int blk,
- int inc);
+int unix_start_outgoing_migration(MigrationState *s, const char *path);
int fd_start_incoming_migration(const char *path);
-MigrationState *fd_start_outgoing_migration(Monitor *mon,
- const char *fdname,
- int64_t bandwidth_limit,
- int detach,
- int blk,
- int inc);
+int fd_start_outgoing_migration(MigrationState *s, const char *fdname);
void migrate_fd_error(MigrationState *s);
void migrate_fd_connect(MigrationState *s);
-MigrationState *migrate_create_state(Monitor *mon, int64_t bandwidth_limit,
- int detach, int blk, int inc);
-
void add_migration_state_change_notifier(Notifier *notify);
void remove_migration_state_change_notifier(Notifier *notify);
int get_migration_state(void);
--
1.7.4
- [Qemu-devel] Re: [PATCH 03/22] migration: Fold MigrationState into FdMigrationState, (continued)
- [Qemu-devel] [PATCH 04/22] migration: Rename FdMigrationState MigrationState, Juan Quintela, 2011/02/22
- [Qemu-devel] [PATCH 05/22] migration: Refactor MigrationState creation, Juan Quintela, 2011/02/22
- [Qemu-devel] [PATCH 06/22] migration: Make all posible migration functions static, Juan Quintela, 2011/02/22
- [Qemu-devel] [PATCH 08/22] migration: Check that migration is active before cancel it, Juan Quintela, 2011/02/22
- [Qemu-devel] [PATCH 09/22] migration: Introduce MIG_STATE_NONE, Juan Quintela, 2011/02/22
- [Qemu-devel] [PATCH 07/22] migration: move migrate_create_state to do_migrate,
Juan Quintela <=
- [Qemu-devel] [PATCH 10/22] migration: Refactor and simplify error checking in migrate_fd_put_ready, Juan Quintela, 2011/02/22
- [Qemu-devel] [PATCH 11/22] migration: Introduce migrate_fd_completed() for consistenncy, Juan Quintela, 2011/02/22
- [Qemu-devel] [PATCH 12/22] migration: Use migrate_fd_error() in last place that set status to ERROR, Juan Quintela, 2011/02/22
- [Qemu-devel] [PATCH 13/22] migration: Our release callback was just free, Juan Quintela, 2011/02/22
- [Qemu-devel] [PATCH 15/22] migration: Remove migration cancel() callback, Juan Quintela, 2011/02/22
- [Qemu-devel] [PATCH 14/22] migration: Remove get_status() accessor, Juan Quintela, 2011/02/22