From: Markus Armbruster <armbru@redhat.com>
Date: Tue, 10 Feb 2015 14:21:26 +0000 (+0100)
Subject: qemu-char: Avoid qerror_report_err() outside QMP command handlers
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=33394884060b6501ef39b124eeaa111f61c59f7f;p=qemu.git

qemu-char: 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 legacy chardev parser
qemu_chr_parse_compat().  Legacy chardev syntax is not to be used in
QMP.

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

diff --git a/qemu-char.c b/qemu-char.c
index f901ed1583..8159462fc0 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -3306,8 +3306,7 @@ QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename)
 
     opts = qemu_opts_create(qemu_find_opts("chardev"), label, 1, &local_err);
     if (local_err) {
-        qerror_report_err(local_err);
-        error_free(local_err);
+        error_report_err(local_err);
         return NULL;
     }