diff mbox series

migration/migration.c: Add COLO dependency checks

Message ID 20181114190912.7242-1-chen.zhang@intel.com
State New
Headers show
Series migration/migration.c: Add COLO dependency checks | expand

Commit Message

Zhang, Chen Nov. 14, 2018, 7:09 p.m. UTC 
From: Zhang Chen <chen.zhang@intel.com>

Current COLO mode(independent disk mode) need replication module work
together. Suggested by Dr. David Alan Gilbert <dgilbert@redhat.com>.

Signed-off-by: Zhang Chen <chen.zhang@intel.com>
---
 migration/migration.c | 9 +++++++++
 1 file changed, 9 insertions(+)

Comments

Peter Xu Nov. 15, 2018, 3:54 a.m. UTC | #1 
On Thu, Nov 15, 2018 at 03:09:12AM +0800, Zhang Chen wrote:
> From: Zhang Chen <chen.zhang@intel.com>
> 
> Current COLO mode(independent disk mode) need replication module work
> together. Suggested by Dr. David Alan Gilbert <dgilbert@redhat.com>.
> 
> Signed-off-by: Zhang Chen <chen.zhang@intel.com>

Reviewed-by: Peter Xu <peterx@redhat.com>

Regards,
Zhang Chen Nov. 21, 2018, 9:50 a.m. UTC | #2 
On Thu, Nov 15, 2018 at 11:55 AM Peter Xu <peterx@redhat.com> wrote:

> On Thu, Nov 15, 2018 at 03:09:12AM +0800, Zhang Chen wrote:
> > From: Zhang Chen <chen.zhang@intel.com>
> >
> > Current COLO mode(independent disk mode) need replication module work
> > together. Suggested by Dr. David Alan Gilbert <dgilbert@redhat.com>.
> >
> > Signed-off-by: Zhang Chen <chen.zhang@intel.com>
>
> Reviewed-by: Peter Xu <peterx@redhat.com>
>
>
Thanks Peter,
any comments from others?

Thanks
Zhang Chen


> Regards,
>
> --
> Peter Xu
>
>
Dr. David Alan Gilbert Nov. 21, 2018, 11:38 a.m. UTC | #3 
* Zhang Chen (chen.zhang@intel.com) wrote:
> From: Zhang Chen <chen.zhang@intel.com>
> 
> Current COLO mode(independent disk mode) need replication module work
> together. Suggested by Dr. David Alan Gilbert <dgilbert@redhat.com>.
> 
> Signed-off-by: Zhang Chen <chen.zhang@intel.com>

Queued

> ---
>  migration/migration.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/migration/migration.c b/migration/migration.c
> index b261c1e4ce..49ffb9997a 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -918,6 +918,15 @@ static bool migrate_caps_check(bool *cap_list,
>      }
>  #endif
>  
> +#ifndef CONFIG_REPLICATION
> +    if (cap_list[MIGRATION_CAPABILITY_X_COLO]) {
> +        error_setg(errp, "QEMU compiled without replication module"
> +                   " can't enable COLO");
> +        error_append_hint(errp, "Please enable replication before COLO.\n");
> +        return false;
> +    }
> +#endif
> +
>      if (cap_list[MIGRATION_CAPABILITY_POSTCOPY_RAM]) {
>          if (cap_list[MIGRATION_CAPABILITY_COMPRESS]) {
>              /* The decompression threads asynchronously write into RAM
> -- 
> 2.17.GIT
> 
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff mbox series

Patch

diff --git a/migration/migration.c b/migration/migration.c
index b261c1e4ce..49ffb9997a 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -918,6 +918,15 @@  static bool migrate_caps_check(bool *cap_list,
     }
 #endif
 
+#ifndef CONFIG_REPLICATION
+    if (cap_list[MIGRATION_CAPABILITY_X_COLO]) {
+        error_setg(errp, "QEMU compiled without replication module"
+                   " can't enable COLO");
+        error_append_hint(errp, "Please enable replication before COLO.\n");
+        return false;
+    }
+#endif
+
     if (cap_list[MIGRATION_CAPABILITY_POSTCOPY_RAM]) {
         if (cap_list[MIGRATION_CAPABILITY_COMPRESS]) {
             /* The decompression threads asynchronously write into RAM