diff mbox

[PULL,14/24] error: Replace error_report() & error_free() with error_report_err()

Message ID 198675491fcec79f6ebb5d85ccaa52beecd56e43.1426755483.git.mjt@msgid.tls.msk.ru
State New
Headers show

Commit Message

Michael Tokarev March 19, 2015, 9:05 a.m. UTC
From: zhanghailiang <zhang.zhanghailiang@huawei.com>

This is a continuation of the work started in commit 565f65d27:
"error: Use error_report_err() where appropriate"

Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 hw/arm/virt.c | 2 +-
 savevm.c      | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index b2eaea8..b652b07 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -771,7 +771,7 @@  static void machvirt_init(MachineState *machine)
         cc->parse_features(CPU(cpuobj), cpuopts, &err);
         g_free(cpuopts);
         if (err) {
-            error_report("%s", error_get_pretty(err));
+            error_report_err(err);
             exit(1);
         }
 
diff --git a/savevm.c b/savevm.c
index e7d97ee..3b0e222 100644
--- a/savevm.c
+++ b/savevm.c
@@ -941,8 +941,7 @@  int qemu_loadvm_state(QEMUFile *f)
     int file_error_after_eof = -1;
 
     if (qemu_savevm_state_blocked(&local_err)) {
-        error_report("%s", error_get_pretty(local_err));
-        error_free(local_err);
+        error_report_err(local_err);
         return -EINVAL;
     }