From 3f66aa9c07d6392757f9d7b83849c7f791981725 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 7 Oct 2009 01:15:59 +0200 Subject: Make isa_create() terminate program on failure Callers don't check the return value anyway. Patchworks-ID: 35172 Signed-off-by: Markus Armbruster Signed-off-by: Anthony Liguori --- hw/isa-bus.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'hw') 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; } -- cgit v1.1