Peter Xu <pet...@redhat.com> wrote: > On Tue, Jun 13, 2017 at 11:52:51AM +0200, Juan Quintela wrote: >> Signed-off-by: Juan Quintela <quint...@redhat.com> >> --- >> include/migration/colo.h | 3 --- >> include/migration/misc.h | 2 ++ >> migration/block.c | 6 ------ >> migration/colo-failover.c | 2 ++ >> migration/colo.c | 2 -- >> migration/exec.c | 2 -- >> migration/fd.c | 2 -- >> migration/global_state.c | 1 - >> migration/migration.c | 6 ------ >> migration/migration.h | 2 -- >> migration/postcopy-ram.c | 4 +--- >> migration/qemu-file.c | 2 -- >> migration/ram.c | 4 ---- >> migration/savevm.c | 6 ------ >> 14 files changed, 5 insertions(+), 39 deletions(-) >> >> diff --git a/include/migration/colo.h b/include/migration/colo.h >> index ba0bb6e..be6beba 100644 >> --- a/include/migration/colo.h >> +++ b/include/migration/colo.h >> @@ -14,9 +14,6 @@ >> #define QEMU_COLO_H >> >> #include "qemu-common.h" >> -#include "qemu/coroutine_int.h" >> -#include "qemu/thread.h" >> -#include "qemu/main-loop.h" >> >> bool colo_supported(void); >> void colo_info_init(void); >> diff --git a/include/migration/misc.h b/include/migration/misc.h >> index d5a433a..65c7070 100644 >> --- a/include/migration/misc.h >> +++ b/include/migration/misc.h >> @@ -14,6 +14,8 @@ >> #ifndef MIGRATION_MISC_H >> #define MIGRATION_MISC_H >> >> +#include "qemu/notify.h" >> + > > Since we added this new line (I believe it's for Notifier), do we need > to include "qemu/typedefs.h" as well? Since I see Error and > MigrationState is used as well.
It compiles, so it should be perfect O:-) >> diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c >> index c8c4500..922702b 100644 >> --- a/migration/postcopy-ram.c >> +++ b/migration/postcopy-ram.c >> @@ -17,14 +17,12 @@ >> */ >> >> #include "qemu/osdep.h" >> - >> -#include "qemu-common.h" >> #include "exec/target_page.h" >> #include "migration.h" >> #include "qemu-file.h" >> -#include "savevm.h" >> #include "postcopy-ram.h" >> #include "ram.h" >> +#include "savevm.h" > > Just curious about whether there's any specific reason to move this > line from above to here? > > Besides the nits: > > Reviewed-by: Peter Xu <pet...@redhat.com> Rebases O:-) Thanks, Juan.