diff options
| author | Peter Maydell | 2016-08-11 18:53:35 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-08-11 18:53:35 +0200 |
| commit | 28b874429ba16e71e0caa46453f3a3e31efb3c51 (patch) | |
| tree | 040b35d0a29ab7798304d2ea0ae09d97c7bcf437 /migration/ram.c | |
| parent | Update ancient copyright string in -version output (diff) | |
| parent | migration/socket: fix typo in file header (diff) | |
| download | qemu-28b874429ba16e71e0caa46453f3a3e31efb3c51.tar.gz qemu-28b874429ba16e71e0caa46453f3a3e31efb3c51.tar.xz qemu-28b874429ba16e71e0caa46453f3a3e31efb3c51.zip | |
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/ram.c')
| -rw-r--r-- | migration/ram.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/migration/ram.c b/migration/ram.c index 815bc0e11a..a3d70c4c62 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -375,8 +375,8 @@ void migrate_compress_threads_create(void) qemu_cond_init(&comp_done_cond); qemu_mutex_init(&comp_done_lock); for (i = 0; i < thread_count; i++) { - /* com_param[i].file is just used as a dummy buffer to save data, set - * it's ops to empty. + /* comp_param[i].file is just used as a dummy buffer to save data, + * set its ops to empty. */ comp_param[i].file = qemu_fopen_ops(NULL, &empty_ops); comp_param[i].done = true; |