[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/35] migration: Inline qemu_fopen_ops_buffered int
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 18/35] migration: Inline qemu_fopen_ops_buffered into migrate_fd_connect |
Date: |
Tue, 11 Dec 2012 13:46:54 +0100 |
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 34ba6ab..371ff0c 100644
--- a/migration.c
+++ b/migration.c
@@ -366,12 +366,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();
@@ -801,10 +795,11 @@ static const QEMUFileOps buffered_file_ops = {
.set_rate_limit = buffered_set_rate_limit,
};
-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 e95d37a..63da641 100644
--- a/migration.h
+++ b/migration.h
@@ -126,6 +126,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 04/35] buffered_file: Move from using a timer to use a thread, (continued)
- [Qemu-devel] [PATCH 04/35] buffered_file: Move from using a timer to use a thread, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 03/35] protect the ramlist with a separate mutex, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 08/35] migration: remove unfreeze logic, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 07/35] migration: make writes blocking, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 14/35] migration: include qemu-file.h, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 11/35] buffered_file: don't flush on put buffer, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 12/35] buffered_file: unfold buffered_append in buffered_put_buffer, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 13/35] savevm: New save live migration method: pending, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 15/35] migration-fd: remove duplicate include, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 10/35] buffered_file: Unfold the trick to restart generating migration data, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 18/35] migration: Inline qemu_fopen_ops_buffered into migrate_fd_connect,
Juan Quintela <=
- [Qemu-devel] [PATCH 23/35] migration: unfold rest of migrate_fd_put_ready() into thread, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 17/35] migration: move migration_fd_put_ready(), Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 16/35] migration: move buffered_file.c code into migration.c, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 22/35] migration: move exit condition to migration thread, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 28/35] migration: Only go to the iterate stage if there is anything to send, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 20/35] migration: move begining stage to the migration thread, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 19/35] migration: move migration notifier, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 25/35] ram: Add last_sent_block, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 21/35] migration: Add buffered_flush error handling, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 27/35] ram: Use memory_region_test_and_clear_dirty, Juan Quintela, 2012/12/11