From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VoyqN-0004Zh-6G for qemu-devel@nongnu.org; Fri, 06 Dec 2013 12:05:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VoyqH-0004Td-7D for qemu-devel@nongnu.org; Fri, 06 Dec 2013 12:05:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:29574) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VoyqG-0004TJ-OA for qemu-devel@nongnu.org; Fri, 06 Dec 2013 12:05:29 -0500 From: Igor Mammedov Date: Fri, 6 Dec 2013 18:03:10 +0100 Message-Id: <1386349395-5710-3-git-send-email-imammedo@redhat.com> In-Reply-To: <1386349395-5710-1-git-send-email-imammedo@redhat.com> References: <1386349395-5710-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 2/7] qdev: add to BusState "hotplug-device" link List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, ehabkost@redhat.com, mst@redhat.com, marcel.a@redhat.com, blauwirbel@gmail.com, alex.williamson@redhat.com, anthony@codemonkey.ws, pbonzini@redhat.com, afaerber@suse.de It will allow to reuse field in different BUSes, reducing code duplication. Field is intended fot replacing 'hotplug_qdev' field in PCIBus and also will allow not to add equivalent field to DimmBus with possiblitity to refactor other BUSes to use it instead of custom field. Signed-off-by: Igor Mammedov --- hw/core/qdev.c | 4 ++++ include/hw/qdev-core.h | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index e374a93..43cf160 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; @@ -868,6 +869,9 @@ static void qbus_initfn(Object *obj) BusState *bus = BUS(obj); QTAILQ_INIT(&bus->children); + object_property_add_link(obj, QDEV_HOTPLUG_DEVICE_PROPERTY, + TYPE_HOTPLUG_DEVICE, + (Object **)&bus->hotplug_device, 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 f2043a6..9dc0fd1 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -169,14 +169,18 @@ typedef struct BusChild { QTAILQ_ENTRY(BusChild) sibling; } BusChild; +#define QDEV_HOTPLUG_DEVICE_PROPERTY "hotplug-device" + /** * BusState: + * @hotplug_device: link to a hotplug device associated with bus. */ struct BusState { Object obj; DeviceState *parent; const char *name; int allow_hotplug; + DeviceState *hotplug_device; int max_index; QTAILQ_HEAD(ChildrenHead, BusChild) children; QLIST_ENTRY(BusState) sibling; -- 1.7.1