diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-02-26 07:01:08 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-02-26 07:01:08 +0000 |
| commit | c5c6d7f81a6950d8e32a3b5a0bafd37bfa5a8e88 (patch) | |
| tree | 792ffe6fdc9cfdc48c25f2da39b3a6877576eb16 /arch_init.c | |
| parent | 68b459eaa660be17d3547aa581502fe2c572c84f (diff) | |
| parent | 33394884060b6501ef39b124eeaa111f61c59f7f (diff) | |
| download | qemu-c5c6d7f81a6950d8e32a3b5a0bafd37bfa5a8e88.zip qemu-c5c6d7f81a6950d8e32a3b5a0bafd37bfa5a8e88.tar.gz qemu-c5c6d7f81a6950d8e32a3b5a0bafd37bfa5a8e88.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-02-18' into staging
Clean up around error_get_pretty(), qerror_report_err()
# gpg: Signature made Wed Feb 18 10:10:07 2015 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-2015-02-18:
qemu-char: Avoid qerror_report_err() outside QMP command handlers
qemu-img: Avoid qerror_report_err() outside QMP command handlers
vl: Avoid qerror_report_err() outside QMP command handlers
tpm: Avoid qerror_report_err() outside QMP command handlers
numa: Avoid qerror_report_err() outside QMP command handlers
net: Avoid qerror_report_err() outside QMP command handlers
monitor: Avoid qerror_report_err() outside QMP command handlers
monitor: Clean up around monitor_handle_fd_param()
error: Use error_report_err() where appropriate
error: New convenience function error_report_err()
vhost-scsi: Improve error reporting for invalid vhostfd
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'arch_init.c')
| -rw-r--r-- | arch_init.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch_init.c b/arch_init.c index 5fc6fc3..691b5e2 100644 --- a/arch_init.c +++ b/arch_init.c @@ -1124,8 +1124,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) ret = qemu_ram_resize(block->offset, length, &local_err); if (local_err) { - error_report("%s", error_get_pretty(local_err)); - error_free(local_err); + error_report_err(local_err); } } break; |