From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45046) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W37MJ-0007kL-Nk for qemu-devel@nongnu.org; Tue, 14 Jan 2014 12:01:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W37MD-0006Rc-P7 for qemu-devel@nongnu.org; Tue, 14 Jan 2014 12:00:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:3727) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W37MC-0006RB-BL for qemu-devel@nongnu.org; Tue, 14 Jan 2014 12:00:52 -0500 From: Igor Mammedov Date: Tue, 14 Jan 2014 17:55:47 +0100 Message-Id: <1389718554-2387-3-git-send-email-imammedo@redhat.com> In-Reply-To: <1389718554-2387-1-git-send-email-imammedo@redhat.com> References: <1389718554-2387-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 2/9] qdev: add to BusState "hotplug-handler" link List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.crosthwaite@xilinx.com, marcel.a@redhat.com, mst@redhat.com, aliguori@amazon.com, pbonzini@redhat.com, afaerber@suse.de It will allow to reuse field with different BUSes, reducing code duplication. Field is intended fot replacing 'hotplug_qdev' field in PCIBus and also will allow to avoid adding equivalent field to DimmBus with possiblitity to refactor other BUSes to use it instead of custom field. In addition once all users of allow_hotplug field are converted to new API, link could replace allow_hotplug in qdev hotplug code. Signed-off-by: Igor Mammedov --- hw/core/qdev.c | 4 ++++ include/hw/qdev-core.h | 5 +++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 82a9123..c9f0c33 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -32,6 +32,7 @@ #include "qapi/visitor.h" #include "qapi/qmp/qjson.h" #include "monitor/monitor.h" +#include "hw/hotplug.h" int qdev_hotplug = 0; static bool qdev_hot_added = false; @@ -870,6 +871,9 @@ static void qbus_initfn(Object *obj) BusState *bus = BUS(obj); QTAILQ_INIT(&bus->children); + object_property_add_link(obj, QDEV_HOTPLUG_HANDLER_PROPERTY, + TYPE_HOTPLUG_HANDLER, + (Object **)&bus->hotplug_handler, NULL); } static char *default_bus_get_fw_dev_path(DeviceState *dev) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 2c4f140..58a5c69 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -8,6 +8,7 @@ #include "qom/object.h" #include "hw/irq.h" #include "qapi/error.h" +#include "hw/hotplug.h" enum { DEV_NVECTORS_UNSPECIFIED = -1, @@ -180,14 +181,18 @@ typedef struct BusChild { QTAILQ_ENTRY(BusChild) sibling; } BusChild; +#define QDEV_HOTPLUG_HANDLER_PROPERTY "hotplug-handler" + /** * BusState: + * @hotplug_device: link to a hotplug device associated with bus. */ struct BusState { Object obj; DeviceState *parent; const char *name; int allow_hotplug; + HotplugHandler *hotplug_handler; int max_index; QTAILQ_HEAD(ChildrenHead, BusChild) children; QLIST_ENTRY(BusState) sibling; -- 1.7.1