On 02/15/2013 07:46 PM, Paolo Bonzini wrote: > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > --- > migration.c | 7 ++++--- > 1 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/migration.c b/migration.c > index 5e2077e..63ecab5 100644 > --- a/migration.c > +++ b/migration.c > @@ -644,6 +644,10 @@ static void *migration_thread(void *opaque) > } > } > } > + if (qemu_file_get_error(s->file)) { > + __sync_val_compare_and_swap(&s->state, MIG_STATE_ACTIVE, > MIG_STATE_ERROR); > + break; > + } > if (current_time >= initial_time + BUFFER_DELAY) { > uint64_t transferred_bytes = s->bytes_xfer; > uint64_t time_spent = current_time - initial_time; > @@ -661,9 +665,6 @@ static void *migration_thread(void *opaque) > /* usleep expects microseconds */ > g_usleep((initial_time + BUFFER_DELAY - current_time)*1000); > } > - if (qemu_file_get_error(s->file)) { > - __sync_val_compare_and_swap(&s->state, MIG_STATE_ACTIVE, > MIG_STATE_ERROR); > - } > } > > qemu_mutex_lock_iothread(); > Reviewed-by: Orit Wasserman <owass...@redhat.com>
- Re: [Qemu-devel] [PATCH 19/41] migration: reorder Save... Orit Wasserman
- Re: [Qemu-devel] [PATCH 19/41] migration: reorder Save... Juan Quintela
- [Qemu-devel] [PATCH 02/41] migration: always use vm_stop_fo... Paolo Bonzini
- Re: [Qemu-devel] [PATCH 02/41] migration: always use v... Orit Wasserman
- Re: [Qemu-devel] [PATCH 02/41] migration: always use v... Juan Quintela
- [Qemu-devel] [PATCH 37/41] migration: small changes around ... Paolo Bonzini
- [Qemu-devel] [PATCH 05/41] block-migration: remove useless ... Paolo Bonzini
- Re: [Qemu-devel] [PATCH 05/41] block-migration: remove... Orit Wasserman
- Re: [Qemu-devel] [PATCH 05/41] block-migration: remove... Juan Quintela
- [Qemu-devel] [PATCH 26/41] migration: detect error before s... Paolo Bonzini
- Re: [Qemu-devel] [PATCH 26/41] migration: detect error... Orit Wasserman
- Re: [Qemu-devel] [PATCH 26/41] migration: detect error... Juan Quintela
- [Qemu-devel] [PATCH 21/41] migration: run setup callbacks o... Paolo Bonzini
- Re: [Qemu-devel] [PATCH 21/41] migration: run setup ca... Orit Wasserman
- Re: [Qemu-devel] [PATCH 21/41] migration: run setup ca... Juan Quintela
- [Qemu-devel] [PATCH 15/41] block-migration: remove variable... Paolo Bonzini
- Re: [Qemu-devel] [PATCH 15/41] block-migration: remove... Orit Wasserman
- Re: [Qemu-devel] [PATCH 15/41] block-migration: remove... Juan Quintela
- [Qemu-devel] [PATCH 09/41] migration: flush all data to fd ... Paolo Bonzini
- Re: [Qemu-devel] [PATCH 09/41] migration: flush all da... Orit Wasserman
- Re: [Qemu-devel] [PATCH 09/41] migration: flush all da... Juan Quintela