From patchwork Wed Mar 27 16:36:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 231762 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 229202C008E for ; Thu, 28 Mar 2013 04:15:32 +1100 (EST) Received: from localhost ([::1]:57224 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKtOH-0002Tl-8l for incoming@patchwork.ozlabs.org; Wed, 27 Mar 2013 12:39:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45594) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKtLB-0006EP-Go for qemu-devel@nongnu.org; Wed, 27 Mar 2013 12:36:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKtL5-0002pB-7B for qemu-devel@nongnu.org; Wed, 27 Mar 2013 12:36:45 -0400 Received: from e23smtp08.au.ibm.com ([202.81.31.141]:33284) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKtL4-0002oh-MU for qemu-devel@nongnu.org; Wed, 27 Mar 2013 12:36:39 -0400 Received: from /spool/local by e23smtp08.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 28 Mar 2013 02:34:30 +1000 Received: from d23dlp02.au.ibm.com (202.81.31.213) by e23smtp08.au.ibm.com (202.81.31.205) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 28 Mar 2013 02:34:28 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 2B3B92BB0023 for ; Thu, 28 Mar 2013 03:36:31 +1100 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r2RGNJG04325686 for ; Thu, 28 Mar 2013 03:23:20 +1100 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r2RGaTUV018991 for ; Thu, 28 Mar 2013 03:36:29 +1100 Received: from titi.austin.rr.com (sig-9-65-38-119.mts.ibm.com [9.65.38.119]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r2RGaEfd018824; Thu, 28 Mar 2013 03:36:28 +1100 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2013 11:36:14 -0500 Message-Id: <1364402174-16580-1-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.8.0 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13032716-5140-0000-0000-000002F37BDC X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.141 Cc: Kevin Wolf , Anthony Liguori , Michael Tsirkin Subject: [Qemu-devel] [PATCH] qdev: only send deleted event if device was realized X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Reported-by: Kevin Wolf Signed-off-by: Anthony Liguori --- hw/qdev.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 9b0f652..e2bb37d 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -767,7 +767,7 @@ static void device_unparent(Object *obj) DeviceClass *dc = DEVICE_GET_CLASS(dev); BusState *bus; QObject *event_data; - gchar *path = object_get_canonical_path(obj); + bool have_realized = dev->realized; while (dev->num_child_bus) { bus = QLIST_FIRST(&dev->child_bus); @@ -787,15 +787,20 @@ static void device_unparent(Object *obj) dev->parent_bus = NULL; } - if (dev->id) { - event_data = qobject_from_jsonf("{ 'device': %s, 'path': %s }", - dev->id, path); - } else { - event_data = qobject_from_jsonf("{ 'path': %s }", path); + /* Only send event if the device had been completely realized */ + if (have_realized) { + gchar *path = object_get_canonical_path(OBJECT(dev)); + + if (dev->id) { + event_data = qobject_from_jsonf("{ 'device': %s, 'path': %s }", + dev->id, path); + } else { + event_data = qobject_from_jsonf("{ 'path': %s }", path); + } + monitor_protocol_event(QEVENT_DEVICE_DELETED, event_data); + qobject_decref(event_data); + g_free(path); } - monitor_protocol_event(QEVENT_DEVICE_DELETED, event_data); - qobject_decref(event_data); - g_free(path); } static void device_class_init(ObjectClass *class, void *data)