diff options
| -rw-r--r-- | hw/qdev-monitor.c | 5 | ||||
| -rw-r--r-- | hw/qdev.c | 5 | ||||
| -rw-r--r-- | vl.c | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c index 4e2a92b9dd..4f9a6eb39a 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -591,6 +591,7 @@ int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data) { Error *local_err = NULL; QemuOpts *opts; + DeviceState *dev; opts = qemu_opts_from_qdict(qemu_find_opts("device"), qdict, &local_err); if (error_is_set(&local_err)) { @@ -602,10 +603,12 @@ int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data) qemu_opts_del(opts); return 0; } - if (!qdev_device_add(opts)) { + dev = qdev_device_add(opts); + if (!dev) { qemu_opts_del(opts); return -1; } + object_unref(OBJECT(dev)); return 0; } diff --git a/hw/qdev.c b/hw/qdev.c index 09f59698c9..8258757a1d 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -143,7 +143,7 @@ DeviceState *qdev_try_create(BusState *bus, const char *type) } qdev_set_parent_bus(dev, bus); - + object_unref(OBJECT(dev)); return dev; } @@ -268,7 +268,6 @@ void qdev_init_nofail(DeviceState *dev) void qdev_free(DeviceState *dev) { object_unparent(OBJECT(dev)); - object_unref(OBJECT(dev)); } void qdev_machine_creation_done(void) @@ -428,6 +427,7 @@ static void qbus_realize(BusState *bus, DeviceState *parent, const char *name) QLIST_INSERT_HEAD(&bus->parent->child_bus, bus, sibling); bus->parent->num_child_bus++; object_property_add_child(OBJECT(bus->parent), bus->name, OBJECT(bus), NULL); + object_unref(OBJECT(bus)); } else if (bus != sysbus_get_default()) { /* TODO: once all bus devices are qdevified, only reset handler for main_system_bus should be registered here. */ @@ -474,7 +474,6 @@ BusState *qbus_create(const char *typename, DeviceState *parent, const char *nam void qbus_free(BusState *bus) { object_unparent(OBJECT(bus)); - object_unref(OBJECT(bus)); } static char *bus_get_fw_dev_path(BusState *bus, DeviceState *dev) diff --git a/vl.c b/vl.c index f094f04a2c..315598994f 100644 --- a/vl.c +++ b/vl.c @@ -2236,6 +2236,7 @@ static int device_init_func(QemuOpts *opts, void *opaque) dev = qdev_device_add(opts); if (!dev) return -1; + object_unref(OBJECT(dev)); return 0; } |