[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/30] migration: Inline qemu_fopen_ops_buffered int
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 18/30] migration: Inline qemu_fopen_ops_buffered into migrate_fd_connect |
Date: |
Thu, 18 Oct 2012 09:30:14 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
migration.c | 9 ++-------
migration.h | 2 --
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/migration.c b/migration.c
index a99653e..1f783e1 100644
--- a/migration.c
+++ b/migration.c
@@ -345,12 +345,6 @@ bool migration_has_failed(MigrationState *s)
s->state == MIG_STATE_ERROR);
}
-void migrate_fd_connect(MigrationState *s)
-{
- s->state = MIG_STATE_ACTIVE;
- qemu_fopen_ops_buffered(s);
-}
-
static MigrationState *migrate_init(const MigrationParams *params)
{
MigrationState *s = migrate_get_current();
@@ -765,10 +759,11 @@ static void *buffered_file_thread(void *opaque)
return NULL;
}
-void qemu_fopen_ops_buffered(MigrationState *migration_state)
+void migrate_fd_connect(MigrationState *migration_state)
{
QEMUFileBuffered *s;
+ migration_state->state = MIG_STATE_ACTIVE;
s = g_malloc0(sizeof(*s));
s->migration_state = migration_state;
diff --git a/migration.h b/migration.h
index f4c4d1e..60a2335 100644
--- a/migration.h
+++ b/migration.h
@@ -127,6 +127,4 @@ int migrate_use_xbzrle(void);
int64_t migrate_xbzrle_cache_size(void);
int64_t xbzrle_cache_resize(int64_t new_size);
-
-void qemu_fopen_ops_buffered(MigrationState *migration_state);
#endif
--
1.7.11.7
- [Qemu-devel] [PATCH 08/30] migration: remove unfreeze logic, (continued)
- [Qemu-devel] [PATCH 08/30] migration: remove unfreeze logic, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 06/30] migration: stop all cpus correctly, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 02/30] add a version number to ram_list, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 07/30] migration: make writes blocking, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 03/30] protect the ramlist with a separate mutex, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 13/30] savevm: New save live migration method: pending, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 14/30] migration: include qemu-file.h, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 11/30] buffered_file: don't flush on put buffer, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 12/30] buffered_file: unfold buffered_append in buffered_put_buffer, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 18/30] migration: Inline qemu_fopen_ops_buffered into migrate_fd_connect,
Juan Quintela <=
- [Qemu-devel] [PATCH 05/30] migration: make qemu_fopen_ops_buffered() return void, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 17/30] migration: move migration_fd_put_ready(), Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 19/30] migration: move migration notifier, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 15/30] migration-fd: remove duplicate include, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 23/30] migration: print times for end phase, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 16/30] migration: move buffered_file.c code into migration.c, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 24/30] ram: rename last_block to last_seen_block, Juan Quintela, 2012/10/18
- [Qemu-devel] [PATCH 22/30] migration: unfold rest of migrate_fd_put_ready() into thread, Juan Quintela, 2012/10/18