Patchwork [08/17] qdev: Don't hw_error() in qdev_init_nofail()

login
register
mail settings
Submitter Kevin Wolf
Date July 6, 2010, 3:33 p.m.
Message ID <1278430406-18667-9-git-send-email-kwolf@redhat.com>
Download mbox | patch
Permalink /patch/58038/
State New
Headers show

Comments

Kevin Wolf - July 6, 2010, 3:33 p.m.
From: Markus Armbruster <armbru@redhat.com>

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>
---
 hw/qdev.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Patch

diff --git a/hw/qdev.c b/hw/qdev.c
index 61f999c..00ceada 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.  */