summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorzhanghailiang <zhang.zhanghailiang@huawei.com>2015-03-04 18:25:54 +0800
committerMichael Tokarev <mjt@tls.msk.ru>2015-03-19 11:11:55 +0300
commit198675491fcec79f6ebb5d85ccaa52beecd56e43 (patch)
tree7ab85fc68df71da72782f65b5f5b150cecf9d7b6
parent6e05a12f8f7f32a3fecbeb0c572d549a5f6e9177 (diff)
downloadfocaccia-qemu-198675491fcec79f6ebb5d85ccaa52beecd56e43.tar.gz
focaccia-qemu-198675491fcec79f6ebb5d85ccaa52beecd56e43.zip
error: Replace error_report() & error_free() with error_report_err()
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>
-rw-r--r--hw/arm/virt.c2
-rw-r--r--savevm.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index b2eaea8353..b652b07ced 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 e7d97eea93..3b0e222cb3 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;
     }