diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-05-19 09:27:28 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-05-19 09:27:28 +0100 |
| commit | 8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3 (patch) | |
| tree | 93a1691d7a5d90ddbb77a3210299089fcede4947 /migration | |
| parent | a257c741491ff1c3c192d13a89c136dd6401c54d (diff) | |
| parent | cb8d4c8f54b8271f642f02382eec29d468bb1c77 (diff) | |
| download | qemu-8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3.zip qemu-8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3.tar.gz qemu-8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3.tar.bz2 | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-05-18' into staging
trivial patches for 2016-05-18
# gpg: Signature made Wed 18 May 2016 13:04:43 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
* remotes/mjt/tags/pull-trivial-patches-2016-05-18:
Fix some typos found by codespell
9p: drop unused declaration from coth.h
smbios: fix typo
accel: make configure_accelerator return void
configure: Use uniform description for devel packages
ipack: Update e-mail address
util: fix comment typos
qdict: fix unbounded stack warning for qdict_array_entries
Fix typo in variable name (found and fixed by codespell)
vl: fix comment about when parsing cpu definitions
loader: fix potential memory leak
remove comment for nonexistent structure member
s390: remove misleading comment
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/migration.c | 2 | ||||
| -rw-r--r-- | migration/ram.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/migration/migration.c b/migration/migration.c index 991313a..c08d9a6 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -278,7 +278,7 @@ static void deferred_incoming_migration(Error **errp) void migrate_send_rp_req_pages(MigrationIncomingState *mis, const char *rbname, ram_addr_t start, size_t len) { - uint8_t bufc[12 + 1 + 255]; /* start (8), len (4), rbname upto 256 */ + uint8_t bufc[12 + 1 + 255]; /* start (8), len (4), rbname up to 256 */ size_t msglen = 12; /* start + len */ *(uint64_t *)bufc = cpu_to_be64((uint64_t)start); diff --git a/migration/ram.c b/migration/ram.c index 3f05738..88fbffc 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1272,7 +1272,7 @@ static int ram_save_target_page(MigrationState *ms, QEMUFile *f, } /** - * ram_save_host_page: Starting at *offset send pages upto the end + * ram_save_host_page: Starting at *offset send pages up to the end * of the current host page. It's valid for the initial * offset to point into the middle of a host page * in which case the remainder of the hostpage is sent. |