From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55969) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkFEF-0006e4-8H for qemu-devel@nongnu.org; Fri, 31 Oct 2014 12:39:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XkFE7-0002jD-Sg for qemu-devel@nongnu.org; Fri, 31 Oct 2014 12:39:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38235) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkFE7-0002iq-K5 for qemu-devel@nongnu.org; Fri, 31 Oct 2014 12:39:03 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9VGd2m7029463 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 31 Oct 2014 12:39:03 -0400 From: Igor Mammedov Date: Fri, 31 Oct 2014 16:38:41 +0000 Message-Id: <1414773522-7756-11-git-send-email-imammedo@redhat.com> In-Reply-To: <1414773522-7756-1-git-send-email-imammedo@redhat.com> References: <1414773522-7756-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 10/11] pc: explicitly check maxmem limit when adding DIMM List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, mst@redhat.com Currently maxmem limit is not checked and depends on hotplug region container not being able to fit more RAM than maxmem. Do check explicitly so that it would be possible to change hotplug container size later to deal with fragmentation. Signed-off-by: Igor Mammedov --- hw/i386/pc.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index ed50344..0d9681e 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1586,6 +1586,25 @@ void qemu_register_pc_machine(QEMUMachine *m) g_free(name); } +static int pc_existing_dimms_capacity(Object *obj, void *opaque) +{ + Error *local_err = NULL; + uint64_t *size = opaque; + + if (object_dynamic_cast(obj, TYPE_PC_DIMM)) { + (*size) += object_property_get_int(obj, PC_DIMM_SIZE_PROP, &local_err); + + if (local_err) { + qerror_report_err(local_err); + error_free(local_err); + return 1; + } + } + + object_child_foreach(obj, pc_dimm_count, opaque); + return 0; +} + static void pc_dimm_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { @@ -1597,6 +1616,7 @@ static void pc_dimm_plug(HotplugHandler *hotplug_dev, PCDIMMDevice *dimm = PC_DIMM(dev); PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm); MemoryRegion *mr = ddc->get_memory_region(dimm); + uint64_t existing_dimms_capacity = 0; uint64_t align = TARGET_PAGE_SIZE; uint64_t addr; @@ -1617,6 +1637,19 @@ static void pc_dimm_plug(HotplugHandler *hotplug_dev, goto out; } + if (pc_existing_dimms_capacity(OBJECT(machine), &existing_dimms_capacity)) { + error_setg(&local_err, "failed to get total size of existing DIMMs"); + goto out; + } + + if (existing_dimms_capacity + memory_region_size(mr) > + machine->maxram_size - machine->ram_size) { + error_setg(&local_err, "not enough space, currently 0x%" PRIx64 + " in use of total 0x%" PRIx64, + existing_dimms_capacity, machine->maxram_size); + goto out; + } + object_property_set_int(OBJECT(dev), addr, PC_DIMM_ADDR_PROP, &local_err); if (local_err) { goto out; -- 1.8.3.1