From 23e3fbec3355e67dbf26e98bbe33ef354097df8e Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Tue, 4 Dec 2012 11:19:34 -0200 Subject: qdev: qdev_create(): use error_report() instead of hw_error() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Andreas Färber --- hw/qdev.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'hw') diff --git a/hw/qdev.c b/hw/qdev.c index 788b4da..599382c 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(); } } -- cgit v1.1