[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 39/41] migration: move contents of migration_clo
From: |
Orit Wasserman |
Subject: |
Re: [Qemu-devel] [PATCH 39/41] migration: move contents of migration_close to migrate_fd_cleanup |
Date: |
Fri, 22 Feb 2013 15:56:01 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 |
On 02/15/2013 07:47 PM, Paolo Bonzini wrote:
> With this patch, the migration_file is not needed anymore.
>
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
> migration.c | 17 +++++++----------
> 1 files changed, 7 insertions(+), 10 deletions(-)
>
> diff --git a/migration.c b/migration.c
> index 7c1671f..c9a5978 100644
> --- a/migration.c
> +++ b/migration.c
> @@ -271,6 +271,12 @@ static void migrate_fd_cleanup(void *opaque)
> DPRINTF("closing file\n");
> qemu_fclose(s->file);
> s->file = NULL;
> +
> + qemu_mutex_unlock_iothread();
> + qemu_thread_join(&s->thread);
> + qemu_mutex_lock_iothread();
> +
> + migrate_fd_close(s);
> }
>
> assert(s->migration_file == NULL);
> @@ -506,16 +512,7 @@ static int migration_put_buffer(void *opaque, const
> uint8_t *buf,
>
> static int migration_close(void *opaque)
> {
> - MigrationState *s = opaque;
> -
> - DPRINTF("closing\n");
> -
> - qemu_mutex_unlock_iothread();
> - qemu_thread_join(&s->thread);
> - qemu_mutex_lock_iothread();
> - assert (s->state != MIG_STATE_ACTIVE);
> -
> - return migrate_fd_close(s);
> + return 0;
> }
>
> static int migration_get_fd(void *opaque)
>
Reviewed-by: Orit Wasserman <address@hidden>
- Re: [Qemu-devel] [PATCH 26/41] migration: detect error before sleeping, (continued)
- [Qemu-devel] [PATCH 30/41] qemu-file: fsync a writable stdio QEMUFile, Paolo Bonzini, 2013/02/15
- [Qemu-devel] [PATCH 31/41] qemu-file: check exit status when closing a pipe QEMUFile, Paolo Bonzini, 2013/02/15
- [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, 2013/02/15
- [Qemu-devel] [PATCH 40/41] migration: eliminate s->migration_file, Paolo Bonzini, 2013/02/15