@@ -114,8 +114,8 @@ ISADevice *isa_create(const char *name)
DeviceState *dev;
if (!isabus) {
- fprintf(stderr, "Tried to create isa device %s with no isa bus present.\n", name);
- return NULL;
+ hw_error("Tried to create isa device %s with no isa bus present.\n",
+ name);
}
dev = qdev_create(&isabus->qbus, name);
return DO_UPCAST(ISADevice, qdev, dev);
@@ -126,9 +126,7 @@ ISADevice *isa_create_simple(const char *name)
ISADevice *dev;
dev = isa_create(name);
- if (qdev_init(&dev->qdev) != 0) {
- return NULL;
- }
+ qdev_init_nofail(&dev->qdev);
return dev;
}
Callers don't check the return value anyway. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- hw/isa-bus.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-)