From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmlpQ-0000Ju-QF for qemu-devel@nongnu.org; Tue, 20 May 2014 11:19:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WmlpK-00018i-Jz for qemu-devel@nongnu.org; Tue, 20 May 2014 11:19:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62606) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmlpK-00018W-DN for qemu-devel@nongnu.org; Tue, 20 May 2014 11:19:38 -0400 From: Igor Mammedov Date: Tue, 20 May 2014 17:15:20 +0200 Message-Id: <1400598934-31921-18-git-send-email-imammedo@redhat.com> In-Reply-To: <1400598934-31921-1-git-send-email-imammedo@redhat.com> References: <1400598934-31921-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH v2 17/31] dimm: add busy slot check and slot auto-allocation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, alex@alex.org.uk, mst@redhat.com, aik@ozlabs.ru, hutao@cn.fujitsu.com, mjt@tls.msk.ru, tangchen@cn.fujitsu.com, kraxel@redhat.com, pasteka@kabsi.at, s.priebe@profihost.ag, agarcia@igalia.com, armbru@redhat.com, aliguori@amazon.com, david@gibson.dropbear.id.au, lersek@redhat.com, ehabkost@redhat.com, marcel.a@redhat.com, stefanha@redhat.com, cornelia.huck@de.ibm.com, rth@twiddle.net, agraf@suse.de, andrey@xdel.ru, vasilis.liaskovitis@profitbricks.com, pbonzini@redhat.com, afaerber@suse.de, aurelien@aurel32.net - if slot property is not specified on -device/device_add command, treat default value as request for assigning DimmDevice to the first free slot. - if slot is provided with -device/device_add command, attempt to use it or fail command if it's already occupied. Signed-off-by: Igor Mammedov --- hw/i386/pc.c | 21 +++++++++++++++++++++ hw/mem/dimm.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ include/hw/mem/dimm.h | 2 ++ 3 files changed, 69 insertions(+), 0 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 42f41df..aee8dfb 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1541,8 +1541,10 @@ void qemu_register_pc_machine(QEMUMachine *m) static void pc_dimm_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { + int slot; Error *local_err = NULL; PCMachineState *pcms = PC_MACHINE(hotplug_dev); + MachineState *machine = MACHINE(hotplug_dev); DimmDevice *dimm = DIMM(dev); DimmDeviceClass *ddc = DIMM_GET_CLASS(dimm); MemoryRegion *mr = ddc->get_memory_region(dimm); @@ -1559,7 +1561,26 @@ static void pc_dimm_plug(HotplugHandler *hotplug_dev, if (local_err) { goto out; } + object_property_set_int(OBJECT(dev), addr, DIMM_ADDR_PROP, &local_err); + if (local_err) { + goto out; + } + + slot = object_property_get_int(OBJECT(dev), DIMM_SLOT_PROP, &local_err); + if (local_err) { + goto out; + } + + slot = dimm_get_free_slot(slot == DIMM_UNASSIGNED_SLOT ? NULL : &slot, + machine->ram_slots, &local_err); + if (local_err) { + goto out; + } + object_property_set_int(OBJECT(dev), slot, DIMM_SLOT_PROP, &local_err); + if (local_err) { + goto out; + } memory_region_add_subregion(&pcms->hotplug_memory, addr - pcms->hotplug_memory_base, mr); diff --git a/hw/mem/dimm.c b/hw/mem/dimm.c index 1c726c6..a189b59 100644 --- a/hw/mem/dimm.c +++ b/hw/mem/dimm.c @@ -23,6 +23,52 @@ #include "qapi/visitor.h" #include "qemu/range.h" +static int dimm_slot2bitmap(Object *obj, void *opaque) +{ + unsigned long *bitmap = opaque; + + if (object_dynamic_cast(obj, TYPE_DIMM)) { + DeviceState *dev = DEVICE(obj); + if (dev->realized) { /* count only realized DIMMs */ + DimmDevice *d = DIMM(obj); + set_bit(d->slot, bitmap); + } + } + + object_child_foreach(obj, dimm_slot2bitmap, opaque); + return 0; +} + +int dimm_get_free_slot(const int *hint, int max_slots, Error **errp) +{ + unsigned long *bitmap = bitmap_new(max_slots); + int slot = 0; + + object_child_foreach(qdev_get_machine(), dimm_slot2bitmap, bitmap); + + /* check if requested slot is not occupied */ + if (hint) { + if (*hint >= max_slots) { + error_setg(errp, "invalid slot# %d, should be less than %d", + *hint, max_slots); + } else if (!test_bit(*hint, bitmap)) { + slot = *hint; + } else { + error_setg(errp, "slot %d is busy", *hint); + } + goto out; + } + + /* search for free slot */ + slot = find_first_zero_bit(bitmap, max_slots); + if (slot == max_slots) { + error_setg(errp, "no free slots available"); + } +out: + g_free(bitmap); + return slot; +} + static gint dimm_addr_sort(gconstpointer a, gconstpointer b) { DimmDevice *x = DIMM(a); diff --git a/include/hw/mem/dimm.h b/include/hw/mem/dimm.h index 55bdfb2..1be8fb2 100644 --- a/include/hw/mem/dimm.h +++ b/include/hw/mem/dimm.h @@ -75,4 +75,6 @@ uint64_t dimm_get_free_addr(uint64_t address_space_start, uint64_t address_space_size, uint64_t *hint, uint64_t size, Error **errp); + +int dimm_get_free_slot(const int *hint, int max_slots, Error **errp); #endif -- 1.7.1