* [Qemu-devel] [PATCH 01/28] migration: Make *start_outgoing_migration return FdMigrationState
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 02/28] migration: Use FdMigrationState instead of MigrationState when possible Juan Quintela
` (27 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
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,
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 02/28] migration: Use FdMigrationState instead of MigrationState when possible
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 01/28] migration: Make *start_outgoing_migration return FdMigrationState Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 03/28] migration: Fold MigrationState into FdMigrationState Juan Quintela
` (26 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration.c | 32 +++++++++++++++-----------------
migration.h | 16 ++++++++--------
2 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/migration.c b/migration.c
index f9aaadc..7d7a2f9 100644
--- a/migration.c
+++ b/migration.c
@@ -34,7 +34,7 @@
/* Migration speed throttling */
static int64_t max_throttle = (32 << 20);
-static MigrationState *current_migration;
+static FdMigrationState *current_migration;
static NotifierList migration_state_notifiers =
NOTIFIER_LIST_INITIALIZER(migration_state_notifiers);
@@ -86,7 +86,8 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
const char *uri = qdict_get_str(qdict, "uri");
if (current_migration &&
- current_migration->get_status(current_migration) == MIG_STATE_ACTIVE) {
+ current_migration->mig_state.get_status(current_migration) ==
+ MIG_STATE_ACTIVE) {
monitor_printf(mon, "migration already in progress\n");
return -1;
}
@@ -120,20 +121,20 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
}
if (current_migration) {
- current_migration->release(current_migration);
+ current_migration->mig_state.release(current_migration);
}
- current_migration = &s->mig_state;
+ current_migration = s;
notifier_list_notify(&migration_state_notifiers);
return 0;
}
int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
- MigrationState *s = current_migration;
+ FdMigrationState *s = current_migration;
if (s)
- s->cancel(s);
+ s->mig_state.cancel(s);
return 0;
}
@@ -149,7 +150,7 @@ int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data)
}
max_throttle = d;
- s = migrate_to_fms(current_migration);
+ s = current_migration;
if (s && s->file) {
qemu_file_set_rate_limit(s->file, max_throttle);
}
@@ -227,10 +228,11 @@ static void migrate_put_status(QDict *qdict, const char *name,
void do_info_migrate(Monitor *mon, QObject **ret_data)
{
QDict *qdict;
- MigrationState *s = current_migration;
- if (s) {
- switch (s->get_status(s)) {
+ if (current_migration) {
+ MigrationState *s = ¤t_migration->mig_state;
+
+ switch (s->get_status(current_migration)) {
case MIG_STATE_ACTIVE:
qdict = qdict_new();
qdict_put(qdict, "status", qstring_from_str("active"));
@@ -399,16 +401,13 @@ void migrate_fd_put_ready(void *opaque)
}
}
-int migrate_fd_get_status(MigrationState *mig_state)
+int migrate_fd_get_status(FdMigrationState *s)
{
- FdMigrationState *s = migrate_to_fms(mig_state);
return s->state;
}
-void migrate_fd_cancel(MigrationState *mig_state)
+void migrate_fd_cancel(FdMigrationState *s)
{
- FdMigrationState *s = migrate_to_fms(mig_state);
-
if (s->state != MIG_STATE_ACTIVE)
return;
@@ -421,9 +420,8 @@ void migrate_fd_cancel(MigrationState *mig_state)
migrate_fd_cleanup(s);
}
-void migrate_fd_release(MigrationState *mig_state)
+void migrate_fd_release(FdMigrationState *s)
{
- FdMigrationState *s = migrate_to_fms(mig_state);
DPRINTF("releasing state\n");
diff --git a/migration.h b/migration.h
index db0e45a..f49a9e2 100644
--- a/migration.h
+++ b/migration.h
@@ -25,18 +25,18 @@
typedef struct MigrationState MigrationState;
+typedef struct FdMigrationState FdMigrationState;
+
struct MigrationState
{
/* FIXME: add more accessors to print migration info */
- void (*cancel)(MigrationState *s);
- int (*get_status)(MigrationState *s);
- void (*release)(MigrationState *s);
+ void (*cancel)(FdMigrationState *s);
+ int (*get_status)(FdMigrationState *s);
+ void (*release)(FdMigrationState *s);
int blk;
int shared;
};
-typedef struct FdMigrationState FdMigrationState;
-
struct FdMigrationState
{
MigrationState mig_state;
@@ -120,11 +120,11 @@ void migrate_fd_connect(FdMigrationState *s);
void migrate_fd_put_ready(void *opaque);
-int migrate_fd_get_status(MigrationState *mig_state);
+int migrate_fd_get_status(FdMigrationState *mig_state);
-void migrate_fd_cancel(MigrationState *mig_state);
+void migrate_fd_cancel(FdMigrationState *mig_state);
-void migrate_fd_release(MigrationState *mig_state);
+void migrate_fd_release(FdMigrationState *mig_state);
void migrate_fd_wait_for_unfreeze(void *opaque);
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 03/28] migration: Fold MigrationState into FdMigrationState
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 01/28] migration: Make *start_outgoing_migration return FdMigrationState Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 02/28] migration: Use FdMigrationState instead of MigrationState when possible Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 04/28] migration: Rename FdMigrationState MigrationState Juan Quintela
` (25 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration-exec.c | 10 +++++-----
migration-fd.c | 10 +++++-----
migration-tcp.c | 10 +++++-----
migration-unix.c | 10 +++++-----
migration.c | 12 +++++-------
migration.h | 23 +++++------------------
6 files changed, 30 insertions(+), 45 deletions(-)
diff --git a/migration-exec.c b/migration-exec.c
index b49a475..02b0667 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -93,12 +93,12 @@ FdMigrationState *exec_start_outgoing_migration(Monitor *mon,
s->close = exec_close;
s->get_error = file_errno;
s->write = file_write;
- s->mig_state.cancel = migrate_fd_cancel;
- s->mig_state.get_status = migrate_fd_get_status;
- s->mig_state.release = migrate_fd_release;
+ s->cancel = migrate_fd_cancel;
+ s->get_status = migrate_fd_get_status;
+ s->release = migrate_fd_release;
- s->mig_state.blk = blk;
- s->mig_state.shared = inc;
+ s->blk = blk;
+ s->shared = inc;
s->state = MIG_STATE_ACTIVE;
s->mon = NULL;
diff --git a/migration-fd.c b/migration-fd.c
index bd5e8a9..ccba86b 100644
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -76,12 +76,12 @@ FdMigrationState *fd_start_outgoing_migration(Monitor *mon,
s->get_error = fd_errno;
s->write = fd_write;
s->close = fd_close;
- s->mig_state.cancel = migrate_fd_cancel;
- s->mig_state.get_status = migrate_fd_get_status;
- s->mig_state.release = migrate_fd_release;
+ s->cancel = migrate_fd_cancel;
+ s->get_status = migrate_fd_get_status;
+ s->release = migrate_fd_release;
- s->mig_state.blk = blk;
- s->mig_state.shared = inc;
+ s->blk = blk;
+ s->shared = inc;
s->state = MIG_STATE_ACTIVE;
s->mon = NULL;
diff --git a/migration-tcp.c b/migration-tcp.c
index 355bc37..02b01ed 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -95,12 +95,12 @@ FdMigrationState *tcp_start_outgoing_migration(Monitor *mon,
s->get_error = socket_errno;
s->write = socket_write;
s->close = tcp_close;
- s->mig_state.cancel = migrate_fd_cancel;
- s->mig_state.get_status = migrate_fd_get_status;
- s->mig_state.release = migrate_fd_release;
+ s->cancel = migrate_fd_cancel;
+ s->get_status = migrate_fd_get_status;
+ s->release = migrate_fd_release;
- s->mig_state.blk = blk;
- s->mig_state.shared = inc;
+ s->blk = blk;
+ s->shared = inc;
s->state = MIG_STATE_ACTIVE;
s->mon = NULL;
diff --git a/migration-unix.c b/migration-unix.c
index b9b0dbf..fb73f46 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -94,12 +94,12 @@ FdMigrationState *unix_start_outgoing_migration(Monitor *mon,
s->get_error = unix_errno;
s->write = unix_write;
s->close = unix_close;
- s->mig_state.cancel = migrate_fd_cancel;
- s->mig_state.get_status = migrate_fd_get_status;
- s->mig_state.release = migrate_fd_release;
+ s->cancel = migrate_fd_cancel;
+ s->get_status = migrate_fd_get_status;
+ s->release = migrate_fd_release;
- s->mig_state.blk = blk;
- s->mig_state.shared = inc;
+ s->blk = blk;
+ s->shared = inc;
s->state = MIG_STATE_ACTIVE;
s->mon = NULL;
diff --git a/migration.c b/migration.c
index 7d7a2f9..dd4cdab 100644
--- a/migration.c
+++ b/migration.c
@@ -86,8 +86,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
const char *uri = qdict_get_str(qdict, "uri");
if (current_migration &&
- current_migration->mig_state.get_status(current_migration) ==
- MIG_STATE_ACTIVE) {
+ current_migration->get_status(current_migration) == MIG_STATE_ACTIVE) {
monitor_printf(mon, "migration already in progress\n");
return -1;
}
@@ -121,7 +120,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
}
if (current_migration) {
- current_migration->mig_state.release(current_migration);
+ current_migration->release(current_migration);
}
current_migration = s;
@@ -134,7 +133,7 @@ int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data)
FdMigrationState *s = current_migration;
if (s)
- s->mig_state.cancel(s);
+ s->cancel(s);
return 0;
}
@@ -230,7 +229,7 @@ void do_info_migrate(Monitor *mon, QObject **ret_data)
QDict *qdict;
if (current_migration) {
- MigrationState *s = ¤t_migration->mig_state;
+ FdMigrationState *s = current_migration;
switch (s->get_status(current_migration)) {
case MIG_STATE_ACTIVE:
@@ -354,8 +353,7 @@ void migrate_fd_connect(FdMigrationState *s)
migrate_fd_close);
DPRINTF("beginning savevm\n");
- ret = qemu_savevm_state_begin(s->mon, s->file, s->mig_state.blk,
- s->mig_state.shared);
+ ret = qemu_savevm_state_begin(s->mon, s->file, s->blk, s->shared);
if (ret < 0) {
DPRINTF("failed, %d\n", ret);
migrate_fd_error(s);
diff --git a/migration.h b/migration.h
index f49a9e2..93441e4 100644
--- a/migration.h
+++ b/migration.h
@@ -23,23 +23,10 @@
#define MIG_STATE_CANCELLED 1
#define MIG_STATE_ACTIVE 2
-typedef struct MigrationState MigrationState;
-
typedef struct FdMigrationState FdMigrationState;
-struct MigrationState
-{
- /* FIXME: add more accessors to print migration info */
- void (*cancel)(FdMigrationState *s);
- int (*get_status)(FdMigrationState *s);
- void (*release)(FdMigrationState *s);
- int blk;
- int shared;
-};
-
struct FdMigrationState
{
- MigrationState mig_state;
int64_t bandwidth_limit;
QEMUFile *file;
int fd;
@@ -48,7 +35,12 @@ struct FdMigrationState
int (*get_error)(struct FdMigrationState*);
int (*close)(struct FdMigrationState*);
int (*write)(struct FdMigrationState*, const void *, size_t);
+ void (*cancel)(FdMigrationState *s);
+ int (*get_status)(FdMigrationState *s);
+ void (*release)(FdMigrationState *s);
void *opaque;
+ int blk;
+ int shared;
};
void process_incoming_migration(QEMUFile *f);
@@ -130,11 +122,6 @@ void migrate_fd_wait_for_unfreeze(void *opaque);
int migrate_fd_close(void *opaque);
-static inline FdMigrationState *migrate_to_fms(MigrationState *mig_state)
-{
- return container_of(mig_state, FdMigrationState, mig_state);
-}
-
void add_migration_state_change_notifier(Notifier *notify);
void remove_migration_state_change_notifier(Notifier *notify);
int get_migration_state(void);
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 04/28] migration: Rename FdMigrationState MigrationState
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (2 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 03/28] migration: Fold MigrationState into FdMigrationState Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 05/28] migration: Refactor MigrationState creation Juan Quintela
` (24 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration-exec.c | 10 +++++-----
migration-fd.c | 10 +++++-----
migration-tcp.c | 12 ++++++------
migration-unix.c | 12 ++++++------
migration.c | 34 +++++++++++++++++-----------------
migration.h | 38 +++++++++++++++++++-------------------
6 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/migration-exec.c b/migration-exec.c
index 02b0667..e91e1e2 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -33,17 +33,17 @@
do { } while (0)
#endif
-static int file_errno(FdMigrationState *s)
+static int file_errno(MigrationState *s)
{
return errno;
}
-static int file_write(FdMigrationState *s, const void * buf, size_t size)
+static int file_write(MigrationState *s, const void * buf, size_t size)
{
return write(s->fd, buf, size);
}
-static int exec_close(FdMigrationState *s)
+static int exec_close(MigrationState *s)
{
int ret = 0;
DPRINTF("exec_close\n");
@@ -62,14 +62,14 @@ static int exec_close(FdMigrationState *s)
return ret;
}
-FdMigrationState *exec_start_outgoing_migration(Monitor *mon,
+MigrationState *exec_start_outgoing_migration(Monitor *mon,
const char *command,
int64_t bandwidth_limit,
int detach,
int blk,
int inc)
{
- FdMigrationState *s;
+ MigrationState *s;
FILE *f;
s = qemu_mallocz(sizeof(*s));
diff --git a/migration-fd.c b/migration-fd.c
index ccba86b..4073000 100644
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -31,17 +31,17 @@
do { } while (0)
#endif
-static int fd_errno(FdMigrationState *s)
+static int fd_errno(MigrationState *s)
{
return errno;
}
-static int fd_write(FdMigrationState *s, const void * buf, size_t size)
+static int fd_write(MigrationState *s, const void * buf, size_t size)
{
return write(s->fd, buf, size);
}
-static int fd_close(FdMigrationState *s)
+static int fd_close(MigrationState *s)
{
DPRINTF("fd_close\n");
if (s->fd != -1) {
@@ -51,14 +51,14 @@ static int fd_close(FdMigrationState *s)
return 0;
}
-FdMigrationState *fd_start_outgoing_migration(Monitor *mon,
+MigrationState *fd_start_outgoing_migration(Monitor *mon,
const char *fdname,
int64_t bandwidth_limit,
int detach,
int blk,
int inc)
{
- FdMigrationState *s;
+ MigrationState *s;
s = qemu_mallocz(sizeof(*s));
diff --git a/migration-tcp.c b/migration-tcp.c
index 02b01ed..e8fa46c 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -29,17 +29,17 @@
do { } while (0)
#endif
-static int socket_errno(FdMigrationState *s)
+static int socket_errno(MigrationState *s)
{
return socket_error();
}
-static int socket_write(FdMigrationState *s, const void * buf, size_t size)
+static int socket_write(MigrationState *s, const void * buf, size_t size)
{
return send(s->fd, buf, size, 0);
}
-static int tcp_close(FdMigrationState *s)
+static int tcp_close(MigrationState *s)
{
DPRINTF("tcp_close\n");
if (s->fd != -1) {
@@ -52,7 +52,7 @@ static int tcp_close(FdMigrationState *s)
static void tcp_wait_for_connect(void *opaque)
{
- FdMigrationState *s = opaque;
+ MigrationState *s = opaque;
int val, ret;
socklen_t valsize = sizeof(val);
@@ -76,7 +76,7 @@ static void tcp_wait_for_connect(void *opaque)
}
}
-FdMigrationState *tcp_start_outgoing_migration(Monitor *mon,
+MigrationState *tcp_start_outgoing_migration(Monitor *mon,
const char *host_port,
int64_t bandwidth_limit,
int detach,
@@ -84,7 +84,7 @@ FdMigrationState *tcp_start_outgoing_migration(Monitor *mon,
int inc)
{
struct sockaddr_in addr;
- FdMigrationState *s;
+ MigrationState *s;
int ret;
if (parse_host_port(&addr, host_port) < 0)
diff --git a/migration-unix.c b/migration-unix.c
index fb73f46..9b74401 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -29,17 +29,17 @@
do { } while (0)
#endif
-static int unix_errno(FdMigrationState *s)
+static int unix_errno(MigrationState *s)
{
return errno;
}
-static int unix_write(FdMigrationState *s, const void * buf, size_t size)
+static int unix_write(MigrationState *s, const void * buf, size_t size)
{
return write(s->fd, buf, size);
}
-static int unix_close(FdMigrationState *s)
+static int unix_close(MigrationState *s)
{
DPRINTF("unix_close\n");
if (s->fd != -1) {
@@ -51,7 +51,7 @@ static int unix_close(FdMigrationState *s)
static void unix_wait_for_connect(void *opaque)
{
- FdMigrationState *s = opaque;
+ MigrationState *s = opaque;
int val, ret;
socklen_t valsize = sizeof(val);
@@ -75,14 +75,14 @@ static void unix_wait_for_connect(void *opaque)
}
}
-FdMigrationState *unix_start_outgoing_migration(Monitor *mon,
+MigrationState *unix_start_outgoing_migration(Monitor *mon,
const char *path,
int64_t bandwidth_limit,
int detach,
int blk,
int inc)
{
- FdMigrationState *s;
+ MigrationState *s;
struct sockaddr_un addr;
int ret;
diff --git a/migration.c b/migration.c
index dd4cdab..9ad45d6 100644
--- a/migration.c
+++ b/migration.c
@@ -34,7 +34,7 @@
/* Migration speed throttling */
static int64_t max_throttle = (32 << 20);
-static FdMigrationState *current_migration;
+static MigrationState *current_migration;
static NotifierList migration_state_notifiers =
NOTIFIER_LIST_INITIALIZER(migration_state_notifiers);
@@ -78,7 +78,7 @@ void process_incoming_migration(QEMUFile *f)
int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
- FdMigrationState *s = NULL;
+ MigrationState *s = NULL;
const char *p;
int detach = qdict_get_try_bool(qdict, "detach", 0);
int blk = qdict_get_try_bool(qdict, "blk", 0);
@@ -130,7 +130,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
- FdMigrationState *s = current_migration;
+ MigrationState *s = current_migration;
if (s)
s->cancel(s);
@@ -141,7 +141,7 @@ int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data)
int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
int64_t d;
- FdMigrationState *s;
+ MigrationState *s;
d = qdict_get_int(qdict, "value");
if (d < 0) {
@@ -229,7 +229,7 @@ void do_info_migrate(Monitor *mon, QObject **ret_data)
QDict *qdict;
if (current_migration) {
- FdMigrationState *s = current_migration;
+ MigrationState *s = current_migration;
switch (s->get_status(current_migration)) {
case MIG_STATE_ACTIVE:
@@ -262,7 +262,7 @@ void do_info_migrate(Monitor *mon, QObject **ret_data)
/* shared migration helpers */
-void migrate_fd_monitor_suspend(FdMigrationState *s, Monitor *mon)
+void migrate_fd_monitor_suspend(MigrationState *s, Monitor *mon)
{
s->mon = mon;
if (monitor_suspend(mon) == 0) {
@@ -273,7 +273,7 @@ void migrate_fd_monitor_suspend(FdMigrationState *s, Monitor *mon)
}
}
-void migrate_fd_error(FdMigrationState *s)
+void migrate_fd_error(MigrationState *s)
{
DPRINTF("setting error state\n");
s->state = MIG_STATE_ERROR;
@@ -281,7 +281,7 @@ void migrate_fd_error(FdMigrationState *s)
migrate_fd_cleanup(s);
}
-int migrate_fd_cleanup(FdMigrationState *s)
+int migrate_fd_cleanup(MigrationState *s)
{
int ret = 0;
@@ -310,7 +310,7 @@ int migrate_fd_cleanup(FdMigrationState *s)
void migrate_fd_put_notify(void *opaque)
{
- FdMigrationState *s = opaque;
+ MigrationState *s = opaque;
qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL);
qemu_file_put_notify(s->file);
@@ -318,7 +318,7 @@ void migrate_fd_put_notify(void *opaque)
ssize_t migrate_fd_put_buffer(void *opaque, const void *data, size_t size)
{
- FdMigrationState *s = opaque;
+ MigrationState *s = opaque;
ssize_t ret;
do {
@@ -341,7 +341,7 @@ ssize_t migrate_fd_put_buffer(void *opaque, const void *data, size_t size)
return ret;
}
-void migrate_fd_connect(FdMigrationState *s)
+void migrate_fd_connect(MigrationState *s)
{
int ret;
@@ -365,7 +365,7 @@ void migrate_fd_connect(FdMigrationState *s)
void migrate_fd_put_ready(void *opaque)
{
- FdMigrationState *s = opaque;
+ MigrationState *s = opaque;
if (s->state != MIG_STATE_ACTIVE) {
DPRINTF("put_ready returning because of non-active state\n");
@@ -399,12 +399,12 @@ void migrate_fd_put_ready(void *opaque)
}
}
-int migrate_fd_get_status(FdMigrationState *s)
+int migrate_fd_get_status(MigrationState *s)
{
return s->state;
}
-void migrate_fd_cancel(FdMigrationState *s)
+void migrate_fd_cancel(MigrationState *s)
{
if (s->state != MIG_STATE_ACTIVE)
return;
@@ -418,7 +418,7 @@ void migrate_fd_cancel(FdMigrationState *s)
migrate_fd_cleanup(s);
}
-void migrate_fd_release(FdMigrationState *s)
+void migrate_fd_release(MigrationState *s)
{
DPRINTF("releasing state\n");
@@ -433,7 +433,7 @@ void migrate_fd_release(FdMigrationState *s)
void migrate_fd_wait_for_unfreeze(void *opaque)
{
- FdMigrationState *s = opaque;
+ MigrationState *s = opaque;
int ret;
DPRINTF("wait for unfreeze\n");
@@ -452,7 +452,7 @@ void migrate_fd_wait_for_unfreeze(void *opaque)
int migrate_fd_close(void *opaque)
{
- FdMigrationState *s = opaque;
+ MigrationState *s = opaque;
qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL);
return s->close(s);
diff --git a/migration.h b/migration.h
index 93441e4..6e474fc 100644
--- a/migration.h
+++ b/migration.h
@@ -23,21 +23,21 @@
#define MIG_STATE_CANCELLED 1
#define MIG_STATE_ACTIVE 2
-typedef struct FdMigrationState FdMigrationState;
+typedef struct MigrationState MigrationState;
-struct FdMigrationState
+struct MigrationState
{
int64_t bandwidth_limit;
QEMUFile *file;
int fd;
Monitor *mon;
int state;
- int (*get_error)(struct FdMigrationState*);
- int (*close)(struct FdMigrationState*);
- int (*write)(struct FdMigrationState*, const void *, size_t);
- void (*cancel)(FdMigrationState *s);
- int (*get_status)(FdMigrationState *s);
- void (*release)(FdMigrationState *s);
+ int (*get_error)(MigrationState *s);
+ int (*close)(MigrationState *s);
+ int (*write)(MigrationState *s, const void *buffer, size_t size);
+ void (*cancel)(MigrationState *s);
+ int (*get_status)(MigrationState *s);
+ void (*release)(MigrationState *s);
void *opaque;
int blk;
int shared;
@@ -64,7 +64,7 @@ void do_info_migrate(Monitor *mon, QObject **ret_data);
int exec_start_incoming_migration(const char *host_port);
-FdMigrationState *exec_start_outgoing_migration(Monitor *mon,
+MigrationState *exec_start_outgoing_migration(Monitor *mon,
const char *host_port,
int64_t bandwidth_limit,
int detach,
@@ -73,7 +73,7 @@ FdMigrationState *exec_start_outgoing_migration(Monitor *mon,
int tcp_start_incoming_migration(const char *host_port);
-FdMigrationState *tcp_start_outgoing_migration(Monitor *mon,
+MigrationState *tcp_start_outgoing_migration(Monitor *mon,
const char *host_port,
int64_t bandwidth_limit,
int detach,
@@ -82,7 +82,7 @@ FdMigrationState *tcp_start_outgoing_migration(Monitor *mon,
int unix_start_incoming_migration(const char *path);
-FdMigrationState *unix_start_outgoing_migration(Monitor *mon,
+MigrationState *unix_start_outgoing_migration(Monitor *mon,
const char *path,
int64_t bandwidth_limit,
int detach,
@@ -91,32 +91,32 @@ FdMigrationState *unix_start_outgoing_migration(Monitor *mon,
int fd_start_incoming_migration(const char *path);
-FdMigrationState *fd_start_outgoing_migration(Monitor *mon,
+MigrationState *fd_start_outgoing_migration(Monitor *mon,
const char *fdname,
int64_t bandwidth_limit,
int detach,
int blk,
int inc);
-void migrate_fd_monitor_suspend(FdMigrationState *s, Monitor *mon);
+void migrate_fd_monitor_suspend(MigrationState *s, Monitor *mon);
-void migrate_fd_error(FdMigrationState *s);
+void migrate_fd_error(MigrationState *s);
-int migrate_fd_cleanup(FdMigrationState *s);
+int migrate_fd_cleanup(MigrationState *s);
void migrate_fd_put_notify(void *opaque);
ssize_t migrate_fd_put_buffer(void *opaque, const void *data, size_t size);
-void migrate_fd_connect(FdMigrationState *s);
+void migrate_fd_connect(MigrationState *s);
void migrate_fd_put_ready(void *opaque);
-int migrate_fd_get_status(FdMigrationState *mig_state);
+int migrate_fd_get_status(MigrationState *mig_state);
-void migrate_fd_cancel(FdMigrationState *mig_state);
+void migrate_fd_cancel(MigrationState *mig_state);
-void migrate_fd_release(FdMigrationState *mig_state);
+void migrate_fd_release(MigrationState *mig_state);
void migrate_fd_wait_for_unfreeze(void *opaque);
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 05/28] migration: Refactor MigrationState creation
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (3 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 04/28] migration: Rename FdMigrationState MigrationState Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 06/28] migration: Make all posible migration functions static Juan Quintela
` (23 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration-exec.c | 16 +---------------
migration-fd.c | 16 +---------------
migration-tcp.c | 15 +--------------
migration-unix.c | 15 +--------------
migration.c | 29 +++++++++++++++++++++++++----
migration.h | 11 +++--------
6 files changed, 32 insertions(+), 70 deletions(-)
diff --git a/migration-exec.c b/migration-exec.c
index e91e1e2..67dec27 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -72,7 +72,7 @@ MigrationState *exec_start_outgoing_migration(Monitor *mon,
MigrationState *s;
FILE *f;
- s = qemu_mallocz(sizeof(*s));
+ s = migrate_create_state(mon, bandwidth_limit, detach, blk, inc);
f = popen(command, "w");
if (f == NULL) {
@@ -93,20 +93,6 @@ MigrationState *exec_start_outgoing_migration(Monitor *mon,
s->close = exec_close;
s->get_error = file_errno;
s->write = file_write;
- s->cancel = migrate_fd_cancel;
- s->get_status = migrate_fd_get_status;
- s->release = migrate_fd_release;
-
- s->blk = blk;
- s->shared = inc;
-
- s->state = MIG_STATE_ACTIVE;
- s->mon = NULL;
- s->bandwidth_limit = bandwidth_limit;
-
- if (!detach) {
- migrate_fd_monitor_suspend(s, mon);
- }
migrate_fd_connect(s);
return s;
diff --git a/migration-fd.c b/migration-fd.c
index 4073000..1deedd7 100644
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -60,7 +60,7 @@ MigrationState *fd_start_outgoing_migration(Monitor *mon,
{
MigrationState *s;
- s = qemu_mallocz(sizeof(*s));
+ s = migrate_create_state(mon, bandwidth_limit, detach, blk, inc);
s->fd = monitor_get_fd(mon, fdname);
if (s->fd == -1) {
@@ -76,20 +76,6 @@ MigrationState *fd_start_outgoing_migration(Monitor *mon,
s->get_error = fd_errno;
s->write = fd_write;
s->close = fd_close;
- s->cancel = migrate_fd_cancel;
- s->get_status = migrate_fd_get_status;
- s->release = migrate_fd_release;
-
- s->blk = blk;
- s->shared = inc;
-
- s->state = MIG_STATE_ACTIVE;
- s->mon = NULL;
- s->bandwidth_limit = bandwidth_limit;
-
- if (!detach) {
- migrate_fd_monitor_suspend(s, mon);
- }
migrate_fd_connect(s);
return s;
diff --git a/migration-tcp.c b/migration-tcp.c
index e8fa46c..c1c7bc3 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -90,21 +90,12 @@ MigrationState *tcp_start_outgoing_migration(Monitor *mon,
if (parse_host_port(&addr, host_port) < 0)
return NULL;
- s = qemu_mallocz(sizeof(*s));
+ s = migrate_create_state(mon, bandwidth_limit, detach, blk, inc);
s->get_error = socket_errno;
s->write = socket_write;
s->close = tcp_close;
- s->cancel = migrate_fd_cancel;
- s->get_status = migrate_fd_get_status;
- s->release = migrate_fd_release;
- s->blk = blk;
- s->shared = inc;
-
- s->state = MIG_STATE_ACTIVE;
- s->mon = NULL;
- s->bandwidth_limit = bandwidth_limit;
s->fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
if (s->fd == -1) {
qemu_free(s);
@@ -113,10 +104,6 @@ MigrationState *tcp_start_outgoing_migration(Monitor *mon,
socket_set_nonblock(s->fd);
- if (!detach) {
- migrate_fd_monitor_suspend(s, mon);
- }
-
do {
ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr));
if (ret == -1)
diff --git a/migration-unix.c b/migration-unix.c
index 9b74401..94995af 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -89,21 +89,12 @@ MigrationState *unix_start_outgoing_migration(Monitor *mon,
addr.sun_family = AF_UNIX;
snprintf(addr.sun_path, sizeof(addr.sun_path), "%s", path);
- s = qemu_mallocz(sizeof(*s));
+ s = migrate_create_state(mon, bandwidth_limit, detach, blk, inc);
s->get_error = unix_errno;
s->write = unix_write;
s->close = unix_close;
- s->cancel = migrate_fd_cancel;
- s->get_status = migrate_fd_get_status;
- s->release = migrate_fd_release;
- s->blk = blk;
- s->shared = inc;
-
- s->state = MIG_STATE_ACTIVE;
- s->mon = NULL;
- s->bandwidth_limit = bandwidth_limit;
s->fd = qemu_socket(PF_UNIX, SOCK_STREAM, 0);
if (s->fd < 0) {
DPRINTF("Unable to open socket");
@@ -126,10 +117,6 @@ MigrationState *unix_start_outgoing_migration(Monitor *mon,
goto err_after_open;
}
- if (!detach) {
- migrate_fd_monitor_suspend(s, mon);
- }
-
if (ret >= 0)
migrate_fd_connect(s);
diff --git a/migration.c b/migration.c
index 9ad45d6..e773806 100644
--- a/migration.c
+++ b/migration.c
@@ -262,7 +262,7 @@ void do_info_migrate(Monitor *mon, QObject **ret_data)
/* shared migration helpers */
-void migrate_fd_monitor_suspend(MigrationState *s, Monitor *mon)
+static void migrate_fd_monitor_suspend(MigrationState *s, Monitor *mon)
{
s->mon = mon;
if (monitor_suspend(mon) == 0) {
@@ -399,12 +399,12 @@ void migrate_fd_put_ready(void *opaque)
}
}
-int migrate_fd_get_status(MigrationState *s)
+static int migrate_fd_get_status(MigrationState *s)
{
return s->state;
}
-void migrate_fd_cancel(MigrationState *s)
+static void migrate_fd_cancel(MigrationState *s)
{
if (s->state != MIG_STATE_ACTIVE)
return;
@@ -418,7 +418,7 @@ void migrate_fd_cancel(MigrationState *s)
migrate_fd_cleanup(s);
}
-void migrate_fd_release(MigrationState *s)
+static void migrate_fd_release(MigrationState *s)
{
DPRINTF("releasing state\n");
@@ -476,3 +476,24 @@ int get_migration_state(void)
return MIG_STATE_ERROR;
}
}
+
+MigrationState *migrate_create_state(Monitor *mon, int64_t bandwidth_limit,
+ int detach, int blk, int inc)
+{
+ MigrationState *s = qemu_mallocz(sizeof(*s));
+
+ s->cancel = migrate_fd_cancel;
+ s->get_status = migrate_fd_get_status;
+ s->release = migrate_fd_release;
+ s->blk = blk;
+ s->shared = inc;
+ s->mon = NULL;
+ s->bandwidth_limit = bandwidth_limit;
+ s->state = MIG_STATE_ACTIVE;
+
+ if (!detach) {
+ migrate_fd_monitor_suspend(s, mon);
+ }
+
+ return s;
+}
diff --git a/migration.h b/migration.h
index 6e474fc..fe57eac 100644
--- a/migration.h
+++ b/migration.h
@@ -98,8 +98,6 @@ MigrationState *fd_start_outgoing_migration(Monitor *mon,
int blk,
int inc);
-void migrate_fd_monitor_suspend(MigrationState *s, Monitor *mon);
-
void migrate_fd_error(MigrationState *s);
int migrate_fd_cleanup(MigrationState *s);
@@ -112,16 +110,13 @@ void migrate_fd_connect(MigrationState *s);
void migrate_fd_put_ready(void *opaque);
-int migrate_fd_get_status(MigrationState *mig_state);
-
-void migrate_fd_cancel(MigrationState *mig_state);
-
-void migrate_fd_release(MigrationState *mig_state);
-
void migrate_fd_wait_for_unfreeze(void *opaque);
int migrate_fd_close(void *opaque);
+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
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 06/28] migration: Make all posible migration functions static
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (4 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 05/28] migration: Refactor MigrationState creation Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 07/28] migration: move migrate_create_state to do_migrate Juan Quintela
` (22 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
I have to move two functions postions to avoid forward declarations
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration.c | 73 ++++++++++++++++++++++++++++++-----------------------------
migration.h | 12 ---------
2 files changed, 37 insertions(+), 48 deletions(-)
diff --git a/migration.c b/migration.c
index e773806..84a33ae 100644
--- a/migration.c
+++ b/migration.c
@@ -273,15 +273,7 @@ static void migrate_fd_monitor_suspend(MigrationState *s, Monitor *mon)
}
}
-void migrate_fd_error(MigrationState *s)
-{
- DPRINTF("setting error state\n");
- s->state = MIG_STATE_ERROR;
- notifier_list_notify(&migration_state_notifiers);
- migrate_fd_cleanup(s);
-}
-
-int migrate_fd_cleanup(MigrationState *s)
+static int migrate_fd_cleanup(MigrationState *s)
{
int ret = 0;
@@ -308,7 +300,15 @@ int migrate_fd_cleanup(MigrationState *s)
return ret;
}
-void migrate_fd_put_notify(void *opaque)
+void migrate_fd_error(MigrationState *s)
+{
+ DPRINTF("setting error state\n");
+ s->state = MIG_STATE_ERROR;
+ notifier_list_notify(&migration_state_notifiers);
+ migrate_fd_cleanup(s);
+}
+
+static void migrate_fd_put_notify(void *opaque)
{
MigrationState *s = opaque;
@@ -316,7 +316,8 @@ void migrate_fd_put_notify(void *opaque)
qemu_file_put_notify(s->file);
}
-ssize_t migrate_fd_put_buffer(void *opaque, const void *data, size_t size)
+static ssize_t migrate_fd_put_buffer(void *opaque, const void *data,
+ size_t size)
{
MigrationState *s = opaque;
ssize_t ret;
@@ -341,29 +342,7 @@ ssize_t migrate_fd_put_buffer(void *opaque, const void *data, size_t size)
return ret;
}
-void migrate_fd_connect(MigrationState *s)
-{
- int ret;
-
- s->file = qemu_fopen_ops_buffered(s,
- s->bandwidth_limit,
- migrate_fd_put_buffer,
- migrate_fd_put_ready,
- migrate_fd_wait_for_unfreeze,
- migrate_fd_close);
-
- DPRINTF("beginning savevm\n");
- ret = qemu_savevm_state_begin(s->mon, s->file, s->blk, s->shared);
- if (ret < 0) {
- DPRINTF("failed, %d\n", ret);
- migrate_fd_error(s);
- return;
- }
-
- migrate_fd_put_ready(s);
-}
-
-void migrate_fd_put_ready(void *opaque)
+static void migrate_fd_put_ready(void *opaque)
{
MigrationState *s = opaque;
@@ -431,7 +410,7 @@ static void migrate_fd_release(MigrationState *s)
qemu_free(s);
}
-void migrate_fd_wait_for_unfreeze(void *opaque)
+static void migrate_fd_wait_for_unfreeze(void *opaque)
{
MigrationState *s = opaque;
int ret;
@@ -450,7 +429,7 @@ void migrate_fd_wait_for_unfreeze(void *opaque)
} while (ret == -1 && (s->get_error(s)) == EINTR);
}
-int migrate_fd_close(void *opaque)
+static int migrate_fd_close(void *opaque)
{
MigrationState *s = opaque;
@@ -477,6 +456,28 @@ int get_migration_state(void)
}
}
+void migrate_fd_connect(MigrationState *s)
+{
+ int ret;
+
+ s->file = qemu_fopen_ops_buffered(s,
+ s->bandwidth_limit,
+ migrate_fd_put_buffer,
+ migrate_fd_put_ready,
+ migrate_fd_wait_for_unfreeze,
+ migrate_fd_close);
+
+ DPRINTF("beginning savevm\n");
+ ret = qemu_savevm_state_begin(s->mon, s->file, s->blk, s->shared);
+ if (ret < 0) {
+ DPRINTF("failed, %d\n", ret);
+ migrate_fd_error(s);
+ return;
+ }
+
+ migrate_fd_put_ready(s);
+}
+
MigrationState *migrate_create_state(Monitor *mon, int64_t bandwidth_limit,
int detach, int blk, int inc)
{
diff --git a/migration.h b/migration.h
index fe57eac..52cf2fa 100644
--- a/migration.h
+++ b/migration.h
@@ -100,20 +100,8 @@ MigrationState *fd_start_outgoing_migration(Monitor *mon,
void migrate_fd_error(MigrationState *s);
-int migrate_fd_cleanup(MigrationState *s);
-
-void migrate_fd_put_notify(void *opaque);
-
-ssize_t migrate_fd_put_buffer(void *opaque, const void *data, size_t size);
-
void migrate_fd_connect(MigrationState *s);
-void migrate_fd_put_ready(void *opaque);
-
-void migrate_fd_wait_for_unfreeze(void *opaque);
-
-int migrate_fd_close(void *opaque);
-
MigrationState *migrate_create_state(Monitor *mon, int64_t bandwidth_limit,
int detach, int blk, int inc);
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 07/28] migration: move migrate_create_state to do_migrate
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (5 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 06/28] migration: Make all posible migration functions static Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 08/28] migration: Check that migration is active before cancel it Juan Quintela
` (21 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
Once there, remove all parameters that don't need to be passed to
*start_outgoing_migration() functions
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration-exec.c | 19 +++++--------------
migration-fd.c | 22 ++++++----------------
migration-tcp.c | 22 +++++++---------------
migration-unix.c | 19 +++++--------------
migration.c | 34 +++++++++++++++++++++-------------
migration.h | 31 ++++---------------------------
6 files changed, 48 insertions(+), 99 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..9418abd 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -76,30 +76,22 @@ 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;
s->close = tcp_close;
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 84a33ae..1105757 100644
--- a/migration.c
+++ b/migration.c
@@ -76,6 +76,10 @@ 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 +88,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 +100,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 +130,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)
@@ -478,8 +485,9 @@ 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 52cf2fa..b633f55 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
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 08/28] migration: Check that migration is active before cancel it
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (6 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 07/28] migration: move migrate_create_state to do_migrate Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 09/28] migration: Introduce MIG_STATE_NONE Juan Quintela
` (20 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/migration.c b/migration.c
index 1105757..e8e593d 100644
--- a/migration.c
+++ b/migration.c
@@ -139,9 +139,9 @@ int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
MigrationState *s = current_migration;
- if (s)
+ if (s && s->get_status(s) == MIG_STATE_ACTIVE) {
s->cancel(s);
-
+ }
return 0;
}
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 09/28] migration: Introduce MIG_STATE_NONE
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (7 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 08/28] migration: Check that migration is active before cancel it Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 10/28] migration: Refactor and simplify error checking in migrate_fd_put_ready Juan Quintela
` (19 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
Use MIG_STATE_ACTIVE only when migration has really started
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration.c | 6 +++++-
migration.h | 11 +++++++----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/migration.c b/migration.c
index e8e593d..45cc263 100644
--- a/migration.c
+++ b/migration.c
@@ -239,6 +239,9 @@ void do_info_migrate(Monitor *mon, QObject **ret_data)
MigrationState *s = current_migration;
switch (s->get_status(current_migration)) {
+ case MIG_STATE_NONE:
+ /* no migration has happened ever */
+ break;
case MIG_STATE_ACTIVE:
qdict = qdict_new();
qdict_put(qdict, "status", qstring_from_str("active"));
@@ -467,6 +470,7 @@ void migrate_fd_connect(MigrationState *s)
{
int ret;
+ s->state = MIG_STATE_ACTIVE;
s->file = qemu_fopen_ops_buffered(s,
s->bandwidth_limit,
migrate_fd_put_buffer,
@@ -498,7 +502,7 @@ static MigrationState *migrate_create_state(Monitor *mon,
s->shared = inc;
s->mon = NULL;
s->bandwidth_limit = bandwidth_limit;
- s->state = MIG_STATE_ACTIVE;
+ s->state = MIG_STATE_NONE;
if (!detach) {
migrate_fd_monitor_suspend(s, mon);
diff --git a/migration.h b/migration.h
index b633f55..266c9f0 100644
--- a/migration.h
+++ b/migration.h
@@ -18,10 +18,13 @@
#include "qemu-common.h"
#include "notify.h"
-#define MIG_STATE_ERROR -1
-#define MIG_STATE_COMPLETED 0
-#define MIG_STATE_CANCELLED 1
-#define MIG_STATE_ACTIVE 2
+enum migration_state {
+ MIG_STATE_ERROR,
+ MIG_STATE_NONE,
+ MIG_STATE_CANCELLED,
+ MIG_STATE_ACTIVE,
+ MIG_STATE_COMPLETED,
+};
typedef struct MigrationState MigrationState;
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 10/28] migration: Refactor and simplify error checking in migrate_fd_put_ready
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (8 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 09/28] migration: Introduce MIG_STATE_NONE Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 11/28] migration: Introduce migrate_fd_completed() for consistenncy Juan Quintela
` (18 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration.c | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/migration.c b/migration.c
index 45cc263..ed6e626 100644
--- a/migration.c
+++ b/migration.c
@@ -363,28 +363,26 @@ static void migrate_fd_put_ready(void *opaque)
DPRINTF("iterate\n");
if (qemu_savevm_state_iterate(s->mon, s->file) == 1) {
- int state;
int old_vm_running = vm_running;
DPRINTF("done iterating\n");
vm_stop(VMSTOP_MIGRATE);
- if ((qemu_savevm_state_complete(s->mon, s->file)) < 0) {
- if (old_vm_running) {
- vm_start();
- }
- state = MIG_STATE_ERROR;
+ if (qemu_savevm_state_complete(s->mon, s->file) < 0) {
+ migrate_fd_error(s);
} else {
- state = MIG_STATE_COMPLETED;
+ if (migrate_fd_cleanup(s) < 0) {
+ migrate_fd_error(s);
+ } else {
+ s->state = MIG_STATE_COMPLETED;
+ notifier_list_notify(&migration_state_notifiers);
+ }
}
- if (migrate_fd_cleanup(s) < 0) {
+ if (s->get_status(s) != MIG_STATE_COMPLETED) {
if (old_vm_running) {
vm_start();
}
- state = MIG_STATE_ERROR;
}
- s->state = state;
- notifier_list_notify(&migration_state_notifiers);
}
}
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 11/28] migration: Introduce migrate_fd_completed() for consistenncy
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (9 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 10/28] migration: Refactor and simplify error checking in migrate_fd_put_ready Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 12/28] migration: Our release callback was just free Juan Quintela
` (17 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
This function is a bit different of the others that change the state,
in the sense that if migrate_fd_cleanup() returns an error, it set the
status to error, not completed.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration.c | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/migration.c b/migration.c
index ed6e626..9be6bb0 100644
--- a/migration.c
+++ b/migration.c
@@ -318,6 +318,17 @@ void migrate_fd_error(MigrationState *s)
migrate_fd_cleanup(s);
}
+static void migrate_fd_completed(MigrationState *s)
+{
+ DPRINTF("setting completed state\n");
+ if (migrate_fd_cleanup(s) < 0) {
+ s->state = MIG_STATE_ERROR;
+ } else {
+ s->state = MIG_STATE_COMPLETED;
+ }
+ notifier_list_notify(&migration_state_notifiers);
+}
+
static void migrate_fd_put_notify(void *opaque)
{
MigrationState *s = opaque;
@@ -371,12 +382,7 @@ static void migrate_fd_put_ready(void *opaque)
if (qemu_savevm_state_complete(s->mon, s->file) < 0) {
migrate_fd_error(s);
} else {
- if (migrate_fd_cleanup(s) < 0) {
- migrate_fd_error(s);
- } else {
- s->state = MIG_STATE_COMPLETED;
- notifier_list_notify(&migration_state_notifiers);
- }
+ migrate_fd_completed(s);
}
if (s->get_status(s) != MIG_STATE_COMPLETED) {
if (old_vm_running) {
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 12/28] migration: Our release callback was just free
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (10 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 11/28] migration: Introduce migrate_fd_completed() for consistenncy Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 13/28] migration: Remove get_status() accessor Juan Quintela
` (16 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
We called it from a single place, and always with state !=
MIG_STATE_ACTIVE. Just remove the whole callback. For users of the
notifier, notice that this is exactly the case where they don't care,
we are just freeing the state from previous failed migration (it can't
be a sucessful one, otherwise we would not be running on that machine
in the first place).
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration.c | 19 +------------------
migration.h | 1 -
2 files changed, 1 insertions(+), 19 deletions(-)
diff --git a/migration.c b/migration.c
index 9be6bb0..936b8f1 100644
--- a/migration.c
+++ b/migration.c
@@ -123,10 +123,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
goto free_migrate_state;
}
- if (current_migration) {
- current_migration->release(current_migration);
- }
-
+ qemu_free(current_migration);
current_migration = s;
notifier_list_notify(&migration_state_notifiers);
return 0;
@@ -411,19 +408,6 @@ static void migrate_fd_cancel(MigrationState *s)
migrate_fd_cleanup(s);
}
-static void migrate_fd_release(MigrationState *s)
-{
-
- DPRINTF("releasing state\n");
-
- if (s->state == MIG_STATE_ACTIVE) {
- s->state = MIG_STATE_CANCELLED;
- notifier_list_notify(&migration_state_notifiers);
- migrate_fd_cleanup(s);
- }
- qemu_free(s);
-}
-
static void migrate_fd_wait_for_unfreeze(void *opaque)
{
MigrationState *s = opaque;
@@ -501,7 +485,6 @@ static MigrationState *migrate_create_state(Monitor *mon,
s->cancel = migrate_fd_cancel;
s->get_status = migrate_fd_get_status;
- s->release = migrate_fd_release;
s->blk = blk;
s->shared = inc;
s->mon = NULL;
diff --git a/migration.h b/migration.h
index 266c9f0..b90e344 100644
--- a/migration.h
+++ b/migration.h
@@ -40,7 +40,6 @@ struct MigrationState
int (*write)(MigrationState *s, const void *buffer, size_t size);
void (*cancel)(MigrationState *s);
int (*get_status)(MigrationState *s);
- void (*release)(MigrationState *s);
void *opaque;
int blk;
int shared;
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 13/28] migration: Remove get_status() accessor
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (11 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 12/28] migration: Our release callback was just free Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 14/28] migration: Remove migration cancel() callback Juan Quintela
` (15 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
It is only used inside migration.c, and fields on that struct are
accessed all around the place on that file.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration.c | 16 +++++-----------
migration.h | 1 -
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/migration.c b/migration.c
index 936b8f1..c1732e5 100644
--- a/migration.c
+++ b/migration.c
@@ -91,7 +91,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
int ret;
if (current_migration &&
- current_migration->get_status(current_migration) == MIG_STATE_ACTIVE) {
+ current_migration->state == MIG_STATE_ACTIVE) {
monitor_printf(mon, "migration already in progress\n");
return -1;
}
@@ -136,7 +136,7 @@ int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
MigrationState *s = current_migration;
- if (s && s->get_status(s) == MIG_STATE_ACTIVE) {
+ if (s && s->state == MIG_STATE_ACTIVE) {
s->cancel(s);
}
return 0;
@@ -235,7 +235,7 @@ void do_info_migrate(Monitor *mon, QObject **ret_data)
if (current_migration) {
MigrationState *s = current_migration;
- switch (s->get_status(current_migration)) {
+ switch (s->state) {
case MIG_STATE_NONE:
/* no migration has happened ever */
break;
@@ -381,7 +381,7 @@ static void migrate_fd_put_ready(void *opaque)
} else {
migrate_fd_completed(s);
}
- if (s->get_status(s) != MIG_STATE_COMPLETED) {
+ if (s->state != MIG_STATE_COMPLETED) {
if (old_vm_running) {
vm_start();
}
@@ -389,11 +389,6 @@ static void migrate_fd_put_ready(void *opaque)
}
}
-static int migrate_fd_get_status(MigrationState *s)
-{
- return s->state;
-}
-
static void migrate_fd_cancel(MigrationState *s)
{
if (s->state != MIG_STATE_ACTIVE)
@@ -448,7 +443,7 @@ void remove_migration_state_change_notifier(Notifier *notify)
int get_migration_state(void)
{
if (current_migration) {
- return migrate_fd_get_status(current_migration);
+ return current_migration->state;
} else {
return MIG_STATE_ERROR;
}
@@ -484,7 +479,6 @@ static MigrationState *migrate_create_state(Monitor *mon,
MigrationState *s = qemu_mallocz(sizeof(*s));
s->cancel = migrate_fd_cancel;
- s->get_status = migrate_fd_get_status;
s->blk = blk;
s->shared = inc;
s->mon = NULL;
diff --git a/migration.h b/migration.h
index b90e344..7016710 100644
--- a/migration.h
+++ b/migration.h
@@ -39,7 +39,6 @@ struct MigrationState
int (*close)(MigrationState *s);
int (*write)(MigrationState *s, const void *buffer, size_t size);
void (*cancel)(MigrationState *s);
- int (*get_status)(MigrationState *s);
void *opaque;
int blk;
int shared;
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 14/28] migration: Remove migration cancel() callback
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (12 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 13/28] migration: Remove get_status() accessor Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 15/28] migration: Move exported functions to the end of the file Juan Quintela
` (14 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
It is used only in one place
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration.c | 9 ++++-----
migration.h | 1 -
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/migration.c b/migration.c
index c1732e5..dba9034 100644
--- a/migration.c
+++ b/migration.c
@@ -132,12 +132,12 @@ free_migrate_state:
return -1;
}
+static void migrate_fd_cancel(MigrationState *s);
+
int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
- MigrationState *s = current_migration;
-
- if (s && s->state == MIG_STATE_ACTIVE) {
- s->cancel(s);
+ if (current_migration) {
+ migrate_fd_cancel(current_migration);
}
return 0;
}
@@ -478,7 +478,6 @@ static MigrationState *migrate_create_state(Monitor *mon,
{
MigrationState *s = qemu_mallocz(sizeof(*s));
- s->cancel = migrate_fd_cancel;
s->blk = blk;
s->shared = inc;
s->mon = NULL;
diff --git a/migration.h b/migration.h
index 7016710..347e7e8 100644
--- a/migration.h
+++ b/migration.h
@@ -38,7 +38,6 @@ struct MigrationState
int (*get_error)(MigrationState *s);
int (*close)(MigrationState *s);
int (*write)(MigrationState *s, const void *buffer, size_t size);
- void (*cancel)(MigrationState *s);
void *opaque;
int blk;
int shared;
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 15/28] migration: Move exported functions to the end of the file
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (13 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 14/28] migration: Remove migration cancel() callback Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 16/28] migration: use global variable directly Juan Quintela
` (13 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
This means we can remove the two forward declarations.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration.c | 189 +++++++++++++++++++++++++++++------------------------------
1 files changed, 92 insertions(+), 97 deletions(-)
diff --git a/migration.c b/migration.c
index dba9034..caf5044 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;
- }
-
- qemu_free(current_migration);
- current_migration = s;
- notifier_list_notify(&migration_state_notifiers);
- return 0;
-free_migrate_state:
- qemu_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)
{
@@ -490,3 +393,95 @@ 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;
+ }
+
+ qemu_free(current_migration);
+ 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)
+{
+ 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;
+}
+
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 16/28] migration: use global variable directly
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (14 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 15/28] migration: Move exported functions to the end of the file Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 22:18 ` Anthony Liguori
2011-02-23 21:47 ` [Qemu-devel] [PATCH 17/28] migration: another case of global variable assigned to local one Juan Quintela
` (12 subsequent siblings)
28 siblings, 1 reply; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
We are setting a pointer to a local variable in the previous line, just use
the global variable directly. We remove the ->file test because it is already
done inside qemu_file_set_rate_limit() function.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/migration.c b/migration.c
index caf5044..21f5a9a 100644
--- a/migration.c
+++ b/migration.c
@@ -457,7 +457,6 @@ int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data)
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) {
@@ -465,9 +464,8 @@ int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data)
}
max_throttle = d;
- s = current_migration;
- if (s && s->file) {
- qemu_file_set_rate_limit(s->file, max_throttle);
+ if (current_migration) {
+ qemu_file_set_rate_limit(current_migration->file, max_throttle);
}
return 0;
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* Re: [Qemu-devel] [PATCH 16/28] migration: use global variable directly
2011-02-23 21:47 ` [Qemu-devel] [PATCH 16/28] migration: use global variable directly Juan Quintela
@ 2011-02-23 22:18 ` Anthony Liguori
2011-02-23 22:46 ` [Qemu-devel] " Juan Quintela
0 siblings, 1 reply; 41+ messages in thread
From: Anthony Liguori @ 2011-02-23 22:18 UTC (permalink / raw)
To: Juan Quintela; +Cc: qemu-devel
On 02/23/2011 03:47 PM, Juan Quintela wrote:
> We are setting a pointer to a local variable in the previous line, just use
> the global variable directly. We remove the ->file test because it is already
> done inside qemu_file_set_rate_limit() function.
>
I think this is bad form generally speaking. Globals are not something
to be embraced but rather to be isolated as much as humanly possible.
Regards,
Anthony Liguori
> Signed-off-by: Juan Quintela<quintela@redhat.com>
> ---
> migration.c | 6 ++----
> 1 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/migration.c b/migration.c
> index caf5044..21f5a9a 100644
> --- a/migration.c
> +++ b/migration.c
> @@ -457,7 +457,6 @@ int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data)
> 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) {
> @@ -465,9 +464,8 @@ int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data)
> }
> max_throttle = d;
>
> - s = current_migration;
> - if (s&& s->file) {
> - qemu_file_set_rate_limit(s->file, max_throttle);
> + if (current_migration) {
> + qemu_file_set_rate_limit(current_migration->file, max_throttle);
> }
>
> return 0;
>
^ permalink raw reply [flat|nested] 41+ messages in thread* [Qemu-devel] Re: [PATCH 16/28] migration: use global variable directly
2011-02-23 22:18 ` Anthony Liguori
@ 2011-02-23 22:46 ` Juan Quintela
2011-02-23 23:04 ` Anthony Liguori
0 siblings, 1 reply; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 22:46 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel
Anthony Liguori <anthony@codemonkey.ws> wrote:
> On 02/23/2011 03:47 PM, Juan Quintela wrote:
>> We are setting a pointer to a local variable in the previous line, just use
>> the global variable directly. We remove the ->file test because it is already
>> done inside qemu_file_set_rate_limit() function.
>>
>
> I think this is bad form generally speaking. Globals are not
> something to be embraced but rather to be isolated as much as humanly
> possible.
current_migration is a global variable.
And just doing:
s = current_migration;
foo(s);
helps nothing. We are not going to happen more than one migration at
the same time anytime soon. Notice that everything that is outside of
migration.c already receives a pointer to it, i.e. not use the global
one. So, I claim this is a very special case, not the normal case about
global variables.
Later, Juan.
> Regards,
>
> Anthony Liguori
>
>> Signed-off-by: Juan Quintela<quintela@redhat.com>
>> ---
>> migration.c | 6 ++----
>> 1 files changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/migration.c b/migration.c
>> index caf5044..21f5a9a 100644
>> --- a/migration.c
>> +++ b/migration.c
>> @@ -457,7 +457,6 @@ int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data)
>> 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) {
>> @@ -465,9 +464,8 @@ int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data)
>> }
>> max_throttle = d;
>>
>> - s = current_migration;
>> - if (s&& s->file) {
>> - qemu_file_set_rate_limit(s->file, max_throttle);
>> + if (current_migration) {
>> + qemu_file_set_rate_limit(current_migration->file, max_throttle);
>> }
>>
>> return 0;
>>
^ permalink raw reply [flat|nested] 41+ messages in thread* [Qemu-devel] Re: [PATCH 16/28] migration: use global variable directly
2011-02-23 22:46 ` [Qemu-devel] " Juan Quintela
@ 2011-02-23 23:04 ` Anthony Liguori
2011-02-23 23:07 ` Juan Quintela
2011-02-24 7:09 ` Markus Armbruster
0 siblings, 2 replies; 41+ messages in thread
From: Anthony Liguori @ 2011-02-23 23:04 UTC (permalink / raw)
To: quintela; +Cc: qemu-devel
On 02/23/2011 04:46 PM, Juan Quintela wrote:
> Anthony Liguori<anthony@codemonkey.ws> wrote:
>
>> On 02/23/2011 03:47 PM, Juan Quintela wrote:
>>
>>> We are setting a pointer to a local variable in the previous line, just use
>>> the global variable directly. We remove the ->file test because it is already
>>> done inside qemu_file_set_rate_limit() function.
>>>
>>>
>> I think this is bad form generally speaking. Globals are not
>> something to be embraced but rather to be isolated as much as humanly
>> possible.
>>
> current_migration is a global variable.
>
> And just doing:
>
> s = current_migration;
>
> foo(s);
>
> helps nothing.
It's still bad form IMHO. You should always use local variables to
reference global variables unless you're explicitly setting a global
variable.
Regards,
Anthony Liguori
> We are not going to happen more than one migration at
> the same time anytime soon. Notice that everything that is outside of
> migration.c already receives a pointer to it, i.e. not use the global
> one. So, I claim this is a very special case, not the normal case about
> global variables.
>
> Later, Juan.
>
>
>> Regards,
>>
>> Anthony Liguori
>>
>>
>>> Signed-off-by: Juan Quintela<quintela@redhat.com>
>>> ---
>>> migration.c | 6 ++----
>>> 1 files changed, 2 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/migration.c b/migration.c
>>> index caf5044..21f5a9a 100644
>>> --- a/migration.c
>>> +++ b/migration.c
>>> @@ -457,7 +457,6 @@ int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data)
>>> 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) {
>>> @@ -465,9 +464,8 @@ int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data)
>>> }
>>> max_throttle = d;
>>>
>>> - s = current_migration;
>>> - if (s&& s->file) {
>>> - qemu_file_set_rate_limit(s->file, max_throttle);
>>> + if (current_migration) {
>>> + qemu_file_set_rate_limit(current_migration->file, max_throttle);
>>> }
>>>
>>> return 0;
>>>
>>>
^ permalink raw reply [flat|nested] 41+ messages in thread* [Qemu-devel] Re: [PATCH 16/28] migration: use global variable directly
2011-02-23 23:04 ` Anthony Liguori
@ 2011-02-23 23:07 ` Juan Quintela
2011-02-24 7:09 ` Markus Armbruster
1 sibling, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 23:07 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel
Anthony Liguori <anthony@codemonkey.ws> wrote:
> On 02/23/2011 04:46 PM, Juan Quintela wrote:
>> Anthony Liguori<anthony@codemonkey.ws> wrote:
>>
>>> On 02/23/2011 03:47 PM, Juan Quintela wrote:
>>>
>>>> We are setting a pointer to a local variable in the previous line, just use
>>>> the global variable directly. We remove the ->file test because it is already
>>>> done inside qemu_file_set_rate_limit() function.
>>>>
>>>>
>>> I think this is bad form generally speaking. Globals are not
>>> something to be embraced but rather to be isolated as much as humanly
>>> possible.
>>>
>> current_migration is a global variable.
>>
>> And just doing:
>>
>> s = current_migration;
>>
>> foo(s);
>>
>> helps nothing.
>
> It's still bad form IMHO. You should always use local variables to
> reference global variables unless you're explicitly setting a global
> variable.
Obviounly tastes change between us :-(
If I want to do that, instead of creating a local variable, I will just
add a parameter to the function and make the callers to pass it.
For me, a variable in a function is global or local, hidden it as a
local has no merit.
Later, Juan.
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [Qemu-devel] Re: [PATCH 16/28] migration: use global variable directly
2011-02-23 23:04 ` Anthony Liguori
2011-02-23 23:07 ` Juan Quintela
@ 2011-02-24 7:09 ` Markus Armbruster
2011-02-24 7:58 ` Paolo Bonzini
1 sibling, 1 reply; 41+ messages in thread
From: Markus Armbruster @ 2011-02-24 7:09 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, quintela
Anthony Liguori <anthony@codemonkey.ws> writes:
> On 02/23/2011 04:46 PM, Juan Quintela wrote:
>> Anthony Liguori<anthony@codemonkey.ws> wrote:
>>
>>> On 02/23/2011 03:47 PM, Juan Quintela wrote:
>>>
>>>> We are setting a pointer to a local variable in the previous line, just use
>>>> the global variable directly. We remove the ->file test because it is already
>>>> done inside qemu_file_set_rate_limit() function.
>>>>
>>>>
>>> I think this is bad form generally speaking. Globals are not
>>> something to be embraced but rather to be isolated as much as humanly
>>> possible.
>>>
>> current_migration is a global variable.
>>
>> And just doing:
>>
>> s = current_migration;
>>
>> foo(s);
>>
>> helps nothing.
>
> It's still bad form IMHO. You should always use local variables to
> reference global variables unless you're explicitly setting a global
> variable.
I disagree. The use of global variables should be made as painfully
explicit as possible. Hiding them behind local pointers is sweeping the
globals under the rug.
For completeness: a local variable may be necessary to convince the
optimizer that the value doesn't change. Cases where this matters
exist, but they're rare.
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Qemu-devel] Re: [PATCH 16/28] migration: use global variable directly
2011-02-24 7:09 ` Markus Armbruster
@ 2011-02-24 7:58 ` Paolo Bonzini
0 siblings, 0 replies; 41+ messages in thread
From: Paolo Bonzini @ 2011-02-24 7:58 UTC (permalink / raw)
To: Markus Armbruster; +Cc: qemu-devel, quintela
On 02/24/2011 08:09 AM, Markus Armbruster wrote:
> For completeness: a local variable may be necessary to convince the
> optimizer that the value doesn't change. Cases where this matters
> exist, but they're rare.
In particular, for non-pointers they're nonexistent if the variable is
static and you never use ¤t_migration, i.e. if the variable
doesn't escape.
If the above conditions are satisfied and you have a loop that never
"leaves" the C file, you could even see the compiler keep the variable
in a register for the whole duration of the loop and store the modified
change after the loop.
Paolo
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Qemu-devel] [PATCH 17/28] migration: another case of global variable assigned to local one
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (15 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 16/28] migration: use global variable directly Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 18/28] migration: convert current_migration from pointer to struct Juan Quintela
` (11 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/migration.c b/migration.c
index 21f5a9a..593adee 100644
--- a/migration.c
+++ b/migration.c
@@ -136,9 +136,8 @@ void do_info_migrate(Monitor *mon, QObject **ret_data)
QDict *qdict;
if (current_migration) {
- MigrationState *s = current_migration;
- switch (s->state) {
+ switch (current_migration->state) {
case MIG_STATE_NONE:
/* no migration has happened ever */
break;
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 18/28] migration: convert current_migration from pointer to struct
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (16 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 17/28] migration: another case of global variable assigned to local one Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 22:19 ` Anthony Liguori
2011-02-23 21:47 ` [Qemu-devel] [PATCH 19/28] migration: Use bandwidth_limit directly Juan Quintela
` (10 subsequent siblings)
28 siblings, 1 reply; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
This cleans up a lot the code as we don't have to check anymore if
the variable is NULL or not.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration.c | 121 ++++++++++++++++++++++++-----------------------------------
1 files changed, 49 insertions(+), 72 deletions(-)
diff --git a/migration.c b/migration.c
index 593adee..f8c6d09 100644
--- a/migration.c
+++ b/migration.c
@@ -34,7 +34,9 @@
/* Migration speed throttling */
static int64_t max_throttle = (32 << 20);
-static MigrationState *current_migration;
+static MigrationState current_migration = {
+ .state = MIG_STATE_NONE,
+};
static NotifierList migration_state_notifiers =
NOTIFIER_LIST_INITIALIZER(migration_state_notifiers);
@@ -135,37 +137,34 @@ void do_info_migrate(Monitor *mon, QObject **ret_data)
{
QDict *qdict;
- if (current_migration) {
-
- switch (current_migration->state) {
- case MIG_STATE_NONE:
- /* no migration has happened ever */
- break;
- case MIG_STATE_ACTIVE:
- qdict = qdict_new();
- qdict_put(qdict, "status", qstring_from_str("active"));
-
- migrate_put_status(qdict, "ram", ram_bytes_transferred(),
- ram_bytes_remaining(), ram_bytes_total());
-
- if (blk_mig_active()) {
- migrate_put_status(qdict, "disk", blk_mig_bytes_transferred(),
- blk_mig_bytes_remaining(),
- blk_mig_bytes_total());
- }
-
- *ret_data = QOBJECT(qdict);
- break;
- case MIG_STATE_COMPLETED:
- *ret_data = qobject_from_jsonf("{ 'status': 'completed' }");
- break;
- case MIG_STATE_ERROR:
- *ret_data = qobject_from_jsonf("{ 'status': 'failed' }");
- break;
- case MIG_STATE_CANCELLED:
- *ret_data = qobject_from_jsonf("{ 'status': 'cancelled' }");
- break;
+ switch (current_migration.state) {
+ case MIG_STATE_NONE:
+ /* no migration has happened ever */
+ break;
+ case MIG_STATE_ACTIVE:
+ qdict = qdict_new();
+ qdict_put(qdict, "status", qstring_from_str("active"));
+
+ migrate_put_status(qdict, "ram", ram_bytes_transferred(),
+ ram_bytes_remaining(), ram_bytes_total());
+
+ if (blk_mig_active()) {
+ migrate_put_status(qdict, "disk", blk_mig_bytes_transferred(),
+ blk_mig_bytes_remaining(),
+ blk_mig_bytes_total());
}
+
+ *ret_data = QOBJECT(qdict);
+ break;
+ case MIG_STATE_COMPLETED:
+ *ret_data = qobject_from_jsonf("{ 'status': 'completed' }");
+ break;
+ case MIG_STATE_ERROR:
+ *ret_data = qobject_from_jsonf("{ 'status': 'failed' }");
+ break;
+ case MIG_STATE_CANCELLED:
+ *ret_data = qobject_from_jsonf("{ 'status': 'cancelled' }");
+ break;
}
}
@@ -344,11 +343,7 @@ void remove_migration_state_change_notifier(Notifier *notify)
int get_migration_state(void)
{
- if (current_migration) {
- return current_migration->state;
- } else {
- return MIG_STATE_ERROR;
- }
+ return current_migration.state;
}
void migrate_fd_connect(MigrationState *s)
@@ -374,28 +369,22 @@ void migrate_fd_connect(MigrationState *s)
migrate_fd_put_ready(s);
}
-static MigrationState *migrate_create_state(Monitor *mon,
- int64_t bandwidth_limit,
- int detach, int blk, int inc)
+static void migrate_init_state(Monitor *mon, int64_t bandwidth_limit,
+ int detach, int blk, int inc)
{
- MigrationState *s = qemu_mallocz(sizeof(*s));
-
- s->blk = blk;
- s->shared = inc;
- s->mon = NULL;
- s->bandwidth_limit = bandwidth_limit;
- s->state = MIG_STATE_NONE;
+ current_migration.blk = blk;
+ current_migration.shared = inc;
+ current_migration.mon = NULL;
+ current_migration.bandwidth_limit = bandwidth_limit;
+ current_migration.state = MIG_STATE_NONE;
if (!detach) {
- migrate_fd_monitor_suspend(s, mon);
+ migrate_fd_monitor_suspend(¤t_migration, 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);
@@ -403,8 +392,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
const char *uri = qdict_get_str(qdict, "uri");
int ret;
- if (current_migration &&
- current_migration->state == MIG_STATE_ACTIVE) {
+ if (current_migration.state == MIG_STATE_ACTIVE) {
monitor_printf(mon, "migration already in progress\n");
return -1;
}
@@ -413,43 +401,35 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
return -1;
}
- s = migrate_create_state(mon, max_throttle, detach, blk, inc);
+ migrate_init_state(mon, max_throttle, detach, blk, inc);
if (strstart(uri, "tcp:", &p)) {
- ret = tcp_start_outgoing_migration(s, p);
+ ret = tcp_start_outgoing_migration(¤t_migration, p);
#if !defined(WIN32)
} else if (strstart(uri, "exec:", &p)) {
- ret = exec_start_outgoing_migration(s, p);
+ ret = exec_start_outgoing_migration(¤t_migration, p);
} else if (strstart(uri, "unix:", &p)) {
- ret = unix_start_outgoing_migration(s, p);
+ ret = unix_start_outgoing_migration(¤t_migration, p);
} else if (strstart(uri, "fd:", &p)) {
- ret = fd_start_outgoing_migration(s, p);
+ ret = fd_start_outgoing_migration(¤t_migration, p);
#endif
} else {
monitor_printf(mon, "unknown migration protocol: %s\n", uri);
- ret = -EINVAL;
- goto free_migrate_state;
+ return -EINVAL;
}
if (ret < 0) {
monitor_printf(mon, "migration failed\n");
- goto free_migrate_state;
+ return ret;
}
- qemu_free(current_migration);
- 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)
{
- if (current_migration) {
- migrate_fd_cancel(current_migration);
- }
+ migrate_fd_cancel(¤t_migration);
return 0;
}
@@ -463,10 +443,7 @@ int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data)
}
max_throttle = d;
- if (current_migration) {
- qemu_file_set_rate_limit(current_migration->file, max_throttle);
- }
-
+ qemu_file_set_rate_limit(current_migration.file, max_throttle);
return 0;
}
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* Re: [Qemu-devel] [PATCH 18/28] migration: convert current_migration from pointer to struct
2011-02-23 21:47 ` [Qemu-devel] [PATCH 18/28] migration: convert current_migration from pointer to struct Juan Quintela
@ 2011-02-23 22:19 ` Anthony Liguori
2011-02-23 22:50 ` [Qemu-devel] " Juan Quintela
0 siblings, 1 reply; 41+ messages in thread
From: Anthony Liguori @ 2011-02-23 22:19 UTC (permalink / raw)
To: Juan Quintela; +Cc: qemu-devel
On 02/23/2011 03:47 PM, Juan Quintela wrote:
> This cleans up a lot the code as we don't have to check anymore if
> the variable is NULL or not.
>
> Signed-off-by: Juan Quintela<quintela@redhat.com>
>
Yeah, but now you have to check for MIG_STATE_NONE. I don't think this
is an improvement.
Regards,
Anthony Liguori
> ---
> migration.c | 121 ++++++++++++++++++++++++-----------------------------------
> 1 files changed, 49 insertions(+), 72 deletions(-)
>
> diff --git a/migration.c b/migration.c
> index 593adee..f8c6d09 100644
> --- a/migration.c
> +++ b/migration.c
> @@ -34,7 +34,9 @@
> /* Migration speed throttling */
> static int64_t max_throttle = (32<< 20);
>
> -static MigrationState *current_migration;
> +static MigrationState current_migration = {
> + .state = MIG_STATE_NONE,
> +};
>
> static NotifierList migration_state_notifiers =
> NOTIFIER_LIST_INITIALIZER(migration_state_notifiers);
> @@ -135,37 +137,34 @@ void do_info_migrate(Monitor *mon, QObject **ret_data)
> {
> QDict *qdict;
>
> - if (current_migration) {
> -
> - switch (current_migration->state) {
> - case MIG_STATE_NONE:
> - /* no migration has happened ever */
> - break;
> - case MIG_STATE_ACTIVE:
> - qdict = qdict_new();
> - qdict_put(qdict, "status", qstring_from_str("active"));
> -
> - migrate_put_status(qdict, "ram", ram_bytes_transferred(),
> - ram_bytes_remaining(), ram_bytes_total());
> -
> - if (blk_mig_active()) {
> - migrate_put_status(qdict, "disk", blk_mig_bytes_transferred(),
> - blk_mig_bytes_remaining(),
> - blk_mig_bytes_total());
> - }
> -
> - *ret_data = QOBJECT(qdict);
> - break;
> - case MIG_STATE_COMPLETED:
> - *ret_data = qobject_from_jsonf("{ 'status': 'completed' }");
> - break;
> - case MIG_STATE_ERROR:
> - *ret_data = qobject_from_jsonf("{ 'status': 'failed' }");
> - break;
> - case MIG_STATE_CANCELLED:
> - *ret_data = qobject_from_jsonf("{ 'status': 'cancelled' }");
> - break;
> + switch (current_migration.state) {
> + case MIG_STATE_NONE:
> + /* no migration has happened ever */
> + break;
> + case MIG_STATE_ACTIVE:
> + qdict = qdict_new();
> + qdict_put(qdict, "status", qstring_from_str("active"));
> +
> + migrate_put_status(qdict, "ram", ram_bytes_transferred(),
> + ram_bytes_remaining(), ram_bytes_total());
> +
> + if (blk_mig_active()) {
> + migrate_put_status(qdict, "disk", blk_mig_bytes_transferred(),
> + blk_mig_bytes_remaining(),
> + blk_mig_bytes_total());
> }
> +
> + *ret_data = QOBJECT(qdict);
> + break;
> + case MIG_STATE_COMPLETED:
> + *ret_data = qobject_from_jsonf("{ 'status': 'completed' }");
> + break;
> + case MIG_STATE_ERROR:
> + *ret_data = qobject_from_jsonf("{ 'status': 'failed' }");
> + break;
> + case MIG_STATE_CANCELLED:
> + *ret_data = qobject_from_jsonf("{ 'status': 'cancelled' }");
> + break;
> }
> }
>
> @@ -344,11 +343,7 @@ void remove_migration_state_change_notifier(Notifier *notify)
>
> int get_migration_state(void)
> {
> - if (current_migration) {
> - return current_migration->state;
> - } else {
> - return MIG_STATE_ERROR;
> - }
> + return current_migration.state;
> }
>
> void migrate_fd_connect(MigrationState *s)
> @@ -374,28 +369,22 @@ void migrate_fd_connect(MigrationState *s)
> migrate_fd_put_ready(s);
> }
>
> -static MigrationState *migrate_create_state(Monitor *mon,
> - int64_t bandwidth_limit,
> - int detach, int blk, int inc)
> +static void migrate_init_state(Monitor *mon, int64_t bandwidth_limit,
> + int detach, int blk, int inc)
> {
> - MigrationState *s = qemu_mallocz(sizeof(*s));
> -
> - s->blk = blk;
> - s->shared = inc;
> - s->mon = NULL;
> - s->bandwidth_limit = bandwidth_limit;
> - s->state = MIG_STATE_NONE;
> + current_migration.blk = blk;
> + current_migration.shared = inc;
> + current_migration.mon = NULL;
> + current_migration.bandwidth_limit = bandwidth_limit;
> + current_migration.state = MIG_STATE_NONE;
>
> if (!detach) {
> - migrate_fd_monitor_suspend(s, mon);
> + migrate_fd_monitor_suspend(¤t_migration, 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);
> @@ -403,8 +392,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
> const char *uri = qdict_get_str(qdict, "uri");
> int ret;
>
> - if (current_migration&&
> - current_migration->state == MIG_STATE_ACTIVE) {
> + if (current_migration.state == MIG_STATE_ACTIVE) {
> monitor_printf(mon, "migration already in progress\n");
> return -1;
> }
> @@ -413,43 +401,35 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
> return -1;
> }
>
> - s = migrate_create_state(mon, max_throttle, detach, blk, inc);
> + migrate_init_state(mon, max_throttle, detach, blk, inc);
>
> if (strstart(uri, "tcp:",&p)) {
> - ret = tcp_start_outgoing_migration(s, p);
> + ret = tcp_start_outgoing_migration(¤t_migration, p);
> #if !defined(WIN32)
> } else if (strstart(uri, "exec:",&p)) {
> - ret = exec_start_outgoing_migration(s, p);
> + ret = exec_start_outgoing_migration(¤t_migration, p);
> } else if (strstart(uri, "unix:",&p)) {
> - ret = unix_start_outgoing_migration(s, p);
> + ret = unix_start_outgoing_migration(¤t_migration, p);
> } else if (strstart(uri, "fd:",&p)) {
> - ret = fd_start_outgoing_migration(s, p);
> + ret = fd_start_outgoing_migration(¤t_migration, p);
> #endif
> } else {
> monitor_printf(mon, "unknown migration protocol: %s\n", uri);
> - ret = -EINVAL;
> - goto free_migrate_state;
> + return -EINVAL;
> }
>
> if (ret< 0) {
> monitor_printf(mon, "migration failed\n");
> - goto free_migrate_state;
> + return ret;
> }
>
> - qemu_free(current_migration);
> - 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)
> {
> - if (current_migration) {
> - migrate_fd_cancel(current_migration);
> - }
> + migrate_fd_cancel(¤t_migration);
> return 0;
> }
>
> @@ -463,10 +443,7 @@ int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data)
> }
> max_throttle = d;
>
> - if (current_migration) {
> - qemu_file_set_rate_limit(current_migration->file, max_throttle);
> - }
> -
> + qemu_file_set_rate_limit(current_migration.file, max_throttle);
> return 0;
> }
>
>
^ permalink raw reply [flat|nested] 41+ messages in thread* [Qemu-devel] Re: [PATCH 18/28] migration: convert current_migration from pointer to struct
2011-02-23 22:19 ` Anthony Liguori
@ 2011-02-23 22:50 ` Juan Quintela
0 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 22:50 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel
Anthony Liguori <anthony@codemonkey.ws> wrote:
> On 02/23/2011 03:47 PM, Juan Quintela wrote:
>> This cleans up a lot the code as we don't have to check anymore if
>> the variable is NULL or not.
>>
>> Signed-off-by: Juan Quintela<quintela@redhat.com>
>>
>
> Yeah, but now you have to check for MIG_STATE_NONE. I don't think
> this is an improvement.
We can:
a- remove max_throttle global (now we always have this variable to have
fields in).
b- transitioning to ACTIVE state is a normal transition (if you look,
you will see that it is the only case where we call the migration
notifier without an explicit change in state.
c- We remove all the cases of:
if (current_migration)
foo(current_migration)
Notice that we don't check against MIG_STATE_NONE in the whole patch.
Later, Juan.
> Regards,
>
> Anthony Liguori
>
>> ---
>> migration.c | 121 ++++++++++++++++++++++++-----------------------------------
>> 1 files changed, 49 insertions(+), 72 deletions(-)
>>
>> diff --git a/migration.c b/migration.c
>> index 593adee..f8c6d09 100644
>> --- a/migration.c
>> +++ b/migration.c
>> @@ -34,7 +34,9 @@
>> /* Migration speed throttling */
>> static int64_t max_throttle = (32<< 20);
>>
>> -static MigrationState *current_migration;
>> +static MigrationState current_migration = {
>> + .state = MIG_STATE_NONE,
>> +};
>>
>> static NotifierList migration_state_notifiers =
>> NOTIFIER_LIST_INITIALIZER(migration_state_notifiers);
>> @@ -135,37 +137,34 @@ void do_info_migrate(Monitor *mon, QObject **ret_data)
>> {
>> QDict *qdict;
>>
>> - if (current_migration) {
>> -
>> - switch (current_migration->state) {
>> - case MIG_STATE_NONE:
>> - /* no migration has happened ever */
>> - break;
>> - case MIG_STATE_ACTIVE:
>> - qdict = qdict_new();
>> - qdict_put(qdict, "status", qstring_from_str("active"));
>> -
>> - migrate_put_status(qdict, "ram", ram_bytes_transferred(),
>> - ram_bytes_remaining(), ram_bytes_total());
>> -
>> - if (blk_mig_active()) {
>> - migrate_put_status(qdict, "disk", blk_mig_bytes_transferred(),
>> - blk_mig_bytes_remaining(),
>> - blk_mig_bytes_total());
>> - }
>> -
>> - *ret_data = QOBJECT(qdict);
>> - break;
>> - case MIG_STATE_COMPLETED:
>> - *ret_data = qobject_from_jsonf("{ 'status': 'completed' }");
>> - break;
>> - case MIG_STATE_ERROR:
>> - *ret_data = qobject_from_jsonf("{ 'status': 'failed' }");
>> - break;
>> - case MIG_STATE_CANCELLED:
>> - *ret_data = qobject_from_jsonf("{ 'status': 'cancelled' }");
>> - break;
>> + switch (current_migration.state) {
>> + case MIG_STATE_NONE:
>> + /* no migration has happened ever */
>> + break;
>> + case MIG_STATE_ACTIVE:
>> + qdict = qdict_new();
>> + qdict_put(qdict, "status", qstring_from_str("active"));
>> +
>> + migrate_put_status(qdict, "ram", ram_bytes_transferred(),
>> + ram_bytes_remaining(), ram_bytes_total());
>> +
>> + if (blk_mig_active()) {
>> + migrate_put_status(qdict, "disk", blk_mig_bytes_transferred(),
>> + blk_mig_bytes_remaining(),
>> + blk_mig_bytes_total());
>> }
>> +
>> + *ret_data = QOBJECT(qdict);
>> + break;
>> + case MIG_STATE_COMPLETED:
>> + *ret_data = qobject_from_jsonf("{ 'status': 'completed' }");
>> + break;
>> + case MIG_STATE_ERROR:
>> + *ret_data = qobject_from_jsonf("{ 'status': 'failed' }");
>> + break;
>> + case MIG_STATE_CANCELLED:
>> + *ret_data = qobject_from_jsonf("{ 'status': 'cancelled' }");
>> + break;
>> }
>> }
>>
>> @@ -344,11 +343,7 @@ void remove_migration_state_change_notifier(Notifier *notify)
>>
>> int get_migration_state(void)
>> {
>> - if (current_migration) {
>> - return current_migration->state;
>> - } else {
>> - return MIG_STATE_ERROR;
>> - }
>> + return current_migration.state;
>> }
>>
>> void migrate_fd_connect(MigrationState *s)
>> @@ -374,28 +369,22 @@ void migrate_fd_connect(MigrationState *s)
>> migrate_fd_put_ready(s);
>> }
>>
>> -static MigrationState *migrate_create_state(Monitor *mon,
>> - int64_t bandwidth_limit,
>> - int detach, int blk, int inc)
>> +static void migrate_init_state(Monitor *mon, int64_t bandwidth_limit,
>> + int detach, int blk, int inc)
>> {
>> - MigrationState *s = qemu_mallocz(sizeof(*s));
>> -
>> - s->blk = blk;
>> - s->shared = inc;
>> - s->mon = NULL;
>> - s->bandwidth_limit = bandwidth_limit;
>> - s->state = MIG_STATE_NONE;
>> + current_migration.blk = blk;
>> + current_migration.shared = inc;
>> + current_migration.mon = NULL;
>> + current_migration.bandwidth_limit = bandwidth_limit;
>> + current_migration.state = MIG_STATE_NONE;
>>
>> if (!detach) {
>> - migrate_fd_monitor_suspend(s, mon);
>> + migrate_fd_monitor_suspend(¤t_migration, 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);
>> @@ -403,8 +392,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
>> const char *uri = qdict_get_str(qdict, "uri");
>> int ret;
>>
>> - if (current_migration&&
>> - current_migration->state == MIG_STATE_ACTIVE) {
>> + if (current_migration.state == MIG_STATE_ACTIVE) {
>> monitor_printf(mon, "migration already in progress\n");
>> return -1;
>> }
>> @@ -413,43 +401,35 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
>> return -1;
>> }
>>
>> - s = migrate_create_state(mon, max_throttle, detach, blk, inc);
>> + migrate_init_state(mon, max_throttle, detach, blk, inc);
>>
>> if (strstart(uri, "tcp:",&p)) {
>> - ret = tcp_start_outgoing_migration(s, p);
>> + ret = tcp_start_outgoing_migration(¤t_migration, p);
>> #if !defined(WIN32)
>> } else if (strstart(uri, "exec:",&p)) {
>> - ret = exec_start_outgoing_migration(s, p);
>> + ret = exec_start_outgoing_migration(¤t_migration, p);
>> } else if (strstart(uri, "unix:",&p)) {
>> - ret = unix_start_outgoing_migration(s, p);
>> + ret = unix_start_outgoing_migration(¤t_migration, p);
>> } else if (strstart(uri, "fd:",&p)) {
>> - ret = fd_start_outgoing_migration(s, p);
>> + ret = fd_start_outgoing_migration(¤t_migration, p);
>> #endif
>> } else {
>> monitor_printf(mon, "unknown migration protocol: %s\n", uri);
>> - ret = -EINVAL;
>> - goto free_migrate_state;
>> + return -EINVAL;
>> }
>>
>> if (ret< 0) {
>> monitor_printf(mon, "migration failed\n");
>> - goto free_migrate_state;
>> + return ret;
>> }
>>
>> - qemu_free(current_migration);
>> - 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)
>> {
>> - if (current_migration) {
>> - migrate_fd_cancel(current_migration);
>> - }
>> + migrate_fd_cancel(¤t_migration);
>> return 0;
>> }
>>
>> @@ -463,10 +443,7 @@ int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data)
>> }
>> max_throttle = d;
>>
>> - if (current_migration) {
>> - qemu_file_set_rate_limit(current_migration->file, max_throttle);
>> - }
>> -
>> + qemu_file_set_rate_limit(current_migration.file, max_throttle);
>> return 0;
>> }
>>
>>
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Qemu-devel] [PATCH 19/28] migration: Use bandwidth_limit directly
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (17 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 18/28] migration: convert current_migration from pointer to struct Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 20/28] migration: Export a function that tells if the migration has finished correctly Juan Quintela
` (9 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
Now that current_migration is static, there is no reason for max_throotle
variable.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration.c | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/migration.c b/migration.c
index f8c6d09..49cdf72 100644
--- a/migration.c
+++ b/migration.c
@@ -31,11 +31,11 @@
do { } while (0)
#endif
-/* Migration speed throttling */
-static int64_t max_throttle = (32 << 20);
+#define MAX_THROTTLE (32 << 20) /* Migration speed throttling */
static MigrationState current_migration = {
.state = MIG_STATE_NONE,
+ .bandwidth_limit = MAX_THROTTLE,
};
static NotifierList migration_state_notifiers =
@@ -369,13 +369,11 @@ void migrate_fd_connect(MigrationState *s)
migrate_fd_put_ready(s);
}
-static void migrate_init_state(Monitor *mon, int64_t bandwidth_limit,
- int detach, int blk, int inc)
+static void migrate_init_state(Monitor *mon, int detach, int blk, int inc)
{
current_migration.blk = blk;
current_migration.shared = inc;
current_migration.mon = NULL;
- current_migration.bandwidth_limit = bandwidth_limit;
current_migration.state = MIG_STATE_NONE;
if (!detach) {
@@ -401,7 +399,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
return -1;
}
- migrate_init_state(mon, max_throttle, detach, blk, inc);
+ migrate_init_state(mon, detach, blk, inc);
if (strstart(uri, "tcp:", &p)) {
ret = tcp_start_outgoing_migration(¤t_migration, p);
@@ -441,9 +439,10 @@ int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data)
if (d < 0) {
d = 0;
}
- max_throttle = d;
+ current_migration.bandwidth_limit = d;
- qemu_file_set_rate_limit(current_migration.file, max_throttle);
+ qemu_file_set_rate_limit(current_migration.file,
+ current_migration.bandwidth_limit);
return 0;
}
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 20/28] migration: Export a function that tells if the migration has finished correctly
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (18 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 19/28] migration: Use bandwidth_limit directly Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 21/28] migration: Make state definitions local Juan Quintela
` (8 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
This will allows us to hide the status values.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration.c | 4 ++--
migration.h | 2 +-
ui/spice-core.c | 4 +---
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/migration.c b/migration.c
index 49cdf72..493c2d7 100644
--- a/migration.c
+++ b/migration.c
@@ -341,9 +341,9 @@ void remove_migration_state_change_notifier(Notifier *notify)
notifier_list_remove(&migration_state_notifiers, notify);
}
-int get_migration_state(void)
+bool migration_has_finished(void)
{
- return current_migration.state;
+ return current_migration.state == MIG_STATE_COMPLETED;
}
void migrate_fd_connect(MigrationState *s)
diff --git a/migration.h b/migration.h
index 347e7e8..3c5bb6a 100644
--- a/migration.h
+++ b/migration.h
@@ -84,6 +84,6 @@ void migrate_fd_connect(MigrationState *s);
void add_migration_state_change_notifier(Notifier *notify);
void remove_migration_state_change_notifier(Notifier *notify);
-int get_migration_state(void);
+bool migration_has_finished(void);
#endif
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 1aa1a5e..997603d 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -422,9 +422,7 @@ void do_info_spice(Monitor *mon, QObject **ret_data)
static void migration_state_notifier(Notifier *notifier)
{
- int state = get_migration_state();
-
- if (state == MIG_STATE_COMPLETED) {
+ if (migration_has_finished()) {
#if SPICE_SERVER_VERSION >= 0x000701 /* 0.7.1 */
spice_server_migrate_switch(spice_server);
#endif
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 21/28] migration: Make state definitions local
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (19 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 20/28] migration: Export a function that tells if the migration has finished correctly Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-24 4:12 ` Yoshiaki Tamura
2011-02-23 21:47 ` [Qemu-devel] [PATCH 22/28] savevm: avoid qemu_savevm_state_iteate() to return 1 when qemu file has error Juan Quintela
` (7 subsequent siblings)
28 siblings, 1 reply; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration.c | 8 ++++++++
migration.h | 8 --------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/migration.c b/migration.c
index 493c2d7..697c74f 100644
--- a/migration.c
+++ b/migration.c
@@ -31,6 +31,14 @@
do { } while (0)
#endif
+enum migration_state {
+ MIG_STATE_ERROR,
+ MIG_STATE_NONE,
+ MIG_STATE_CANCELLED,
+ MIG_STATE_ACTIVE,
+ MIG_STATE_COMPLETED,
+};
+
#define MAX_THROTTLE (32 << 20) /* Migration speed throttling */
static MigrationState current_migration = {
diff --git a/migration.h b/migration.h
index 3c5bb6a..e1fc921 100644
--- a/migration.h
+++ b/migration.h
@@ -18,14 +18,6 @@
#include "qemu-common.h"
#include "notify.h"
-enum migration_state {
- MIG_STATE_ERROR,
- MIG_STATE_NONE,
- MIG_STATE_CANCELLED,
- MIG_STATE_ACTIVE,
- MIG_STATE_COMPLETED,
-};
-
typedef struct MigrationState MigrationState;
struct MigrationState
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* Re: [Qemu-devel] [PATCH 21/28] migration: Make state definitions local
2011-02-23 21:47 ` [Qemu-devel] [PATCH 21/28] migration: Make state definitions local Juan Quintela
@ 2011-02-24 4:12 ` Yoshiaki Tamura
2011-02-24 9:01 ` [Qemu-devel] " Juan Quintela
0 siblings, 1 reply; 41+ messages in thread
From: Yoshiaki Tamura @ 2011-02-24 4:12 UTC (permalink / raw)
To: Juan Quintela; +Cc: qemu-devel
2011/2/24 Juan Quintela <quintela@redhat.com>:
>
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
> migration.c | 8 ++++++++
> migration.h | 8 --------
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/migration.c b/migration.c
> index 493c2d7..697c74f 100644
> --- a/migration.c
> +++ b/migration.c
> @@ -31,6 +31,14 @@
> do { } while (0)
> #endif
>
> +enum migration_state {
> + MIG_STATE_ERROR,
Would be better to say:
MIG_STATE_ERROR = -1,
Yoshi
> + MIG_STATE_NONE,
> + MIG_STATE_CANCELLED,
> + MIG_STATE_ACTIVE,
> + MIG_STATE_COMPLETED,
> +};
> +
> #define MAX_THROTTLE (32 << 20) /* Migration speed throttling */
>
> static MigrationState current_migration = {
> diff --git a/migration.h b/migration.h
> index 3c5bb6a..e1fc921 100644
> --- a/migration.h
> +++ b/migration.h
> @@ -18,14 +18,6 @@
> #include "qemu-common.h"
> #include "notify.h"
>
> -enum migration_state {
> - MIG_STATE_ERROR,
> - MIG_STATE_NONE,
> - MIG_STATE_CANCELLED,
> - MIG_STATE_ACTIVE,
> - MIG_STATE_COMPLETED,
> -};
> -
> typedef struct MigrationState MigrationState;
>
> struct MigrationState
> --
> 1.7.4
>
>
>
^ permalink raw reply [flat|nested] 41+ messages in thread* [Qemu-devel] Re: [PATCH 21/28] migration: Make state definitions local
2011-02-24 4:12 ` Yoshiaki Tamura
@ 2011-02-24 9:01 ` Juan Quintela
2011-02-24 9:16 ` Yoshiaki Tamura
0 siblings, 1 reply; 41+ messages in thread
From: Juan Quintela @ 2011-02-24 9:01 UTC (permalink / raw)
To: Yoshiaki Tamura; +Cc: qemu-devel
Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp> wrote:
> 2011/2/24 Juan Quintela <quintela@redhat.com>:
>>
>> Signed-off-by: Juan Quintela <quintela@redhat.com>
>> ---
>> migration.c | 8 ++++++++
>> migration.h | 8 --------
>> 2 files changed, 8 insertions(+), 8 deletions(-)
>>
>> diff --git a/migration.c b/migration.c
>> index 493c2d7..697c74f 100644
>> --- a/migration.c
>> +++ b/migration.c
>> @@ -31,6 +31,14 @@
>> do { } while (0)
>> #endif
>>
>> +enum migration_state {
>> + MIG_STATE_ERROR,
>
> Would be better to say:
>
> MIG_STATE_ERROR = -1,
I thought about it, but basically it shouldn't matter, no?
Later, Juan.
^ permalink raw reply [flat|nested] 41+ messages in thread* [Qemu-devel] Re: [PATCH 21/28] migration: Make state definitions local
2011-02-24 9:01 ` [Qemu-devel] " Juan Quintela
@ 2011-02-24 9:16 ` Yoshiaki Tamura
0 siblings, 0 replies; 41+ messages in thread
From: Yoshiaki Tamura @ 2011-02-24 9:16 UTC (permalink / raw)
To: quintela; +Cc: qemu-devel
Juan Quintela wrote:
> Yoshiaki Tamura<tamura.yoshiaki@lab.ntt.co.jp> wrote:
>> 2011/2/24 Juan Quintela<quintela@redhat.com>:
>>>
>>> Signed-off-by: Juan Quintela<quintela@redhat.com>
>>> ---
>>> migration.c | 8 ++++++++
>>> migration.h | 8 --------
>>> 2 files changed, 8 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/migration.c b/migration.c
>>> index 493c2d7..697c74f 100644
>>> --- a/migration.c
>>> +++ b/migration.c
>>> @@ -31,6 +31,14 @@
>>> do { } while (0)
>>> #endif
>>>
>>> +enum migration_state {
>>> + MIG_STATE_ERROR,
>>
>> Would be better to say:
>>
>> MIG_STATE_ERROR = -1,
>
> I thought about it, but basically it shouldn't matter, no?
It shouldn't. Just gives clear impression :)
Yoshi
>
> Later, Juan.
>
>
^ permalink raw reply [flat|nested] 41+ messages in thread
* [Qemu-devel] [PATCH 22/28] savevm: avoid qemu_savevm_state_iteate() to return 1 when qemu file has error.
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (20 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 21/28] migration: Make state definitions local Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 23/28] migration: add error handling to migrate_fd_put_notify() Juan Quintela
` (6 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel; +Cc: Yoshiaki Tamura
From: Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp>
When qemu on the receiver gets killed during live migration, if debug
is turned on, migrate_fd_put_ready() says,
migration: done iterating
and proceeds. The reason was qemu_savevm_state_iterate() returning 1
even when qemu file has error. This patch checks
qemu_file_has_error() before returning 1/0, and avoids
migrate_fd_put_ready() to proceed in case of error.
Signed-off-by: Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
savevm.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/savevm.c b/savevm.c
index a50fd31..1a0be58 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1501,14 +1501,15 @@ int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f)
}
}
- if (ret)
- return 1;
-
if (qemu_file_has_error(f)) {
qemu_savevm_state_cancel(mon, f);
return -EIO;
}
+ if (ret) {
+ return 1;
+ }
+
return 0;
}
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 23/28] migration: add error handling to migrate_fd_put_notify().
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (21 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 22/28] savevm: avoid qemu_savevm_state_iteate() to return 1 when qemu file has error Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 24/28] migration: Don't use callback on file defining it Juan Quintela
` (5 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel; +Cc: Yoshiaki Tamura
From: Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp>
Although migrate_fd_put_buffer() sets MIG_STATE_ERROR if it failed,
since migrate_fd_put_notify() isn't checking error of underlying
QEMUFile, those resources are kept open. This patch checks it and
calls migrate_fd_error() in case of error.
Signed-off-by: Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/migration.c b/migration.c
index 697c74f..a02100b 100644
--- a/migration.c
+++ b/migration.c
@@ -241,6 +241,9 @@ static void migrate_fd_put_notify(void *opaque)
qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL);
qemu_file_put_notify(s->file);
+ if (qemu_file_has_error(s->file)) {
+ migrate_fd_error(s);
+ }
}
static ssize_t migrate_fd_put_buffer(void *opaque, const void *data,
@@ -258,12 +261,6 @@ static ssize_t migrate_fd_put_buffer(void *opaque, const void *data,
if (ret == -EAGAIN) {
qemu_set_fd_handler2(s->fd, NULL, NULL, migrate_fd_put_notify, s);
- } else if (ret < 0) {
- if (s->mon) {
- monitor_resume(s->mon);
- }
- s->state = MIG_STATE_ERROR;
- notifier_list_notify(&migration_state_notifiers);
}
return ret;
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 24/28] migration: Don't use callback on file defining it
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (22 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 23/28] migration: add error handling to migrate_fd_put_notify() Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 25/28] migration: propagate error correctly Juan Quintela
` (4 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration-tcp.c | 4 ++--
migration-unix.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/migration-tcp.c b/migration-tcp.c
index 9418abd..6acf6c6 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -59,7 +59,7 @@ static void tcp_wait_for_connect(void *opaque)
DPRINTF("connect completed\n");
do {
ret = getsockopt(s->fd, SOL_SOCKET, SO_ERROR, (void *) &val, &valsize);
- } while (ret == -1 && (s->get_error(s)) == EINTR);
+ } while (ret == -1 && (socket_error()) == EINTR);
if (ret < 0) {
migrate_fd_error(s);
@@ -99,7 +99,7 @@ int tcp_start_outgoing_migration(MigrationState *s, const char *host_port)
do {
ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr));
if (ret == -1)
- ret = -(s->get_error(s));
+ ret = -(socket_error());
if (ret == -EINPROGRESS || ret == -EWOULDBLOCK)
qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s);
diff --git a/migration-unix.c b/migration-unix.c
index d562456..f9e7266 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -58,7 +58,7 @@ static void unix_wait_for_connect(void *opaque)
DPRINTF("connect completed\n");
do {
ret = getsockopt(s->fd, SOL_SOCKET, SO_ERROR, (void *) &val, &valsize);
- } while (ret == -1 && (s->get_error(s)) == EINTR);
+ } while (ret == -1 && errno == EINTR);
if (ret < 0) {
migrate_fd_error(s);
@@ -98,7 +98,7 @@ int unix_start_outgoing_migration(MigrationState *s, const char *path)
do {
ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr));
if (ret == -1)
- ret = -(s->get_error(s));
+ ret = -errno;
if (ret == -EINPROGRESS || ret == -EWOULDBLOCK)
qemu_set_fd_handler2(s->fd, NULL, NULL, unix_wait_for_connect, s);
@@ -131,7 +131,7 @@ static void unix_accept_incoming_migration(void *opaque)
do {
c = qemu_accept(s, (struct sockaddr *)&addr, &addrlen);
- } while (c == -1 && socket_error() == EINTR);
+ } while (c == -1 && errno == EINTR);
DPRINTF("accepted migration\n");
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 25/28] migration: propagate error correctly
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (23 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 24/28] migration: Don't use callback on file defining it Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 26/28] migration: qemu_savevm_iterate has three return values Juan Quintela
` (3 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
unix and tcp outgoing migration have error values, but didn't returned
it. Make them return the error. Notice that EINPROGRESS & EWOULDBLOCK
are not considered errors as callwill be retry later.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration-tcp.c | 20 +++++++++++---------
migration-unix.c | 26 ++++++++++----------------
2 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/migration-tcp.c b/migration-tcp.c
index 6acf6c6..ffe8ed6 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -91,26 +91,28 @@ int tcp_start_outgoing_migration(MigrationState *s, const char *host_port)
s->fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
if (s->fd == -1) {
- return -1;
+ return -socket_error();
}
socket_set_nonblock(s->fd);
do {
ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr));
- if (ret == -1)
- ret = -(socket_error());
-
- if (ret == -EINPROGRESS || ret == -EWOULDBLOCK)
+ if (ret == -1) {
+ ret = -socket_error();
+ }
+ if (ret == -EINPROGRESS || ret == -EWOULDBLOCK) {
qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s);
+ return 0;
+ }
} while (ret == -EINTR);
- if (ret < 0 && ret != -EINPROGRESS && ret != -EWOULDBLOCK) {
+ if (ret < 0) {
DPRINTF("connect failed\n");
migrate_fd_error(s);
- } else if (ret >= 0)
- migrate_fd_connect(s);
-
+ return ret;
+ }
+ migrate_fd_connect(s);
return 0;
}
diff --git a/migration-unix.c b/migration-unix.c
index f9e7266..8563bbb 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -90,35 +90,29 @@ int unix_start_outgoing_migration(MigrationState *s, const char *path)
s->fd = qemu_socket(PF_UNIX, SOCK_STREAM, 0);
if (s->fd < 0) {
DPRINTF("Unable to open socket");
- goto err_after_socket;
+ return -errno;
}
socket_set_nonblock(s->fd);
do {
ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr));
- if (ret == -1)
+ if (ret == -1) {
ret = -errno;
-
- if (ret == -EINPROGRESS || ret == -EWOULDBLOCK)
+ }
+ if (ret == -EINPROGRESS || ret == -EWOULDBLOCK) {
qemu_set_fd_handler2(s->fd, NULL, NULL, unix_wait_for_connect, s);
+ return 0;
+ }
} while (ret == -EINTR);
- if (ret < 0 && ret != -EINPROGRESS && ret != -EWOULDBLOCK) {
+ if (ret < 0) {
DPRINTF("connect failed\n");
- goto err_after_open;
+ migrate_fd_error(s);
+ return ret;
}
-
- if (ret >= 0)
- migrate_fd_connect(s);
-
+ migrate_fd_connect(s);
return 0;
-
-err_after_open:
- close(s->fd);
-
-err_after_socket:
- return -1;
}
static void unix_accept_incoming_migration(void *opaque)
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 26/28] migration: qemu_savevm_iterate has three return values
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (24 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 25/28] migration: propagate error correctly Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 27/28] migration: If there is one error, it makes no sense to continue Juan Quintela
` (2 subsequent siblings)
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
We were retrying when there was one error, entering a loop.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/migration.c b/migration.c
index a02100b..6082c32 100644
--- a/migration.c
+++ b/migration.c
@@ -269,6 +269,7 @@ static ssize_t migrate_fd_put_buffer(void *opaque, const void *data,
static void migrate_fd_put_ready(void *opaque)
{
MigrationState *s = opaque;
+ int ret;
if (s->state != MIG_STATE_ACTIVE) {
DPRINTF("put_ready returning because of non-active state\n");
@@ -276,7 +277,10 @@ static void migrate_fd_put_ready(void *opaque)
}
DPRINTF("iterate\n");
- if (qemu_savevm_state_iterate(s->mon, s->file) == 1) {
+ ret = qemu_savevm_state_iterate(s->mon, s->file);
+ if (ret == -1) {
+ migrate_fd_error(s);
+ } else if (ret == 1) {
int old_vm_running = vm_running;
DPRINTF("done iterating\n");
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 27/28] migration: If there is one error, it makes no sense to continue
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (25 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 26/28] migration: qemu_savevm_iterate has three return values Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-02-23 21:47 ` [Qemu-devel] [PATCH 28/28] migration: make migration-{tcp, unix} consistent Juan Quintela
2011-04-02 7:54 ` [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Yoshiaki Tamura
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
buffered_file.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/buffered_file.c b/buffered_file.c
index 8435a31..3c917ff 100644
--- a/buffered_file.c
+++ b/buffered_file.c
@@ -195,7 +195,7 @@ static int buffered_rate_limit(void *opaque)
QEMUFileBuffered *s = opaque;
if (s->has_error)
- return 0;
+ return -1;
if (s->freeze_output)
return 1;
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* [Qemu-devel] [PATCH 28/28] migration: make migration-{tcp, unix} consistent
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (26 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 27/28] migration: If there is one error, it makes no sense to continue Juan Quintela
@ 2011-02-23 21:47 ` Juan Quintela
2011-04-02 7:54 ` [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Yoshiaki Tamura
28 siblings, 0 replies; 41+ messages in thread
From: Juan Quintela @ 2011-02-23 21:47 UTC (permalink / raw)
To: qemu-devel
Files are almost identical in functionality, just remove the
differences that make no sense.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration-tcp.c | 15 ++++++++++-----
migration-unix.c | 46 +++++++++++++++++++++++++---------------------
2 files changed, 35 insertions(+), 26 deletions(-)
diff --git a/migration-tcp.c b/migration-tcp.c
index ffe8ed6..85ef300 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -49,7 +49,6 @@ static int tcp_close(MigrationState *s)
return 0;
}
-
static void tcp_wait_for_connect(void *opaque)
{
MigrationState *s = opaque;
@@ -85,12 +84,14 @@ int tcp_start_outgoing_migration(MigrationState *s, const char *host_port)
if (ret < 0) {
return ret;
}
+
s->get_error = socket_errno;
s->write = socket_write;
s->close = tcp_close;
s->fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
if (s->fd == -1) {
+ DPRINTF("Unable to open socket");
return -socket_error();
}
@@ -156,23 +157,27 @@ int tcp_start_incoming_migration(const char *host_port)
int val;
int s;
+ DPRINTF("Attempting to start an incoming migration\n");
+
if (parse_host_port(&addr, host_port) < 0) {
fprintf(stderr, "invalid host/port combination: %s\n", host_port);
return -EINVAL;
}
s = qemu_socket(PF_INET, SOCK_STREAM, 0);
- if (s == -1)
+ if (s == -1) {
return -socket_error();
+ }
val = 1;
setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *)&val, sizeof(val));
- if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) == -1)
+ if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
goto err;
-
- if (listen(s, 1) == -1)
+ }
+ if (listen(s, 1) == -1) {
goto err;
+ }
qemu_set_fd_handler2(s, NULL, tcp_accept_incoming_migration, NULL,
(void *)(unsigned long)s);
diff --git a/migration-unix.c b/migration-unix.c
index 8563bbb..6a12839 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -88,7 +88,7 @@ int unix_start_outgoing_migration(MigrationState *s, const char *path)
s->close = unix_close;
s->fd = qemu_socket(PF_UNIX, SOCK_STREAM, 0);
- if (s->fd < 0) {
+ if (s->fd == -1) {
DPRINTF("Unable to open socket");
return -errno;
}
@@ -131,7 +131,7 @@ static void unix_accept_incoming_migration(void *opaque)
if (c == -1) {
fprintf(stderr, "could not accept migration connection\n");
- return;
+ goto out2;
}
f = qemu_fopen_socket(c);
@@ -143,45 +143,49 @@ static void unix_accept_incoming_migration(void *opaque)
process_incoming_migration(f);
qemu_fclose(f);
out:
+ close(c);
+out2:
qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL);
close(s);
- close(c);
}
int unix_start_incoming_migration(const char *path)
{
- struct sockaddr_un un;
- int sock;
+ struct sockaddr_un addr;
+ int s;
+ int ret;
DPRINTF("Attempting to start an incoming migration\n");
- sock = qemu_socket(PF_UNIX, SOCK_STREAM, 0);
- if (sock < 0) {
+ s = qemu_socket(PF_UNIX, SOCK_STREAM, 0);
+ if (s == -1) {
fprintf(stderr, "Could not open unix socket: %s\n", strerror(errno));
- return -EINVAL;
+ return -errno;
}
- memset(&un, 0, sizeof(un));
- un.sun_family = AF_UNIX;
- snprintf(un.sun_path, sizeof(un.sun_path), "%s", path);
+ memset(&addr, 0, sizeof(addr));
+ addr.sun_family = AF_UNIX;
+ snprintf(addr.sun_path, sizeof(addr.sun_path), "%s", path);
- unlink(un.sun_path);
- if (bind(sock, (struct sockaddr*) &un, sizeof(un)) < 0) {
- fprintf(stderr, "bind(unix:%s): %s\n", un.sun_path, strerror(errno));
+ unlink(addr.sun_path);
+ if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+ ret = -errno;
+ fprintf(stderr, "bind(unix:%s): %s\n", addr.sun_path, strerror(errno));
goto err;
}
- if (listen(sock, 1) < 0) {
- fprintf(stderr, "listen(unix:%s): %s\n", un.sun_path, strerror(errno));
+ if (listen(s, 1) == -1) {
+ fprintf(stderr, "listen(unix:%s): %s\n", addr.sun_path,
+ strerror(errno));
+ ret = -errno;
goto err;
}
- qemu_set_fd_handler2(sock, NULL, unix_accept_incoming_migration, NULL,
- (void *)(unsigned long)sock);
+ qemu_set_fd_handler2(s, NULL, unix_accept_incoming_migration, NULL,
+ (void *)(unsigned long)s);
return 0;
err:
- close(sock);
-
- return -EINVAL;
+ close(s);
+ return ret;
}
--
1.7.4
^ permalink raw reply related [flat|nested] 41+ messages in thread* Re: [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code
2011-02-23 21:47 [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code Juan Quintela
` (27 preceding siblings ...)
2011-02-23 21:47 ` [Qemu-devel] [PATCH 28/28] migration: make migration-{tcp, unix} consistent Juan Quintela
@ 2011-04-02 7:54 ` Yoshiaki Tamura
28 siblings, 0 replies; 41+ messages in thread
From: Yoshiaki Tamura @ 2011-04-02 7:54 UTC (permalink / raw)
To: Juan Quintela; +Cc: qemu-devel
2011/2/24 Juan Quintela <quintela@redhat.com>:
> v2:
> - make Jan^Wcheckpatch.pl happy
> - Yoshiaki Tamura suggestions:
> - include its two patches to clean things
> - MAX_THROTTLE define
> - migration_state enum
> - I removed spurious differences between migration-{tcp,unix}
> - better error propagation, after this patch:
> migrate -d "tcp:name_don_exist:port"
> migrate -d "tcp:name:port_dont_exist"
> migrate -d "exec: prog_dont_exist"
> migrate -d "exec: gzip > /path/dont/exist"
> fail as expected. Last two used to enter an infinite loop.
>
> Later, Juan.
>
> v1:
> This series:
> - Fold MigrationState into FdMigrationState (and then rename)
> - Factorize migration statec creation in a single place
> - Make use of MIG_STATE_*, setup through helpers and make them local
> - remove relase & cancel callbacks (where used only one in same
> file than defined)
> - get_status() is no more, just access directly to .state
> - current_migration use cleanup, and make variable static
> - max_throotle is gone, now inside current_migration
> - change get_migration_status() to migration_has_finished()
> and actualize single user.
>
> Please review.
>
> Later, Juan.
>
> Juan Quintela (26):
> migration: Make *start_outgoing_migration return FdMigrationState
> migration: Use FdMigrationState instead of MigrationState when
> possible
> migration: Fold MigrationState into FdMigrationState
> migration: Rename FdMigrationState MigrationState
> migration: Refactor MigrationState creation
> migration: Make all posible migration functions static
> migration: move migrate_create_state to do_migrate
> migration: Check that migration is active before cancel it
> migration: Introduce MIG_STATE_NONE
> migration: Refactor and simplify error checking in
> migrate_fd_put_ready
> migration: Introduce migrate_fd_completed() for consistenncy
> migration: Our release callback was just free
> migration: Remove get_status() accessor
> migration: Remove migration cancel() callback
> migration: Move exported functions to the end of the file
> migration: use global variable directly
> migration: another case of global variable assigned to local one
> migration: convert current_migration from pointer to struct
> migration: Use bandwidth_limit directly
> migration: Export a function that tells if the migration has finished
> correctly
> migration: Make state definitions local
> migration: Don't use callback on file defining it
> migration: propagate error correctly
> migration: qemu_savevm_iterate has three return values
> migration: If there is one error, it makes no sense to continue
> migration: make migration-{tcp,unix} consistent
>
> Yoshiaki Tamura (2):
> savevm: avoid qemu_savevm_state_iteate() to return 1 when qemu file
> has error.
> migration: add error handling to migrate_fd_put_notify().
>
> buffered_file.c | 2 +-
> migration-exec.c | 39 +----
> migration-fd.c | 42 ++-----
> migration-tcp.c | 76 ++++------
> migration-unix.c | 112 ++++++---------
> migration.c | 407 ++++++++++++++++++++++++++----------------------------
> migration.h | 85 ++----------
> savevm.c | 7 +-
> ui/spice-core.c | 4 +-
> 9 files changed, 307 insertions(+), 467 deletions(-)
>
> --
> 1.7.4
>
>
>
Acked-by: Yoshiaki Tamura <tamura.yoshiaki@gmail.com>
^ permalink raw reply [flat|nested] 41+ messages in thread