diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-08-11 17:53:35 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-08-11 17:53:35 +0100 |
| commit | 28b874429ba16e71e0caa46453f3a3e31efb3c51 (patch) | |
| tree | 040b35d0a29ab7798304d2ea0ae09d97c7bcf437 /migration/postcopy-ram.c | |
| parent | d915b7bb4c2956ea3ef223605abe257dc7d7445a (diff) | |
| parent | 474c624ddf0d390b850526a01026ef8737e67ca7 (diff) | |
Merge remote-tracking branch 'remotes/amit-migration/tags/migration-for-2.7-7' into staging
Migration:
- couple of bug fixes
- couple of typo fixes
# gpg: Signature made Thu 11 Aug 2016 12:36:00 BST
# gpg: using RSA key 0xEB0B4DFC657EF670
# gpg: Good signature from "Amit Shah <amit@amitshah.net>"
# gpg: aka "Amit Shah <amit@kernel.org>"
# gpg: aka "Amit Shah <amitshah@gmx.net>"
# Primary key fingerprint: 48CA 3722 5FE7 F4A8 B337 2735 1E9A 3B5F 8540 83B6
# Subkey fingerprint: CC63 D332 AB8F 4617 4529 6534 EB0B 4DFC 657E F670
* remotes/amit-migration/tags/migration-for-2.7-7:
migration/socket: fix typo in file header
migration: fix live migration failure with compression
migration: mmap error check fix
migration/ram: fix typo
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/postcopy-ram.c')
| -rw-r--r-- | migration/postcopy-ram.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index abe8c60a90..9b0477835f 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -604,7 +604,8 @@ void *postcopy_get_tmp_page(MigrationIncomingState *mis) mis->postcopy_tmp_page = mmap(NULL, getpagesize(), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - if (!mis->postcopy_tmp_page) { + if (mis->postcopy_tmp_page == MAP_FAILED) { + mis->postcopy_tmp_page = NULL; error_report("%s: %s", __func__, strerror(errno)); return NULL; } |