Re: [Qemu-devel] [PATCH v2 2/2] migration: add migrate_set_state(), add trace_migrate_set_state()

2013-02-22 Thread Paolo Bonzini
Il 22/02/2013 10:50, Juan Quintela ha scritto: > Paolo Bonzini wrote: >> Il 20/02/2013 07:32, Kazuya Saito ha scritto: >>> Signed-off-by: Kazuya Saito >> >> Unfortunately, this conflicts with my series to simplify migration.c >> (branch migration-thread-20130115 in git://github.com/bonzini/qemu.g

Re: [Qemu-devel] [PATCH v2 2/2] migration: add migrate_set_state(), add trace_migrate_set_state()

2013-02-22 Thread Juan Quintela
Paolo Bonzini wrote: > Il 20/02/2013 07:32, Kazuya Saito ha scritto: >> Signed-off-by: Kazuya Saito > > 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 mig

Re: [Qemu-devel] [PATCH v2 2/2] migration: add migrate_set_state(), add trace_migrate_set_state()

2013-02-19 Thread Paolo Bonzini
Il 20/02/2013 07:32, Kazuya Saito ha scritto: > Signed-off-by: Kazuya Saito 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 anym

[Qemu-devel] [PATCH v2 2/2] migration: add migrate_set_state(), add trace_migrate_set_state()

2013-02-19 Thread Kazuya Saito
Signed-off-by: Kazuya Saito --- include/migration/migration.h |2 ++ migration.c | 19 +-- trace-events |3 +++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/include/migration/migration.h b/include/migration/migration.