From patchwork Thu May 1 04:26:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenchao Xia X-Patchwork-Id: 344413 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 68D5C140115 for ; Thu, 1 May 2014 14:34:45 +1000 (EST) Received: from localhost ([::1]:60370 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wfihn-0000x2-AM for incoming@patchwork.ozlabs.org; Thu, 01 May 2014 00:34:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49462) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wfibq-0001Sa-Py for qemu-devel@nongnu.org; Thu, 01 May 2014 00:28:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wfibh-0002NM-PR for qemu-devel@nongnu.org; Thu, 01 May 2014 00:28:34 -0400 Received: from mail-ig0-x234.google.com ([2607:f8b0:4001:c05::234]:63196) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wfibh-0002NH-Kj for qemu-devel@nongnu.org; Thu, 01 May 2014 00:28:25 -0400 Received: by mail-ig0-f180.google.com with SMTP id c1so90272igq.7 for ; Wed, 30 Apr 2014 21:28:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OiKuZTe91uAqnMiQ4mZM/QfunezAcNO23pdpVyDr64c=; b=hqPb573x3dBG78C+OZP5IKlEr5m+mdfy3/RhOOfztEQXJp/BDkKJtzRUBCzHej5DxC nf48GukAeT20syADwN+7m7KCN8ZGFTWaEl/Epn5FTCXk/ICfl5lFSHlMzhcurJxzbNsW xCoTkAFcOHkltdbzc6jskKFeKMBTF6GyOwwih5TJxLEXzWFnhrs++ScmW2fmNRTXHJ1h 4u4nGZcSevk4Yii3kZKmg1cjzhi435rGp4N7rMyLpQTuNvp5foS2K8cE0gLgCJ5kjGXM NIw/SQGqfY/8ipEXHLdKl9I1ZCE3ppAJiNvyOS1CCT4JVRKmJosnb0pjvoZzhf48T6ik XXaw== X-Received: by 10.50.153.72 with SMTP id ve8mr561938igb.16.1398918505166; Wed, 30 Apr 2014 21:28:25 -0700 (PDT) Received: from localhost.localdomain.localdomain ([118.250.93.201]) by mx.google.com with ESMTPSA id ii7sm4626797igb.17.2014.04.30.21.28.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Apr 2014 21:28:24 -0700 (PDT) From: Wenchao Xia To: qemu-devel@nongnu.org Date: Wed, 30 Apr 2014 21:26:51 -0700 Message-Id: <1398918422-3019-18-git-send-email-wenchaoqemu@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1398918422-3019-1-git-send-email-wenchaoqemu@gmail.com> References: <1398918422-3019-1-git-send-email-wenchaoqemu@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c05::234 Cc: mdroth@linux.vnet.ibm.com, armbru@redhat.com, Wenchao Xia , lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH V5 17/28] qapi event: convert DEVICE_DELETED 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 Signed-off-by: Wenchao Xia --- hw/core/qdev.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 60f9df1..ac85eaf 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -32,8 +32,8 @@ #include "qapi/qmp/qerror.h" #include "qapi/visitor.h" #include "qapi/qmp/qjson.h" -#include "monitor/monitor.h" #include "hw/hotplug.h" +#include "qapi-event.h" int qdev_hotplug = 0; static bool qdev_hot_added = false; @@ -874,7 +874,6 @@ static void device_unparent(Object *obj) { DeviceState *dev = DEVICE(obj); BusState *bus; - QObject *event_data; bool have_realized = dev->realized; if (dev->realized) { @@ -894,14 +893,7 @@ static void device_unparent(Object *obj) 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); + qapi_event_send_device_deleted(!!dev->id, dev->id, path, NULL); g_free(path); } }