Re: [Qemu-devel] [PATCH uq/master] kvmclock: Ensure proper env->tsc value for kvmclock_current_nsec calculation

[Marcin Gibuła]

> > @@ -65,6 +66,7 @@ static uint64_t kvmclock_current_nsec(KVMClockState *s)
> >
> >      cpu_physical_memory_read(kvmclock_struct_pa, &time, sizeof(time));
> >
> > +    assert(time.tsc_timestamp <= migration_tsc);
> >      delta = migration_tsc - time.tsc_timestamp;
> >      if (time.tsc_shift < 0) {
> >          delta >>= -time.tsc_shift;
> > @@ -123,6 +125,8 @@ static void kvmclock_vm_state_change(void *opaque,
> > int running,
> >          if (s->clock_valid) {
> >              return;
> >          }
> > +
> > +        cpu_synchronize_all_states();
> >          ret = kvm_vm_ioctl(kvm_state, KVM_GET_CLOCK, &data);
> >          if (ret < 0) {
> >              fprintf(stderr, "KVM_GET_CLOCK failed: %s\n",
> > strerror(ret));
>
> This causes a hang during migration, so I'll revert the patch from 2.1.

For me this patch series fixed all hangs I had with migration (at least 
with qemu 2.0).

--
mg