[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 41/41] migration: inline migrate_fd_close
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 41/41] migration: inline migrate_fd_close |
Date: |
Fri, 15 Feb 2013 18:47:13 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
migration.c | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/migration.c b/migration.c
index b32dfc1..8fb2d2e 100644
--- a/migration.c
+++ b/migration.c
@@ -273,10 +273,10 @@ static void migrate_fd_cleanup(void *opaque)
qemu_thread_join(&s->thread);
qemu_mutex_lock_iothread();
- migrate_fd_close(s);
+ qemu_fclose(s->file);
+ s->file = NULL;
}
- assert(s->file == NULL);
assert(s->state != MIG_STATE_ACTIVE);
if (s->state != MIG_STATE_COMPLETED) {
@@ -301,16 +301,6 @@ static void migrate_fd_cancel(MigrationState *s)
__sync_val_compare_and_swap(&s->state, MIG_STATE_ACTIVE,
MIG_STATE_CANCELLED);
}
-int migrate_fd_close(MigrationState *s)
-{
- int rc = 0;
- if (s->file != NULL) {
- rc = qemu_fclose(s->file);
- s->file = NULL;
- }
- return rc;
-}
-
void add_migration_state_change_notifier(Notifier *notify)
{
notifier_list_add(&migration_state_notifiers, notify);
--
1.7.1
- Re: [Qemu-devel] [PATCH 31/41] qemu-file: check exit status when closing a pipe QEMUFile, (continued)
- [Qemu-devel] [PATCH 39/41] migration: move contents of migration_close to migrate_fd_cleanup, Paolo Bonzini, 2013/02/15
- [Qemu-devel] [PATCH 36/41] migration: use qemu_ftell to compute bandwidth, Paolo Bonzini, 2013/02/15
- [Qemu-devel] [PATCH 38/41] migration: move rate limiting to QEMUFile, Paolo Bonzini, 2013/02/15
- [Qemu-devel] [PATCH 41/41] migration: inline migrate_fd_close,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 40/41] migration: eliminate s->migration_file, Paolo Bonzini, 2013/02/15
- [Qemu-devel] [PATCH 17/41] block-migration: document usage of state across threads, Paolo Bonzini, 2013/02/15
- [Qemu-devel] [PATCH 13/41] migration: prepare to access s->state outside critical sections, Paolo Bonzini, 2013/02/15