[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 05/12] migration: Move colo.h to migration/
From: |
Dr. David Alan Gilbert |
Subject: |
Re: [Qemu-devel] [PATCH 05/12] migration: Move colo.h to migration/ |
Date: |
Fri, 12 May 2017 18:51:06 +0100 |
User-agent: |
Mutt/1.8.2 (2017-04-18) |
* Juan Quintela (address@hidden) 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 <address@hidden>
> ---
> 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 <address@hidden>
> 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 / address@hidden / Manchester, UK
- [Qemu-devel] [PATCH v3 00/12] Migration mini-cleanup, Juan Quintela, 2017/05/12
- [Qemu-devel] [PATCH 01/12] migration: Create migration/xbzrle.h, Juan Quintela, 2017/05/12
- [Qemu-devel] [PATCH 02/12] migration: Split migration/channel.c for channel operations, Juan Quintela, 2017/05/12
- [Qemu-devel] [PATCH 03/12] migration: Export qemu-file-channel.c functions in its own file, Juan Quintela, 2017/05/12
- [Qemu-devel] [PATCH 04/12] migration: Remove migration.h from colo.h, Juan Quintela, 2017/05/12
- [Qemu-devel] [PATCH 05/12] migration: Move colo.h to migration/, Juan Quintela, 2017/05/12
- Re: [Qemu-devel] [PATCH 05/12] migration: Move colo.h to migration/,
Dr. David Alan Gilbert <=
- [Qemu-devel] [PATCH 06/12] migration: Move failover.h to migration/colo-failover.h, Juan Quintela, 2017/05/12
- [Qemu-devel] [PATCH 07/12] migration: Move page_cache.c to migration/, Juan Quintela, 2017/05/12
- [Qemu-devel] [PATCH 08/12] migration: Move qjson.h to migration/, Juan Quintela, 2017/05/12
- [Qemu-devel] [PATCH 10/12] migration: Remove qemu-file.h from vmstate.h, Juan Quintela, 2017/05/12
- [Qemu-devel] [PATCH 09/12] migration: Split vmstate-types.c from vmstate.c, Juan Quintela, 2017/05/12
- [Qemu-devel] [PATCH 11/12] migration: Remove vmstate.h from migration.h, Juan Quintela, 2017/05/12