Hi Eric,

On 2016/10/26 21:39, Eric Blake wrote:
On 10/26/2016 12:45 AM, Amit Shah wrote:
On (Tue) 18 Oct 2016 [20:10:06], zhanghailiang wrote:
Add checkpoint-delay parameter for migrate-set-parameters, so that
we can control the checkpoint frequency when COLO is in periodic mode.

Cc: Luiz Capitulino <lcapitul...@redhat.com>
Cc: Eric Blake <ebl...@redhat.com>
Cc: Markus Armbruster <arm...@redhat.com>
Signed-off-by: zhanghailiang <zhang.zhanghaili...@huawei.com>
Signed-off-by: Li Zhijian <lizhij...@cn.fujitsu.com>
Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com>



@@ -1363,7 +1366,6 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict 
*qdict)
              case MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT:
                  p.has_cpu_throttle_increment = true;
                  use_int_value = true;
-                break;

Hm?


Looks like an improper conflict resolution after commit bb2b777.
Definitely a hunk that does not belong in this patch; but with it
removed, the rest of the patch earns:


Thanks very much, yes, I accidentally remove it while fixed
the conflict with the upstream. I'll fix it in next version :)

Reviewed-by: Eric Blake <ebl...@redhat.com>



Reply via email to