sim-card
/
qemu
Archived
10
0
Fork 0
Code Releases Activity

Make isa_create() terminate program on failure 

Callers don't check the return value anyway.

Patchworks-ID: 35172
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Markus Armbruster 2009-10-07 01:15:59 +02:00 committed by Anthony Liguori
parent e23a1b33b5
commit 3f66aa9c07
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/isa-bus.c
View File

@ -114,8 +114,8 @@ ISADevice *isa_create(const char *name)
DeviceState *dev; DeviceState *dev;
if (!isabus) { if (!isabus) {
fprintf(stderr, "Tried to create isa device %s with no isa bus present.\n", name); hw_error("Tried to create isa device %s with no isa bus present.\n",
return NULL; name);
} }
dev = qdev_create(&isabus->qbus, name); dev = qdev_create(&isabus->qbus, name);
return DO_UPCAST(ISADevice, qdev, dev); return DO_UPCAST(ISADevice, qdev, dev);
@ -126,9 +126,7 @@ ISADevice *isa_create_simple(const char *name)
ISADevice *dev; ISADevice *dev;
dev = isa_create(name); dev = isa_create(name);
if (qdev_init(&dev->qdev) != 0) { qdev_init_nofail(&dev->qdev);
return NULL;
}
return dev; return dev;
} }