Il 22/02/2013 10:50, Juan Quintela ha scritto: > Paolo Bonzini <pbonz...@redhat.com> wrote: >> Il 20/02/2013 07:32, Kazuya Saito ha scritto: >>> Signed-off-by: Kazuya Saito <saito.kaz...@jp.fujitsu.com> >> >> Unfortunately, this conflicts with my series to simplify migration.c >> (branch migration-thread-20130115 in git://github.com/bonzini/qemu.git). >> >> I'm not sure how to proceed here, because migrate_set_state doesn't >> exist anymore. Probably you need many different tracepoints. >>> + >>> +void migrate_set_state(MigrationState *s, int new_state) >>> +{ >>> + s->state = new_state; >>> + trace_migrate_set_state(new_state); >>> +} > > It was introduced with this very patch O:-) > > I take them, and will integrate them on top of your series.
Kazuya already implemented this on top of my series, so I'll post his patch together with my v2. Paolo