From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41245) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4qY4-0004kW-3F for qemu-devel@nongnu.org; Fri, 24 Aug 2012 05:51:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T4qY0-0003LT-92 for qemu-devel@nongnu.org; Fri, 24 Aug 2012 05:51:28 -0400 Received: from mail-ob0-f173.google.com ([209.85.214.173]:48876) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4qY0-00037L-4n for qemu-devel@nongnu.org; Fri, 24 Aug 2012 05:51:24 -0400 Received: by mail-ob0-f173.google.com with SMTP id ta14so3534267obb.4 for ; Fri, 24 Aug 2012 02:51:23 -0700 (PDT) From: Liu Ping Fan Date: Fri, 24 Aug 2012 17:49:22 +0800 Message-Id: <1345801763-24227-10-git-send-email-qemulist@gmail.com> In-Reply-To: <1345801763-24227-1-git-send-email-qemulist@gmail.com> References: <1345801763-24227-1-git-send-email-qemulist@gmail.com> Subject: [Qemu-devel] [PATCH 09/10] mon: release dev's ref hold by qdev_get_peripheral List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Liu Ping Fan , Avi Kivity , Anthony Liguori From: Liu Ping Fan When add it at qdev_device_add(), so need to release it at qmp_device_del(). Signed-off-by: Liu Ping Fan --- hw/qdev-monitor.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c index fdd9539..29ace17 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -599,6 +599,7 @@ int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data) void qmp_device_del(const char *id, Error **errp) { DeviceState *dev; + int ret; dev = qdev_find_recursive(sysbus_get_default(), id); if (NULL == dev) { @@ -606,7 +607,12 @@ void qmp_device_del(const char *id, Error **errp) return; } - qdev_unplug_req(dev, errp); + ret = qdev_unplug_req(dev, errp); + if (ret == 0) { + /* to here, dev->id is not zero, so need to release */ + object_property_del_child(qdev_get_peripheral(), + OBJECT(dev), NULL); + } } void qdev_machine_init(void) -- 1.7.4.4