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 <address@hidden>
Cc: Eric Blake <address@hidden>
Cc: Markus Armbruster <address@hidden>
Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Li Zhijian <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
@@ -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: