Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20150303-1' into staging

[qemu.git] / arch_init.c

diff --git a/arch_init.c b/arch_init.c
index 5fc6fc382ce50706d3b504f768788e55fafc9d5b..691b5e2e91648f6c2b955e8e95e51f4e0d48e07c 100644 (file)
--- 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;