]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'quintela/tags/migration/20161114' into staging
authorStefan Hajnoczi <stefanha@redhat.com>
Tue, 15 Nov 2016 11:49:46 +0000 (11:49 +0000)
committerStefan Hajnoczi <stefanha@redhat.com>
Tue, 15 Nov 2016 11:49:46 +0000 (11:49 +0000)
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>
1  2 
hmp.c

diff --combined hmp.c
index 819166d423e28d091543927da34a9547c19e4301,02103dfb75f0a16bee673722ac8bf2df02a65157..b86961705d7790115437724a51f99c2d17390a6b
--- 1/hmp.c
--- 2/hmp.c
+++ b/hmp.c
@@@ -318,6 -318,7 +318,7 @@@ void hmp_info_migrate_parameters(Monito
          monitor_printf(mon, " %s: %" PRId64 " milliseconds",
              MigrationParameter_lookup[MIGRATION_PARAMETER_DOWNTIME_LIMIT],
              params->downtime_limit);
+         assert(params->has_x_checkpoint_delay);
          monitor_printf(mon, " %s: %" PRId64,
              MigrationParameter_lookup[MIGRATION_PARAMETER_X_CHECKPOINT_DELAY],
              params->x_checkpoint_delay);
@@@ -1570,7 -1571,7 +1571,7 @@@ void hmp_block_stream(Monitor *mon, con
      const char *base = qdict_get_try_str(qdict, "base");
      int64_t speed = qdict_get_try_int(qdict, "speed", 0);
  
 -    qmp_block_stream(false, NULL, device, base != NULL, base, false, NULL,
 +    qmp_block_stream(true, device, device, base != NULL, base, false, NULL,
                       false, NULL, qdict_haskey(qdict, "speed"), speed,
                       true, BLOCKDEV_ON_ERROR_REPORT, &error);