diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-04 12:54:00 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-04 12:54:00 +0100 |
| commit | b74588a493c12c8d389f08004318c7d01ebfda70 (patch) | |
| tree | 4180c046efc7ed3a5e33275aeb6e54c3420f6097 /migration/savevm.c | |
| parent | 163670542fa3b33dbf0332b1e5d47c8d16393d42 (diff) | |
| parent | c5e76115ccb4979cec795a8ae38becd07c2fde9f (diff) | |
| download | qemu-b74588a493c12c8d389f08004318c7d01ebfda70.zip qemu-b74588a493c12c8d389f08004318c7d01ebfda70.tar.gz qemu-b74588a493c12c8d389f08004318c7d01ebfda70.tar.bz2 | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20180604' into staging
migration/next for 20180604
# gpg: Signature made Mon 04 Jun 2018 05:14:24 BST
# gpg: using RSA key F487EF185872D723
# 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
* remotes/juanquintela/tags/migration/20180604:
migration: not wait RDMA_CM_EVENT_DISCONNECTED event after rdma_disconnect
migration: remove unnecessary variables len in QIOChannelRDMA
migration: Don't activate block devices if using -S
migration: discard non-migratable RAMBlocks
migration: introduce decompress-error-check
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/savevm.c')
| -rw-r--r-- | migration/savevm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/migration/savevm.c b/migration/savevm.c index da724c5..c2f34ff 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2689,11 +2689,13 @@ void vmstate_register_ram(MemoryRegion *mr, DeviceState *dev) { qemu_ram_set_idstr(mr->ram_block, memory_region_name(mr), dev); + qemu_ram_set_migratable(mr->ram_block); } void vmstate_unregister_ram(MemoryRegion *mr, DeviceState *dev) { qemu_ram_unset_idstr(mr->ram_block); + qemu_ram_unset_migratable(mr->ram_block); } void vmstate_register_ram_global(MemoryRegion *mr) |