[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 24/34] migration: Inline qemu_fopen_ops_buffered int
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 24/34] migration: Inline qemu_fopen_ops_buffered into migrate_fd_connect |
Date: |
Wed, 19 Dec 2012 13:33:47 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
---
migration.c | 11 +++--------
migration.h | 2 --
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/migration.c b/migration.c
index 7a27987..5a4ad74 100644
--- a/migration.c
+++ b/migration.c
@@ -371,13 +371,6 @@ bool migration_has_failed(MigrationState *s)
s->state == MIG_STATE_ERROR);
}
-void migrate_fd_connect(MigrationState *s)
-{
- s->state = MIG_STATE_ACTIVE;
- s->first_time = true;
- qemu_fopen_ops_buffered(s);
-}
-
static MigrationState *migrate_init(const MigrationParams *params)
{
MigrationState *s = migrate_get_current();
@@ -803,10 +796,12 @@ 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;
+ migration_state->first_time = true;
s = g_malloc0(sizeof(*s));
s->migration_state = migration_state;
diff --git a/migration.h b/migration.h
index 705a331..542197e 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 14/34] migration: make writes blocking, (continued)
- [Qemu-devel] [PATCH 14/34] migration: make writes blocking, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 18/34] buffered_file: don't flush on put buffer, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 17/34] buffered_file: Unfold the trick to restart generating migration data, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 22/34] migration: add XFER_LIMIT_RATIO, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 26/34] ram: rename last_block to last_seen_block, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 19/34] buffered_file: unfold buffered_append in buffered_put_buffer, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 12/34] migration: make qemu_fopen_ops_buffered() return void, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 20/34] savevm: New save live migration method: pending, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 23/34] migration: move migration_fd_put_ready(), Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 21/34] migration: move buffered_file.c code into migration.c, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 24/34] migration: Inline qemu_fopen_ops_buffered into migrate_fd_connect,
Juan Quintela <=
- Re: [Qemu-devel] [PATCH 00/34] migration thread and queue, Paolo Bonzini, 2012/12/19
- [Qemu-devel] [PATCH 27/34] ram: Add last_sent_block, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 31/34] ram: account the amount of transferred ram better, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 32/34] ram: refactor ram_save_block() return value, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 33/34] migration: fix qemu_get_fd for BufferedFile, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 29/34] ram: Use memory_region_test_and_clear_dirty, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 34/34] migration: merge QEMUFileBuffered into MigrationState, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 30/34] ram: optimize migration bitmap walking, Juan Quintela, 2012/12/19