From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TWoJL-0003Ed-MB for qemu-devel@nongnu.org; Fri, 09 Nov 2012 08:08:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TWoJF-0004Yo-E8 for qemu-devel@nongnu.org; Fri, 09 Nov 2012 08:07:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44744) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TWoJF-0004Wz-5F for qemu-devel@nongnu.org; Fri, 09 Nov 2012 08:07:45 -0500 From: Eduardo Habkost Date: Fri, 9 Nov 2012 11:08:33 -0200 Message-Id: <1352466519-5779-19-git-send-email-ehabkost@redhat.com> In-Reply-To: <1352466519-5779-1-git-send-email-ehabkost@redhat.com> References: <1352466519-5779-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 18/24] qdev: qdev_create(): use error_report() instead of hw_error() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, riku.voipio@iki.fi, blauwirbel@gmail.com, Anthony Liguori , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= hw_error() is specific for fatal hardware emulation errors, not for internal errors related to the qdev object/class abstraction or object initialization. Replace it with an error_report() call, followed by abort(). This will also help reduce dependencies of the qdev code (as hw_error() is from cpus.o, and depends on the CPU list from exec.o). Signed-off-by: Eduardo Habkost --- hw/qdev.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 7ddcd24..2cc6434 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -109,10 +109,12 @@ DeviceState *qdev_create(BusState *bus, const char *name) dev = qdev_try_create(bus, name); if (!dev) { if (bus) { - hw_error("Unknown device '%s' for bus '%s'\n", name, - object_get_typename(OBJECT(bus))); + error_report("Unknown device '%s' for bus '%s'\n", name, + object_get_typename(OBJECT(bus))); + abort(); } else { - hw_error("Unknown device '%s' for default sysbus\n", name); + error_report("Unknown device '%s' for default sysbus\n", name); + abort(); } } -- 1.7.11.4