diff options
| author | Zhang Chen <zhangckid@gmail.com> | 2018-09-03 12:38:45 +0800 |
|---|---|---|
| committer | Jason Wang <jasowang@redhat.com> | 2018-10-19 11:15:03 +0800 |
| commit | 131b2153fc7970fab780dc875f59823e3b23612a (patch) | |
| tree | 0d392d21ad368d84d6421e539fb8e685054c224a /migration/migration.c | |
| parent | dccd0313b69161fe2235c97633f40ecc041542ac (diff) | |
| download | qemu-131b2153fc7970fab780dc875f59823e3b23612a.zip qemu-131b2153fc7970fab780dc875f59823e3b23612a.tar.gz qemu-131b2153fc7970fab780dc875f59823e3b23612a.tar.bz2 | |
COLO: integrate colo compare with colo frame
For COLO FT, both the PVM and SVM run at the same time,
only sync the state while it needs.
So here, let SVM runs while not doing checkpoint, change
DEFAULT_MIGRATE_X_CHECKPOINT_DELAY to 200*100.
Besides, we forgot to release colo_checkpoint_semd and
colo_delay_timer, fix them here.
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Signed-off-by: Zhang Chen <zhangckid@gmail.com>
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'migration/migration.c')
| -rw-r--r-- | migration/migration.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/migration/migration.c b/migration/migration.c index d6ae879..32ce058 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -76,10 +76,8 @@ /* Migration XBZRLE default cache size */ #define DEFAULT_MIGRATE_XBZRLE_CACHE_SIZE (64 * 1024 * 1024) -/* The delay time (in ms) between two COLO checkpoints - * Note: Please change this default value to 10000 when we support hybrid mode. - */ -#define DEFAULT_MIGRATE_X_CHECKPOINT_DELAY 200 +/* The delay time (in ms) between two COLO checkpoints */ +#define DEFAULT_MIGRATE_X_CHECKPOINT_DELAY (200 * 100) #define DEFAULT_MIGRATE_MULTIFD_CHANNELS 2 #define DEFAULT_MIGRATE_MULTIFD_PAGE_COUNT 16 |