* Juan Quintela (quint...@redhat.com) wrote: > There are functions only used by migration code.
That's only mostly true; see the current 'integrate colo frame with block replication and net compare' series (posted 22nd April). That adds colo_handle_shutdown to this header and calls it from vl.c ( https://lists.gnu.org/archive/html/qemu-devel/2017-04/msg03901.html ) where should that go? There's also a net/colo.h as well, so using the #include "colo.h" in migration is correct but that's really scary when there are two files of the same name. Dave > Signed-off-by: Juan Quintela <quint...@redhat.com> > --- > MAINTAINERS | 2 +- > migration/colo-comm.c | 2 +- > migration/colo-failover.c | 2 +- > {include/migration => migration}/colo.h | 0 > migration/migration.c | 2 +- > migration/ram.c | 2 +- > 6 files changed, 5 insertions(+), 5 deletions(-) > rename {include/migration => migration}/colo.h (100%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 0e8d731..e834876 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1537,7 +1537,7 @@ COLO Framework > M: zhanghailiang <zhang.zhanghaili...@huawei.com> > S: Maintained > F: migration/colo* > -F: include/migration/colo.h > +F: migration/colo.h > F: include/migration/failover.h > F: docs/COLO-FT.txt > > diff --git a/migration/colo-comm.c b/migration/colo-comm.c > index 3d91798..9b35027 100644 > --- a/migration/colo-comm.c > +++ b/migration/colo-comm.c > @@ -13,7 +13,7 @@ > > #include "qemu/osdep.h" > #include "migration/migration.h" > -#include "migration/colo.h" > +#include "colo.h" > #include "trace.h" > > typedef struct { > diff --git a/migration/colo-failover.c b/migration/colo-failover.c > index cc229f5..29b8d63 100644 > --- a/migration/colo-failover.c > +++ b/migration/colo-failover.c > @@ -11,7 +11,7 @@ > */ > > #include "qemu/osdep.h" > -#include "migration/colo.h" > +#include "colo.h" > #include "migration/failover.h" > #include "qmp-commands.h" > #include "qapi/qmp/qerror.h" > diff --git a/include/migration/colo.h b/migration/colo.h > similarity index 100% > rename from include/migration/colo.h > rename to migration/colo.h > diff --git a/migration/migration.c b/migration/migration.c > index ad5ed14..a5a17fe 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -38,7 +38,7 @@ > #include "exec/address-spaces.h" > #include "io/channel-buffer.h" > #include "io/channel-tls.h" > -#include "migration/colo.h" > +#include "colo.h" > > #define MAX_THROTTLE (32 << 20) /* Migration transfer speed throttling > */ > > diff --git a/migration/ram.c b/migration/ram.c > index 2564c00..7a5f5fa 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -44,7 +44,7 @@ > #include "trace.h" > #include "exec/ram_addr.h" > #include "qemu/rcu_queue.h" > -#include "migration/colo.h" > +#include "colo.h" > > /***********************************************************/ > /* ram save/restore */ > -- > 2.9.3 > -- Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
