ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migration pull (small fixes) 

A pair of two small fixes for 2.12.
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJavPBFAAoJEAUWMx68W/3nuPcP/02EhfBpqaJiDQlmGfDotmlJ
 hV0+V8UiI8S6Cz6tY/DfFJWhRSK3zxoWljpczkuvpkmjYTD8aNCjOqkBlDp8NwbW
 C5ZKxtTAmXrIpJuMi1nXhvrp6mgGfbNkS4K9hWhcvXoXd4Z84PqvQCYwWUyHlNSs
 FAmoOZMuVbSSGF4Gq0Uj9VbxB7EjeUD8yHepRqb4iloeVjw2+3NpU74q1wFu1/A0
 gJtN9HHr2enmV+7EGbNWBllGyvdxGnEHeMrUj96RYLY/TzsGQWRtbc49q8HpuiXB
 5novX5NiS7qjphFOP8kKmOvVXkpfcDAvYlfhGD9HRhzKPb0oyYzM1FOG2m4xmWF7
 Ki9yIufEfSggmeEq5WlJcb43wEZL0lyirxld8+Kip8EoeB/NxeV7oWhkzwITWiNn
 PjsrhTblwhHzbpFWABkTZt/iMtljsHTMvyIyITHSUJMtwmNOEUL02AmENh7eFvSk
 N0wtOxDEhi6WFyrE8iC3H//zLNPRAiCabiM6lOwrsnpMAwJSHlRe+5Cwmg9yKzfC
 SbcdtyQtLwux8GKKR+fgQaXhB7xOmqO/TDNlRS2WzW0KTCBM938n4NweMQpFPXMz
 BVvMOBe5/dbMcMeZIY+30zyrnQBJa07tzZmrX0/pMulz5nCkoHt2jrkWThS5va4g
 i3PiHDf/qeE+82xFhRHh
 =6vyj
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20180329a' into staging

Migration pull (small fixes)

A pair of two small fixes for 2.12.

# gpg: Signature made Thu 29 Mar 2018 14:55:17 BST
# gpg:                using RSA key 0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-migration-20180329a:
  migration: Don't activate block devices if using -S
  migration: fix pfd leak

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2018-03-30 19:58:17 +01:00
parent 47d3b60858 0746a92612
commit 4cd327ded7
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
migration/migration.c
View File

@ -306,13 +306,21 @@ static void process_incoming_migration_bh(void *opaque)
Error *local_err = NULL;
MigrationIncomingState *mis = opaque;
/* Make sure all file formats flush their mutable metadata.
* If we get an error here, just don't restart the VM yet. */
bdrv_invalidate_cache_all(&local_err);
if (local_err) {
error_report_err(local_err);
local_err = NULL;
autostart = false;
/* Only fire up the block code now if we're going to restart the
* VM, else 'cont' will do it.
* This causes file locking to happen; so we don't want it to happen
* unless we really are starting the VM.
*/
if (autostart && (!global_state_received() ||
global_state_get_runstate() == RUN_STATE_RUNNING)) {
/* Make sure all file formats flush their mutable metadata.
* If we get an error here, just don't restart the VM yet. */
bdrv_invalidate_cache_all(&local_err);
if (local_err) {
error_report_err(local_err);
local_err = NULL;
autostart = false;
}
}
/*

1
migration/postcopy-ram.c
View File

@ -754,6 +754,7 @@ static void *postcopy_ram_fault_thread(void *opaque)
}
}
trace_postcopy_ram_fault_thread_exit();
g_free(pfd);
return NULL;
}