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

Migration reversion pull for 2.12 

One to revert after we decided it needs some more thinking.
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJazNH5AAoJEAUWMx68W/3n1TcQAIGW5XhiCNN2ujKpckNm6Egc
 moAinp3AxeZb8XTharX15p0nASk+/uJFgA8xe4ByyYS12sZ6Tf7vnEOR2FNBykke
 9ujECZJn8b4nzi75fFFoFzjEl1OWzpFnHjhGH9h3tYEYIrL0qyc3xsJOAH0iUV5B
 3SY7OQCysDRbYUftQO7r72U83xBIgBfyogdGCSyPny0rhwdlHy3h8spDEOLkxpIM
 KY83dYgQZi/NBxMsfQnrcCfj1kaGl9yW44QJ/VlVFfRm1fCYnI7yBLspzWZ/r2J4
 XJ5O9zq84z5zg/uWPDR0aF7WTlr9ixnEo97N5Dtr7tGtyqcdXHym9YgqqSlE9gX2
 By3nA3y18HiD5A8m0iTN2KMqqpMEVU4UqHRltt1d23ZaqwyQjpHi7FHUBZVyhZAZ
 s0Vssrfehp0j7b7+6fynN+dB2ks12Nj1DAvmAelze0yDIXStezOpQaCW2HdZRACV
 RjFuJ5DzTbxw+hnU3myazDbAuE6Eole0ncCLf7KTKcmoRnHP0vQvZqK4CSMfEnYy
 irTH/D069Hz892iBo1qkwRUF/6bUNKx4hPvgdC3cV1OyBuof7x2hwWWjzLUAGxWl
 TfRUGi+cIRK6VgnrqKDme8w4kxBoxyc4lNg57Mkqu4x4gqOeLk5yPobAyVGwCcbZ
 0hjPIBSNiQwUKma1VcKT
 =pdGX
 -----END PGP SIGNATURE-----

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

Migration reversion pull for 2.12

One to revert after we decided it needs some more thinking.

# gpg: Signature made Tue 10 Apr 2018 16:02: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-20180410a:
  Revert "migration: Don't activate block devices if using -S"

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2018-04-10 23:42:14 +01:00
parent 26d6a7c87b a18a73d747
commit ac4ba87ae0
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
migration/migration.c
View File

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