From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjKCH-00065O-Pc for qemu-devel@nongnu.org; Wed, 20 Nov 2013 21:40:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VjKCB-00040E-DU for qemu-devel@nongnu.org; Wed, 20 Nov 2013 21:40:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33972) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjKCB-000408-5T for qemu-devel@nongnu.org; Wed, 20 Nov 2013 21:40:43 -0500 From: Igor Mammedov Date: Thu, 21 Nov 2013 03:38:30 +0100 Message-Id: <1385001528-12003-10-git-send-email-imammedo@redhat.com> In-Reply-To: <1385001528-12003-1-git-send-email-imammedo@redhat.com> References: <1385001528-12003-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 09/27] dimm: map DimmDevice into DimBus provided address space List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, stefanha@redhat.com, mst@redhat.com, chegu_vinod@hp.com, stefanb@linux.vnet.ibm.com, mjt@tls.msk.ru, mdroth@linux.vnet.ibm.com, armbru@redhat.com, vasilis.liaskovitis@profitbricks.com, quintela@redhat.com, kraxel@redhat.com, aliguori@amazon.com, hutao@cn.fujitsu.com, pbonzini@redhat.com, marcel.a@redhat.com, lcapitulino@redhat.com, afaerber@suse.de Signed-off-by: Igor Mammedov --- hw/mem/dimm.c | 13 +++++++++++++ include/hw/mem/dimm.h | 15 +++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/hw/mem/dimm.c b/hw/mem/dimm.c index fe81226..b3d6fda 100644 --- a/hw/mem/dimm.c +++ b/hw/mem/dimm.c @@ -28,12 +28,21 @@ static void dimm_bus_initfn(Object *obj) b->allow_hotplug = true; } +static void dimm_bus_register_memory(DimmBus *bus, DimmDevice *dimm, + Error **errp) +{ + memory_region_add_subregion(&bus->as, dimm->start - bus->base, dimm->mr); + vmstate_register_ram(dimm->mr, DEVICE(dimm)); +} + static void dimm_bus_class_init(ObjectClass *oc, void *data) { BusClass *bc = BUS_CLASS(oc); + DimmBusClass *dbc = DIMM_BUS_CLASS(oc); QemuOpts *opts = qemu_opts_find(qemu_find_opts("memory-opts"), NULL); bc->max_dev = qemu_opt_get_number(opts, "slots", 0); + dbc->register_memory = dimm_bus_register_memory; } static const TypeInfo dimm_bus_info = { @@ -42,6 +51,7 @@ static const TypeInfo dimm_bus_info = { .instance_init = dimm_bus_initfn, .instance_size = sizeof(DimmBus), .class_init = dimm_bus_class_init, + .class_size = sizeof(DimmBusClass), }; static Property dimm_properties[] = { @@ -121,6 +131,7 @@ static void dimm_realize(DeviceState *dev, Error **errp) DimmDevice *dimm = DIMM(dev); DimmBus *bus = DIMM_BUS(qdev_get_parent_bus(dev)); BusClass *bc = BUS_GET_CLASS(bus); + DimmBusClass *dbc = DIMM_BUS_GET_CLASS(bus); if (!dimm->mr) { error_setg(errp, "'memdev' property is not set"); @@ -137,6 +148,8 @@ static void dimm_realize(DeviceState *dev, Error **errp) return; } + g_assert(dbc->register_memory); + dbc->register_memory(bus, dimm, errp); } static void dimm_finalize(Object *obj) diff --git a/include/hw/mem/dimm.h b/include/hw/mem/dimm.h index 0d9c28e..ae9ad2e 100644 --- a/include/hw/mem/dimm.h +++ b/include/hw/mem/dimm.h @@ -63,9 +63,24 @@ typedef struct DimmDeviceClass { /** * DimmBus: * @parent_obj: opaque parent object container + * @base: address from which to start mapping @DimmDevice + * @as: hot-plugabble memory area where @DimmDevice-s are attached */ typedef struct DimmBus { BusState parent_obj; + hwaddr base; + MemoryRegion as; } DimmBus; +/** + * DimmBusClass: + * @parent_class: opaque parent class container + * @register_memory: map @DimmDevice into hot-plugable address space + */ +typedef struct DimmBusClass { + BusClass parent_class; + + void (*register_memory)(DimmBus *bus, DimmDevice *dimm, Error **errp); +} DimmBusClass; + #endif -- 1.7.1