From patchwork Thu Oct 16 12:11:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 400276 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6D51C1400AF for ; Thu, 16 Oct 2014 23:12:06 +1100 (AEDT) Received: from localhost ([::1]:50105 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XejuW-0006BN-Hn for incoming@patchwork.ozlabs.org; Thu, 16 Oct 2014 08:12:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32972) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xeju3-0005jl-8B for qemu-devel@nongnu.org; Thu, 16 Oct 2014 08:11:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xejtw-0000ky-R8 for qemu-devel@nongnu.org; Thu, 16 Oct 2014 08:11:35 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:3164) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xejtw-0000kH-KV for qemu-devel@nongnu.org; Thu, 16 Oct 2014 08:11:28 -0400 X-IronPort-AV: E=Sophos;i="5.04,731,1406592000"; d="scan'208";a="183105467" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.3.181.6; Thu, 16 Oct 2014 08:11:24 -0400 Received: from etemp.uk.xensource.com ([10.80.228.66] helo=etemp.uk.xensource.com.) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1Xejts-0001Yu-IQ; Thu, 16 Oct 2014 13:11:24 +0100 From: Paul Durrant To: , Date: Thu, 16 Oct 2014 13:11:20 +0100 Message-ID: <1413461481-22684-2-git-send-email-paul.durrant@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1413461481-22684-1-git-send-email-paul.durrant@citrix.com> References: <1413461481-22684-1-git-send-email-paul.durrant@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.63 Cc: Peter Crosthwaite , Thomas Huth , "Michael S. Tsirkin" , Markus Armbruster , Christian Borntraeger , Paul Durrant , Igor Mammedov , Paolo Bonzini , "Andreas Faerber\"" Subject: [Qemu-devel] [PATCH v4 1/2] Add device listener interface 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 The Xen ioreq-server API, introduced in Xen 4.5, requires that PCI device models explicitly register with Xen for config space accesses. This patch adds a listener interface into qdev-core which can be used by the Xen interface code to monitor for arrival and departure of PCI devices. Signed-off-by: Paul Durrant Cc: Michael S. Tsirkin Cc: Andreas Faerber" Cc: Paolo Bonzini Cc: Peter Crosthwaite Cc: Igor Mammedov Cc: Markus Armbruster Cc: Thomas Huth Cc: Christian Borntraeger --- hw/core/qdev.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ include/hw/qdev-core.h | 10 +++++++++ include/qemu/typedefs.h | 1 + 3 files changed, 65 insertions(+) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index fcb1638..4a9c1f6 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -175,6 +175,56 @@ int qdev_init(DeviceState *dev) return 0; } +static QTAILQ_HEAD(qdev_listeners, DeviceListener) qdev_listeners + = QTAILQ_HEAD_INITIALIZER(qdev_listeners); + +enum ListenerDirection { Forward, Reverse }; + +#define QDEV_LISTENER_CALL(_callback, _direction, _args...) \ + do { \ + DeviceListener *_listener; \ + \ + switch (_direction) { \ + case Forward: \ + QTAILQ_FOREACH(_listener, &qdev_listeners, link) { \ + if (_listener->_callback) { \ + _listener->_callback(_listener, ##_args); \ + } \ + } \ + break; \ + case Reverse: \ + QTAILQ_FOREACH_REVERSE(_listener, &qdev_listeners, \ + qdev_listeners, link) { \ + if (_listener->_callback) { \ + _listener->_callback(_listener, ##_args); \ + } \ + } \ + break; \ + default: \ + abort(); \ + } \ + } while (0) + +static int qdev_listener_add(DeviceState *dev, void *opaque) +{ + QDEV_LISTENER_CALL(realize, Forward, dev); + + return 0; +} + +void qdev_listener_register(DeviceListener *listener) +{ + QTAILQ_INSERT_TAIL(&qdev_listeners, listener, link); + + qbus_walk_children(sysbus_get_default(), NULL, NULL, qdev_listener_add, + NULL, NULL); +} + +void qdev_listener_unregister(DeviceListener *listener) +{ + QTAILQ_REMOVE(&qdev_listeners, listener, link); +} + static void device_realize(DeviceState *dev, Error **errp) { DeviceClass *dc = DEVICE_GET_CLASS(dev); @@ -186,12 +236,16 @@ static void device_realize(DeviceState *dev, Error **errp) return; } } + + QDEV_LISTENER_CALL(realize, Forward, dev); } static void device_unrealize(DeviceState *dev, Error **errp) { DeviceClass *dc = DEVICE_GET_CLASS(dev); + QDEV_LISTENER_CALL(unrealize, Reverse, dev); + if (dc->exit) { int rc = dc->exit(dev); if (rc < 0) { diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 178fee2..f2dc267 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -167,6 +167,12 @@ struct DeviceState { int alias_required_for_version; }; +struct DeviceListener { + void (*realize)(DeviceListener *listener, DeviceState *dev); + void (*unrealize)(DeviceListener *listener, DeviceState *dev); + QTAILQ_ENTRY(DeviceListener) link; +}; + #define TYPE_BUS "bus" #define BUS(obj) OBJECT_CHECK(BusState, (obj), TYPE_BUS) #define BUS_CLASS(klass) OBJECT_CLASS_CHECK(BusClass, (klass), TYPE_BUS) @@ -368,4 +374,8 @@ static inline void qbus_set_hotplug_handler(BusState *bus, DeviceState *handler, QDEV_HOTPLUG_HANDLER_PROPERTY, errp); bus->allow_hotplug = 1; } + +void qdev_listener_register(DeviceListener *listener); +void qdev_listener_unregister(DeviceListener *listener); + #endif diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 04df51b..e32bca2 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -20,6 +20,7 @@ typedef struct Property Property; typedef struct PropertyInfo PropertyInfo; typedef struct CompatProperty CompatProperty; typedef struct DeviceState DeviceState; +typedef struct DeviceListener DeviceListener; typedef struct BusState BusState; typedef struct BusClass BusClass;