[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/7] Make isa_create() terminate program on failure
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 5/7] Make isa_create() terminate program on failure |
Date: |
Wed, 7 Oct 2009 01:15:59 +0200 |
Callers don't check the return value anyway.
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/isa-bus.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index f7e73d2..4d489d2 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -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;
}
--
1.6.2.5
- [Qemu-devel] [PATCH 0/7] Clean up use of qdev_init(), Markus Armbruster, 2009/10/06
- [Qemu-devel] [PATCH 6/7] Warn if value of qdev_init() isn't checked, Markus Armbruster, 2009/10/06
- [Qemu-devel] [PATCH 3/7] Check return value of qdev_init(), Markus Armbruster, 2009/10/06
- [Qemu-devel] [PATCH 4/7] New qdev_init_nofail(), Markus Armbruster, 2009/10/06
- [Qemu-devel] [PATCH 1/7] Unbreak USB autoconnect filters, Markus Armbruster, 2009/10/06
- [Qemu-devel] [PATCH 2/7] Make qdev_init() destroy the device on failure, Markus Armbruster, 2009/10/06
- [Qemu-devel] [PATCH 7/7] Clean up test for qdev_init() failure, Markus Armbruster, 2009/10/06
- [Qemu-devel] [PATCH 5/7] Make isa_create() terminate program on failure,
Markus Armbruster <=