Skip to contentSkip to conversation

migration: Avoid qerror_report_err() outside QMP command handlers

PATCH Applied Markus Armbruster 3 participants 4 messages Feb 18, 2015 – Mar 17, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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().

---
Based on
[PATCH v2 00/10] Clean up around error_get_pretty(), qerror_report_err()

 migration/migration.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
migration/migration.c +1 -2
index b3adbc6..6a5e3f9 100644
@@ -106,8 +106,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);
     }
 
Signature · 1 line
1.9.3
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Markus Armbruster

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().

---
Based on
[PATCH v2 00/10] Clean up around error_get_pretty(), qerror_report_err()

Quoted 19 lines
 migration/migration.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
migration/migration.c +1 -2
index b3adbc6..6a5e3f9 100644
@@ -106,8 +106,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);
     }
 
Signature · 2 lines
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org
#2 lore raw
In reply to Markus Armbruster
Quoted 4 lines · Markus Armbruster

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().

I trust you & eric

Included, thanks.

Quoted 22 lines

---
Based on
[PATCH v2 00/10] Clean up around error_get_pretty(), qerror_report_err()

 migration/migration.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
migration/migration.c +1 -2
index b3adbc6..6a5e3f9 100644
@@ -106,8 +106,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);
     }