From: Markus Armbruster <armbru@redhat.com>
Date: Thu, 27 May 2010 19:23:08 +0000 (+0200)
Subject: qdev: Don't hw_error() in qdev_init_nofail()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bd6c9a617d969752c9d3663f6ad29ae6d6d6c402;p=qemu.git

qdev: Don't hw_error() in qdev_init_nofail()

Some of the failures are internal errors, and hw_error() is okay then.
But the common way to fail is bad user input, e.g. -global
isa-fdc.driveA=foo where drive foo has an unsupported rerror value.

exit(1) instead.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/hw/qdev.c b/hw/qdev.c
index 61f999c023..00ceada615 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -326,8 +326,10 @@ void qdev_init_nofail(DeviceState *dev)
 {
     DeviceInfo *info = dev->info;
 
-    if (qdev_init(dev) < 0)
-        hw_error("Initialization of device %s failed\n", info->name);
+    if (qdev_init(dev) < 0) {
+        error_report("Initialization of device %s failed\n", info->name);
+        exit(1);
+    }
 }
 
 /* Unlink device from bus and free the structure.  */