diff mbox

[v2,14/23] migration: Use error_reportf_err() instead of monitor_printf()

Message ID 1450371004-26866-15-git-send-email-armbru@redhat.com
State New
Headers show

Commit Message

Markus Armbruster Dec. 17, 2015, 4:49 p.m. UTC 
Using error_reportf_err() instead of monitor_printf() makes no
difference when monitor_printf() is used correctly, i.e. within an HMP
monitor.  Elsewhere, monitor_printf() does nothing, while
error_reportf_err() reports to stderr.

Both changed functions are HMP command handlers.  These should only
run within an HMP monitor.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 migration/savevm.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

Comments

Eric Blake Dec. 17, 2015, 8:46 p.m. UTC | #1 
On 12/17/2015 09:49 AM, Markus Armbruster wrote:
> Using error_reportf_err() instead of monitor_printf() makes no
> difference when monitor_printf() is used correctly, i.e. within an HMP
> monitor.  Elsewhere, monitor_printf() does nothing, while
> error_reportf_err() reports to stderr.
> 
> Both changed functions are HMP command handlers.  These should only
> run within an HMP monitor.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  migration/savevm.c | 14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)
> 

Reviewed-by: Eric Blake <eblake@redhat.com>
diff mbox

Patch

diff --git a/migration/savevm.c b/migration/savevm.c
index e277b72..bcaeb70 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1927,10 +1927,9 @@  void hmp_savevm(Monitor *mon, const QDict *qdict)
 
     /* Delete old snapshots of the same name */
     if (name && bdrv_all_delete_snapshot(name, &bs1, &local_err) < 0) {
-        monitor_printf(mon,
-                       "Error while deleting snapshot on device '%s': %s\n",
-                       bdrv_get_device_name(bs1), error_get_pretty(local_err));
-        error_free(local_err);
+        error_reportf_err(local_err,
+                          "Error while deleting snapshot on device '%s': ",
+                          bdrv_get_device_name(bs1));
         return;
     }
 
@@ -2108,10 +2107,9 @@  void hmp_delvm(Monitor *mon, const QDict *qdict)
     const char *name = qdict_get_str(qdict, "name");
 
     if (bdrv_all_delete_snapshot(name, &bs, &err) < 0) {
-        monitor_printf(mon,
-                       "Error while deleting snapshot on device '%s': %s\n",
-                       bdrv_get_device_name(bs), error_get_pretty(err));
-        error_free(err);
+        error_reportf_err(err,
+                          "Error while deleting snapshot on device '%s': ",
+                          bdrv_get_device_name(bs));
     }
 }