[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/7] Make qdev_init() destroy the device on failure
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 2/7] Make qdev_init() destroy the device on failure |
Date: |
Wed, 7 Oct 2009 01:15:56 +0200 |
Before, every caller had to do this. Only two actually did.
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/isa-bus.c | 1 -
hw/qdev.c | 9 ++++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index 4ecc0f8..fb90be4 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -127,7 +127,6 @@ ISADevice *isa_create_simple(const char *name)
dev = isa_create(name);
if (qdev_init(&dev->qdev) != 0) {
- qdev_free(&dev->qdev);
return NULL;
}
return dev;
diff --git a/hw/qdev.c b/hw/qdev.c
index 253e255..8a62001 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -216,7 +216,6 @@ DeviceState *qdev_device_add(QemuOpts *opts)
}
if (qdev_init(qdev) != 0) {
qemu_error("Error initializing device %s\n", driver);
- qdev_free(qdev);
return NULL;
}
qdev->opts = opts;
@@ -232,15 +231,19 @@ static void qdev_reset(void *opaque)
/* Initialize a device. Device properties should be set before calling
this function. IRQs and MMIO regions should be connected/mapped after
- calling this function. */
+ calling this function.
+ On failure, destroy the device and return negative value.
+ Return 0 on success. */
int qdev_init(DeviceState *dev)
{
int rc;
assert(dev->state == DEV_STATE_CREATED);
rc = dev->info->init(dev, dev->info);
- if (rc < 0)
+ if (rc < 0) {
+ qdev_free(dev);
return rc;
+ }
qemu_register_reset(qdev_reset, dev);
if (dev->info->vmsd)
vmstate_register(-1, dev->info->vmsd, 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 <=
- [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, 2009/10/06