diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-16 11:06:06 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-16 11:06:06 +0100 |
| commit | 0bbac62618356794097b99a9b8b7634357170b03 (patch) | |
| tree | 3861bb55883487e6d57385ee750d675c6e37c27e /migration.c | |
| parent | 06a59afac4505f5ed942db4200e5ca16fcbba74d (diff) | |
| parent | db80facefa62dff42bb50c73b0f03eda5f732b49 (diff) | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20140616' into staging
migration/next for 20140616
# gpg: Signature made Mon 16 Jun 2014 04:10:18 BST using RSA key ID 5872D723
# gpg: Can't check signature: public key not found
* remotes/juanquintela/tags/migration/20140616:
migration: catch unknown flags in ram_load
rdma: Fix block during rdma migration
migration: Increase default max_downtime from 30ms to 300ms
vmstate: Refactor opening of files
savevm: Remove all the unneeded version_minimum_id_old (x86)
savevm: Remove all the unneeded version_minimum_id_old (ppc)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration.c')
| -rw-r--r-- | migration.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/migration.c b/migration.c index 3fc03d6687..8d675b31a1 100644 --- a/migration.c +++ b/migration.c @@ -98,7 +98,7 @@ static void process_incoming_migration_co(void *opaque) qemu_fclose(f); free_xbzrle_decoded_buf(); if (ret < 0) { - fprintf(stderr, "load of migration failed\n"); + error_report("load of migration failed: %s", strerror(-ret)); exit(EXIT_FAILURE); } qemu_announce_self(); @@ -133,7 +133,7 @@ void process_incoming_migration(QEMUFile *f) * the choice of nanoseconds is because it is the maximum resolution that * get_clock() can achieve. It is an internal measure. All user-visible * units must be in seconds */ -static uint64_t max_downtime = 30000000; +static uint64_t max_downtime = 300000000; uint64_t migrate_max_downtime(void) { |