提交 3f66aa9c 编写于 作者: M Markus Armbruster 提交者: Anthony Liguori

Make isa_create() terminate program on failure

Callers don't check the return value anyway.

Patchworks-ID: 35172
Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
上级 e23a1b33
......@@ -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;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册