diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-11-12 20:13:01 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-11-12 20:13:01 +0000 |
| commit | 4cfac0152e798f9c60472706c0441501da13183c (patch) | |
| tree | aa52af2f3606e4a6f310f660cc11e899eafd79ce /migration/migration.c | |
| parent | cb5d19e8294486551c422759260883ed290226d9 (diff) | |
| parent | 7632b56c8f880a8f86cf049a3785069e1ffd2997 (diff) | |
| download | focaccia-qemu-4cfac0152e798f9c60472706c0441501da13183c.tar.gz focaccia-qemu-4cfac0152e798f9c60472706c0441501da13183c.zip | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20201112a' into staging
Migration & virtiofs fixes for 5.2 A bunch of small fixes. # gpg: Signature made Thu 12 Nov 2020 18:34:41 GMT # gpg: using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7 # gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" [full] # Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7 * remotes/dgilbert/tags/pull-migration-20201112a: virtiofsd: check whether strdup lo.source return NULL in main func virtiofsd: check whether lo_map_reserve returns NULL in, main func tools/virtiofsd/buffer.c: check whether buf is NULL in fuse_bufvec_advance func virtiofsd: Announce submounts even without statx() migration: handle CANCELLING state in migration_completion() multifd/tls: fix memoryleak of the QIOChannelSocket object when cancelling migration migration/dirtyrate: simplify includes in dirtyrate.c migration: fix uninitialized variable warning in migrate_send_rp_req_pages() migration/multifd: fix hangup with TLS-Multifd due to blocking handshake ACPI: Avoid infinite recursion when dump-vmstate migration/ram: Fix hexadecimal format string specifier Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/migration.c')
| -rw-r--r-- | migration/migration.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/migration/migration.c b/migration/migration.c index 3263aa55a9..87a9b59f83 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -365,7 +365,7 @@ int migrate_send_rp_req_pages(MigrationIncomingState *mis, RAMBlock *rb, ram_addr_t start, uint64_t haddr) { void *aligned = (void *)(uintptr_t)(haddr & (-qemu_ram_pagesize(rb))); - bool received; + bool received = false; WITH_QEMU_LOCK_GUARD(&mis->page_request_mutex) { received = ramblock_recv_bitmap_test_byte_offset(rb, start); @@ -3061,6 +3061,8 @@ static void migration_completion(MigrationState *s) qemu_savevm_state_complete_postcopy(s->to_dst_file); trace_migration_completion_postcopy_end_after_complete(); + } else if (s->state == MIGRATION_STATUS_CANCELLING) { + goto fail; } /* |