[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 20/36] migration: Make all posible migration functio
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 20/36] migration: Make all posible migration functions static |
Date: |
Tue, 11 Oct 2011 12:00:40 +0200 |
I have to move two functions postions to avoid forward declarations
Signed-off-by: Juan Quintela <address@hidden>
---
migration.c | 72 +++++++++++++++++++++++++++++-----------------------------
migration.h | 12 ---------
2 files changed, 36 insertions(+), 48 deletions(-)
diff --git a/migration.c b/migration.c
index f80ad17..5a3e3ad 100644
--- a/migration.c
+++ b/migration.c
@@ -274,15 +274,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, NULL);
- 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, NULL);
+ migrate_fd_cleanup(s);
+}
+
+static void migrate_fd_put_notify(void *opaque)
{
MigrationState *s = opaque;
@@ -319,7 +319,8 @@ void migrate_fd_put_notify(void *opaque)
}
}
-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;
@@ -342,29 +343,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;
int ret;
@@ -436,7 +415,7 @@ static void migrate_fd_release(MigrationState *s)
g_free(s);
}
-void migrate_fd_wait_for_unfreeze(void *opaque)
+static void migrate_fd_wait_for_unfreeze(void *opaque)
{
MigrationState *s = opaque;
int ret;
@@ -459,7 +438,7 @@ void migrate_fd_wait_for_unfreeze(void *opaque)
}
}
-int migrate_fd_close(void *opaque)
+static int migrate_fd_close(void *opaque)
{
MigrationState *s = opaque;
@@ -489,6 +468,27 @@ 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_new(Monitor *mon, int64_t bandwidth_limit,
int detach, int blk, int inc)
{
diff --git a/migration.h b/migration.h
index 5f933e8..892b636 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_new(Monitor *mon, int64_t bandwidth_limit,
int detach, int blk, int inc);
--
1.7.6.4
- [Qemu-devel] [PATCH 11/36] migration: change has_error to contain errno values, (continued)
- [Qemu-devel] [PATCH 11/36] migration: change has_error to contain errno values, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 12/36] migration: rename qemu_file_has_error to qemu_file_get_error, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 13/36] savevm: Rename has_error to last_error field, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 14/36] migration: use qemu_file_get_error() return value when possible, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 15/36] migration: Make *start_outgoing_migration return FdMigrationState, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 20/36] migration: Make all posible migration functions static,
Juan Quintela <=
- [Qemu-devel] [PATCH 21/36] migration: move migrate_new to do_migrate, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 19/36] migration: Refactor MigrationState creation, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 22/36] migration: Introduce MIG_STATE_SETUP, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 23/36] migration: Refactor and simplify error checking in migrate_fd_put_ready, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 24/36] migration: Introduce migrate_fd_completed() for consistency, Juan Quintela, 2011/10/11