diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-15 11:49:46 +0000 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-15 11:49:46 +0000 |
| commit | 972d233b1d3eacf29a281bb2dd20a52784632894 (patch) | |
| tree | ab890e28712873cdb2245e9f67a3b350dc8b9aaa /migration | |
| parent | 682df581c65ed2c1b9e77093e332214ecaa1ee93 (diff) | |
| parent | 5c90308f07335451a08c030dc40a9eed4698152b (diff) | |
Merge remote-tracking branch 'quintela/tags/migration/20161114' into staging
migration/next for 20161114
# gpg: Signature made Mon 14 Nov 2016 07:55:42 PM GMT
# gpg: using RSA key 0xF487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg: aka "Juan Quintela <quintela@trasno.org>"
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03 4B82 F487 EF18 5872 D723
* quintela/tags/migration/20161114:
migration: Fix return code of ram_save_iterate()
tests/test-vmstate.c: add array of pointer to struct
tests/test-vmstate.c: add save_buffer util func
migration: fix missing assignment for has_x_checkpoint_delay
Message-id: 1479153474-2401-1-git-send-email-quintela@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/migration.c | 1 | ||||
| -rw-r--r-- | migration/ram.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/migration/migration.c b/migration/migration.c index e331f28382..f498ab84f2 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -593,6 +593,7 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp) params->max_bandwidth = s->parameters.max_bandwidth; params->has_downtime_limit = true; params->downtime_limit = s->parameters.downtime_limit; + params->has_x_checkpoint_delay = true; params->x_checkpoint_delay = s->parameters.x_checkpoint_delay; return params; diff --git a/migration/ram.c b/migration/ram.c index fb9252d722..a1c8089010 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1987,7 +1987,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) int ret; int i; int64_t t0; - int pages_sent = 0; + int done = 0; rcu_read_lock(); if (ram_list.version != last_version) { @@ -2007,9 +2007,9 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) pages = ram_find_and_save_block(f, false, &bytes_transferred); /* no more pages to sent */ if (pages == 0) { + done = 1; break; } - pages_sent += pages; acct_info.iterations++; /* we want to check in the 1st loop, just in case it was the 1st time @@ -2044,7 +2044,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) return ret; } - return pages_sent; + return done; } /* Called with iothread lock */ |