From: Markus Armbruster <armbru@redhat.com>
Date: Wed, 18 Feb 2015 18:21:52 +0000 (+0100)
Subject: migration: Avoid qerror_report_err() outside QMP command handlers
X-Git-Tag: v2.3.0-rc0~1^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97baf9d9f768caac57bb98d79a1d878181e8a052;p=thirdparty%2Fqemu.git

migration: Avoid qerror_report_err() outside QMP command handlers

qerror_report_err() is a transitional interface to help with
converting existing monitor commands to QMP.  It should not be used
elsewhere.  Replace by error_report_err() in
process_incoming_migration_co().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---

diff --git a/migration/migration.c b/migration/migration.c
index 2c805f11f50..60da9fef3c6 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -123,8 +123,7 @@ static void process_incoming_migration_co(void *opaque)
     /* Make sure all file formats flush their mutable metadata */
     bdrv_invalidate_cache_all(&local_err);
     if (local_err) {
-        qerror_report_err(local_err);
-        error_free(local_err);
+        error_report_err(local_err);
         exit(EXIT_FAILURE);
     }