* [Qemu-devel] [PATCH v2] Misc migration cleanups @ 2017-06-13 9:52 Juan Quintela 2017-06-13 9:52 ` [Qemu-devel] [PATCH v2] migration: Remove unneeded includes Juan Quintela 0 siblings, 1 reply; 4+ messages in thread From: Juan Quintela @ 2017-06-13 9:52 UTC (permalink / raw) To: qemu-devel; +Cc: dgilbert, lvivier, peterx Hi The 1st 10 pages have already been reviewed, only missing one is this one that removes includes that are not needed after so many movements of code. Please, review. Thanks, Juan. Juan Quintela (1): migration: Remove unneeded includes 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(-) -- 2.9.4 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH v2] migration: Remove unneeded includes 2017-06-13 9:52 [Qemu-devel] [PATCH v2] Misc migration cleanups Juan Quintela @ 2017-06-13 9:52 ` Juan Quintela 2017-06-14 6:39 ` Peter Xu 0 siblings, 1 reply; 4+ messages in thread From: Juan Quintela @ 2017-06-13 9:52 UTC (permalink / raw) To: qemu-devel; +Cc: dgilbert, lvivier, peterx Signed-off-by: Juan Quintela <quintela@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" + /* migration/ram.c */ void ram_mig_init(void); diff --git a/migration/block.c b/migration/block.c index ae06975..3aae5a3 100644 --- a/migration/block.c +++ b/migration/block.c @@ -15,19 +15,13 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" -#include "block/block.h" #include "qemu/error-report.h" -#include "qemu/main-loop.h" -#include "hw/hw.h" #include "qemu/cutils.h" #include "qemu/queue.h" -#include "qemu/timer.h" #include "block.h" #include "migration/misc.h" #include "migration.h" #include "migration/register.h" -#include "sysemu/blockdev.h" #include "qemu-file.h" #include "migration/vmstate.h" #include "sysemu/block-backend.h" diff --git a/migration/colo-failover.c b/migration/colo-failover.c index cc229f5..f991486 100644 --- a/migration/colo-failover.c +++ b/migration/colo-failover.c @@ -13,6 +13,8 @@ #include "qemu/osdep.h" #include "migration/colo.h" #include "migration/failover.h" +#include "qemu/main-loop.h" +#include "migration.h" #include "qmp-commands.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" diff --git a/migration/colo.c b/migration/colo.c index 45e9b46..c436d63 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -11,7 +11,6 @@ */ #include "qemu/osdep.h" -#include "qemu/timer.h" #include "sysemu/sysemu.h" #include "qemu-file-channel.h" #include "migration.h" @@ -22,7 +21,6 @@ #include "io/channel-buffer.h" #include "trace.h" #include "qemu/error-report.h" -#include "qapi/error.h" #include "migration/failover.h" #include "replication.h" #include "qmp-commands.h" diff --git a/migration/exec.c b/migration/exec.c index b1de445..08b599e 100644 --- a/migration/exec.c +++ b/migration/exec.c @@ -19,10 +19,8 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "channel.h" #include "exec.h" -#include "migration.h" #include "io/channel-command.h" #include "trace.h" diff --git a/migration/fd.c b/migration/fd.c index b2384bf..30f5258 100644 --- a/migration/fd.c +++ b/migration/fd.c @@ -16,10 +16,8 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "channel.h" #include "fd.h" -#include "migration.h" #include "monitor/monitor.h" #include "io/channel-util.h" #include "trace.h" diff --git a/migration/global_state.c b/migration/global_state.c index 16ac63f..f792cf5 100644 --- a/migration/global_state.c +++ b/migration/global_state.c @@ -17,7 +17,6 @@ #include "qapi/util.h" #include "migration/global_state.h" #include "migration/vmstate.h" -#include "sysemu/sysemu.h" #include "trace.h" typedef struct { diff --git a/migration/migration.c b/migration/migration.c index 8ef6d6c..52dac9d 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -16,7 +16,6 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" #include "qemu/error-report.h" -#include "qemu/main-loop.h" #include "migration/blocker.h" #include "exec.h" #include "fd.h" @@ -30,11 +29,9 @@ #include "qemu-file-channel.h" #include "qemu-file.h" #include "migration/vmstate.h" -#include "sysemu/sysemu.h" #include "block/block.h" #include "qapi/qmp/qerror.h" #include "qapi/util.h" -#include "qemu/sockets.h" #include "qemu/rcu.h" #include "block.h" #include "postcopy-ram.h" @@ -42,9 +39,6 @@ #include "qmp-commands.h" #include "trace.h" #include "qapi-event.h" -#include "qom/cpu.h" -#include "exec/memory.h" -#include "exec/address-spaces.h" #include "exec/target_page.h" #include "io/channel-buffer.h" #include "migration/colo.h" diff --git a/migration/migration.h b/migration/migration.h index 601e4ab..d9a268a 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -14,10 +14,8 @@ #ifndef QEMU_MIGRATION_H #define QEMU_MIGRATION_H -#include "qapi/qmp/qdict.h" #include "qemu-common.h" #include "qemu/thread.h" -#include "qemu/notify.h" #include "qapi-types.h" #include "exec/cpu-common.h" #include "qemu/coroutine_int.h" 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" #include "sysemu/sysemu.h" #include "sysemu/balloon.h" #include "qemu/error-report.h" diff --git a/migration/qemu-file.c b/migration/qemu-file.c index e65c373..2ab2bf3 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -26,8 +26,6 @@ #include "qemu-common.h" #include "qemu/error-report.h" #include "qemu/iov.h" -#include "qemu/sockets.h" -#include "qemu/coroutine.h" #include "migration.h" #include "qemu-file.h" #include "trace.h" diff --git a/migration/ram.c b/migration/ram.c index c1b4f4a..7f687f5 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -26,14 +26,12 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "cpu.h" #include <zlib.h> #include "qapi-event.h" #include "qemu/cutils.h" #include "qemu/bitops.h" #include "qemu/bitmap.h" -#include "qemu/timer.h" #include "qemu/main-loop.h" #include "xbzrle.h" #include "ram.h" @@ -41,9 +39,7 @@ #include "migration/register.h" #include "migration/misc.h" #include "qemu-file.h" -#include "migration/vmstate.h" #include "postcopy-ram.h" -#include "exec/address-spaces.h" #include "migration/page_cache.h" #include "qemu/error-report.h" #include "trace.h" diff --git a/migration/savevm.c b/migration/savevm.c index 30cda2c..f32a82d 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -28,12 +28,8 @@ #include "qemu/osdep.h" #include "hw/boards.h" -#include "hw/hw.h" -#include "hw/qdev.h" #include "hw/xen/xen.h" #include "net/net.h" -#include "sysemu/sysemu.h" -#include "qemu/timer.h" #include "migration.h" #include "migration/snapshot.h" #include "migration/misc.h" @@ -46,13 +42,11 @@ #include "postcopy-ram.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" -#include "qemu/queue.h" #include "sysemu/cpus.h" #include "exec/memory.h" #include "exec/target_page.h" #include "qmp-commands.h" #include "trace.h" -#include "qemu/bitops.h" #include "qemu/iov.h" #include "block/snapshot.h" #include "qemu/cutils.h" -- 2.9.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v2] migration: Remove unneeded includes 2017-06-13 9:52 ` [Qemu-devel] [PATCH v2] migration: Remove unneeded includes Juan Quintela @ 2017-06-14 6:39 ` Peter Xu 2017-06-14 7:16 ` Juan Quintela 0 siblings, 1 reply; 4+ messages in thread From: Peter Xu @ 2017-06-14 6:39 UTC (permalink / raw) To: Juan Quintela; +Cc: qemu-devel, dgilbert, lvivier On Tue, Jun 13, 2017 at 11:52:51AM +0200, Juan Quintela wrote: > Signed-off-by: Juan Quintela <quintela@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. > /* migration/ram.c */ > > void ram_mig_init(void); > diff --git a/migration/block.c b/migration/block.c > index ae06975..3aae5a3 100644 > --- a/migration/block.c > +++ b/migration/block.c > @@ -15,19 +15,13 @@ > > #include "qemu/osdep.h" > #include "qapi/error.h" > -#include "qemu-common.h" > -#include "block/block.h" > #include "qemu/error-report.h" > -#include "qemu/main-loop.h" > -#include "hw/hw.h" > #include "qemu/cutils.h" > #include "qemu/queue.h" > -#include "qemu/timer.h" > #include "block.h" > #include "migration/misc.h" > #include "migration.h" > #include "migration/register.h" > -#include "sysemu/blockdev.h" > #include "qemu-file.h" > #include "migration/vmstate.h" > #include "sysemu/block-backend.h" > diff --git a/migration/colo-failover.c b/migration/colo-failover.c > index cc229f5..f991486 100644 > --- a/migration/colo-failover.c > +++ b/migration/colo-failover.c > @@ -13,6 +13,8 @@ > #include "qemu/osdep.h" > #include "migration/colo.h" > #include "migration/failover.h" > +#include "qemu/main-loop.h" > +#include "migration.h" > #include "qmp-commands.h" > #include "qapi/qmp/qerror.h" > #include "qemu/error-report.h" > diff --git a/migration/colo.c b/migration/colo.c > index 45e9b46..c436d63 100644 > --- a/migration/colo.c > +++ b/migration/colo.c > @@ -11,7 +11,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu/timer.h" > #include "sysemu/sysemu.h" > #include "qemu-file-channel.h" > #include "migration.h" > @@ -22,7 +21,6 @@ > #include "io/channel-buffer.h" > #include "trace.h" > #include "qemu/error-report.h" > -#include "qapi/error.h" > #include "migration/failover.h" > #include "replication.h" > #include "qmp-commands.h" > diff --git a/migration/exec.c b/migration/exec.c > index b1de445..08b599e 100644 > --- a/migration/exec.c > +++ b/migration/exec.c > @@ -19,10 +19,8 @@ > > #include "qemu/osdep.h" > #include "qapi/error.h" > -#include "qemu-common.h" > #include "channel.h" > #include "exec.h" > -#include "migration.h" > #include "io/channel-command.h" > #include "trace.h" > > diff --git a/migration/fd.c b/migration/fd.c > index b2384bf..30f5258 100644 > --- a/migration/fd.c > +++ b/migration/fd.c > @@ -16,10 +16,8 @@ > > #include "qemu/osdep.h" > #include "qapi/error.h" > -#include "qemu-common.h" > #include "channel.h" > #include "fd.h" > -#include "migration.h" > #include "monitor/monitor.h" > #include "io/channel-util.h" > #include "trace.h" > diff --git a/migration/global_state.c b/migration/global_state.c > index 16ac63f..f792cf5 100644 > --- a/migration/global_state.c > +++ b/migration/global_state.c > @@ -17,7 +17,6 @@ > #include "qapi/util.h" > #include "migration/global_state.h" > #include "migration/vmstate.h" > -#include "sysemu/sysemu.h" > #include "trace.h" > > typedef struct { > diff --git a/migration/migration.c b/migration/migration.c > index 8ef6d6c..52dac9d 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -16,7 +16,6 @@ > #include "qemu/osdep.h" > #include "qemu/cutils.h" > #include "qemu/error-report.h" > -#include "qemu/main-loop.h" > #include "migration/blocker.h" > #include "exec.h" > #include "fd.h" > @@ -30,11 +29,9 @@ > #include "qemu-file-channel.h" > #include "qemu-file.h" > #include "migration/vmstate.h" > -#include "sysemu/sysemu.h" > #include "block/block.h" > #include "qapi/qmp/qerror.h" > #include "qapi/util.h" > -#include "qemu/sockets.h" > #include "qemu/rcu.h" > #include "block.h" > #include "postcopy-ram.h" > @@ -42,9 +39,6 @@ > #include "qmp-commands.h" > #include "trace.h" > #include "qapi-event.h" > -#include "qom/cpu.h" > -#include "exec/memory.h" > -#include "exec/address-spaces.h" > #include "exec/target_page.h" > #include "io/channel-buffer.h" > #include "migration/colo.h" > diff --git a/migration/migration.h b/migration/migration.h > index 601e4ab..d9a268a 100644 > --- a/migration/migration.h > +++ b/migration/migration.h > @@ -14,10 +14,8 @@ > #ifndef QEMU_MIGRATION_H > #define QEMU_MIGRATION_H > > -#include "qapi/qmp/qdict.h" > #include "qemu-common.h" > #include "qemu/thread.h" > -#include "qemu/notify.h" > #include "qapi-types.h" > #include "exec/cpu-common.h" > #include "qemu/coroutine_int.h" > 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 <peterx@redhat.com> Thanks, -- Peter Xu ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v2] migration: Remove unneeded includes 2017-06-14 6:39 ` Peter Xu @ 2017-06-14 7:16 ` Juan Quintela 0 siblings, 0 replies; 4+ messages in thread From: Juan Quintela @ 2017-06-14 7:16 UTC (permalink / raw) To: Peter Xu; +Cc: qemu-devel, dgilbert, lvivier Peter Xu <peterx@redhat.com> wrote: > On Tue, Jun 13, 2017 at 11:52:51AM +0200, Juan Quintela wrote: >> Signed-off-by: Juan Quintela <quintela@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 <peterx@redhat.com> Rebases O:-) Thanks, Juan. ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-06-14 7:17 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-06-13 9:52 [Qemu-devel] [PATCH v2] Misc migration cleanups Juan Quintela 2017-06-13 9:52 ` [Qemu-devel] [PATCH v2] migration: Remove unneeded includes Juan Quintela 2017-06-14 6:39 ` Peter Xu 2017-06-14 7:16 ` Juan Quintela
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).