diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2016-01-14 13:07:38 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2016-01-14 13:07:38 +0000 |
commit | 17c8a2197888bac8ec0256b16919b721c76c5e62 (patch) | |
tree | fa31a905b590f802d24296c15dfe110d254a5545 /migration/ram.c | |
parent | cd0b19a20b80ccacd0579d83ac29ea36d666e67c (diff) | |
parent | 5d596c245d675000ddee69e87616d537ef273be5 (diff) | |
download | qemu-17c8a2197888bac8ec0256b16919b721c76c5e62.zip qemu-17c8a2197888bac8ec0256b16919b721c76c5e62.tar.gz qemu-17c8a2197888bac8ec0256b16919b721c76c5e62.tar.bz2 |
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-01-13' into staging
Error reporting patches for 2016-01-13
# gpg: Signature made Wed 13 Jan 2016 14:21:48 GMT using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
* remotes/armbru/tags/pull-error-2016-01-13: (41 commits)
checkpatch: Detect newlines in error_report and other error functions
error: Consistently name Error * objects err, and not errp
s390/sclp: Simplify control flow in sclp_realize()
hw/s390x: Rename local variables Error *l_err to just err
error: Clean up errors with embedded newlines (again)
vhdx: Fix "log that needs to be replayed" error message
pci-assign: Clean up "Failed to assign" error messages
vmdk: Clean up "Invalid extent lines" error message
vmdk: Clean up control flow in vmdk_parse_extents() a bit
error: Strip trailing '\n' from error string arguments (again)
qemu-io qemu-nbd: Use error_report() etc. instead of fprintf()
migration: Use error_reportf_err() instead of monitor_printf()
spapr: Use error_reportf_err()
error: Use error_prepend() where it makes obvious sense
error: Use error_reportf_err() where it makes obvious sense
error: Don't decorate original error message when adding to it
error: New error_prepend(), error_reportf_err()
test-throttle: Simplify qemu_init_main_loop() error handling
qemu-nbd: Clean up "Failed to load snapshot" error message
block: Clean up "Could not create temporary overlay" error message
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/ram.c')
-rw-r--r-- | migration/ram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/migration/ram.c b/migration/ram.c index 2da3b51..4e606ab 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2325,7 +2325,7 @@ static int ram_load_postcopy(QEMUFile *f) } else { /* not the 1st TP within the HP */ if (host != (last_host + TARGET_PAGE_SIZE)) { - error_report("Non-sequential target page %p/%p\n", + error_report("Non-sequential target page %p/%p", host, last_host); ret = -EINVAL; break; |