summaryrefslogtreecommitdiff
path: root/hw/isa-bus.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2009-10-07 01:15:58 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-07 08:54:54 -0500
commit57addc52e64fa2a91e9e4a47a19dec051e718bd0 (patch)
tree2c0c5b9ac463c9e9ed745d1ea1837892cac139f3 /hw/isa-bus.c
parent967d568cc9bf06ca1b2c93596493c90cb57191c1 (diff)
downloadqemu-57addc52e64fa2a91e9e4a47a19dec051e718bd0.tar.gz
qemu-57addc52e64fa2a91e9e4a47a19dec051e718bd0.tar.bz2
qemu-57addc52e64fa2a91e9e4a47a19dec051e718bd0.zip
New qdev_init_nofail()
Like qdev_init(), but terminate program via hw_error() instead of returning an error value. Use it instead of qdev_init() where terminating the program on failure is okay, either because it's during machine construction, or because we know that failure can't happen. Because relying in the latter is somewhat unclean, and the former is not always obvious, it would be nice to go back to qdev_init() in the not-so-obvious cases, only with proper error handling. I'm leaving that for another day, because it involves making sure that error values are properly checked by all callers. Patchworks-ID: 35168 Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/isa-bus.c')
-rw-r--r--hw/isa-bus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index fb90be4e50..f7e73d2c04 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -45,7 +45,7 @@ ISABus *isa_bus_new(DeviceState *dev)
}
if (NULL == dev) {
dev = qdev_create(NULL, "isabus-bridge");
- qdev_init(dev);
+ qdev_init_nofail(dev);
}
isabus = FROM_QBUS(ISABus, qbus_create(&isa_bus_info, dev, NULL));