qdev: inline object_delete into qbus_free/qdev_free

We want object_delete to disappear, and we will do this one class at a
time.  Inline it for the qdev case, which we will tackle first.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Paolo Bonzini 2013-01-25 14:12:36 +01:00 committed by Anthony Liguori
parent 62d7ba669d
commit dc7389b79a

View File

@ -267,7 +267,8 @@ void qdev_init_nofail(DeviceState *dev)
/* Unlink device from bus and free the structure. */
void qdev_free(DeviceState *dev)
{
object_delete(OBJECT(dev));
object_unparent(OBJECT(dev));
object_unref(OBJECT(dev));
}
void qdev_machine_creation_done(void)
@ -472,7 +473,8 @@ BusState *qbus_create(const char *typename, DeviceState *parent, const char *nam
void qbus_free(BusState *bus)
{
object_delete(OBJECT(bus));
object_unparent(OBJECT(bus));
object_unref(OBJECT(bus));
}
static char *bus_get_fw_dev_path(BusState *bus, DeviceState *dev)