From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRdMs-0004ru-Le for qemu-devel@nongnu.org; Sat, 28 Feb 2015 04:07:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YRdMr-0004V9-Pk for qemu-devel@nongnu.org; Sat, 28 Feb 2015 04:07:26 -0500 From: zhanghailiang Date: Sat, 28 Feb 2015 17:05:24 +0800 Message-ID: <1425114327-12136-3-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1425114327-12136-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1425114327-12136-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH RFC 2/5] qdev: Avoid qerror_report_err() outside QMP command handlers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-trivial@nongnu.org Cc: zhanghailiang , peter.huangpeng@huawei.com, armbru@redhat.com, qemu-devel@nongnu.org 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 qdev_init() and device_post_init(). Signed-off-by: zhanghailiang --- hw/core/qdev.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 44c6b93..9adcd27 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -181,8 +181,7 @@ int qdev_init(DeviceState *dev) object_property_set_bool(OBJECT(dev), true, "realized", &local_err); if (local_err != NULL) { - qerror_report_err(local_err); - error_free(local_err); + error_report_err(local_err); object_unparent(OBJECT(dev)); return -1; } @@ -1189,8 +1188,7 @@ static void device_post_init(Object *obj) Error *err = NULL; qdev_prop_set_globals(DEVICE(obj), &err); if (err) { - qerror_report_err(err); - error_free(err); + error_report_err(err); exit(EXIT_FAILURE); } } -- 1.7.12.4