diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-07-06 10:48:01 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-07-06 10:48:01 -0500 |
| commit | 5efb397f877fc3002c8bc764f4656f4761bd965d (patch) | |
| tree | 4ef1809f16a7f30f237840cdbfc5521afd4e8316 /hw/qdev.c | |
| parent | fb787f81e749fde8c74548f9db1472eb321b9a0c (diff) | |
| parent | 33b1db1c8888b77e06c720ebef0482ed598eb384 (diff) | |
| download | focaccia-qemu-5efb397f877fc3002c8bc764f4656f4761bd965d.tar.gz focaccia-qemu-5efb397f877fc3002c8bc764f4656f4761bd965d.zip | |
Merge remote branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'hw/qdev.c')
| -rw-r--r-- | hw/qdev.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/qdev.c b/hw/qdev.c index 952c97846e..e99c73f0d9 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. */ |