From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36134) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEV4M-0006qu-Q3 for qemu-devel@nongnu.org; Thu, 22 Jan 2015 22:38:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YEV4H-0001ct-QE for qemu-devel@nongnu.org; Thu, 22 Jan 2015 22:38:02 -0500 Received: from e23smtp08.au.ibm.com ([202.81.31.141]:40938) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEV4H-0001ZF-4d for qemu-devel@nongnu.org; Thu, 22 Jan 2015 22:37:57 -0500 Received: from /spool/local by e23smtp08.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 23 Jan 2015 13:37:54 +1000 Received: from d23relay06.au.ibm.com (d23relay06.au.ibm.com [9.185.63.219]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 2579F2CE8050 for ; Fri, 23 Jan 2015 14:37:52 +1100 (EST) Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay06.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t0N3bpHR33423524 for ; Fri, 23 Jan 2015 14:37:52 +1100 Received: from d23av04.au.ibm.com (localhost [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t0N3bosK001981 for ; Fri, 23 Jan 2015 14:37:50 +1100 From: Bharata B Rao Date: Fri, 23 Jan 2015 09:07:01 +0530 Message-Id: <1421984223-18734-2-git-send-email-bharata@linux.vnet.ibm.com> In-Reply-To: <1421984223-18734-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1421984223-18734-1-git-send-email-bharata@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v1 1/3] pc: Fix DIMMs capacity calculation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, Bharata B Rao pc_existing_dimms_capacity() is returning DIMMs count rather than capacity. Fix this to return the capacity. Also consider only realized devices for capacity calculation. Signed-off-by: Bharata B Rao Reviewed-by: Igor Mammedov --- hw/i386/pc.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index e07f1fa..125cf0a 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1552,25 +1552,18 @@ void qemu_register_pc_machine(QEMUMachine *m) g_free(name); } -static int pc_dimm_count(Object *obj, void *opaque) -{ - int *count = opaque; - - if (object_dynamic_cast(obj, TYPE_PC_DIMM)) { - (*count)++; - } - - object_child_foreach(obj, pc_dimm_count, opaque); - return 0; -} - 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); + DeviceState *dev = DEVICE(obj); + + if (dev->realized) { + (*size) += object_property_get_int(obj, PC_DIMM_SIZE_PROP, + &local_err); + } if (local_err) { qerror_report_err(local_err); @@ -1579,7 +1572,7 @@ static int pc_existing_dimms_capacity(Object *obj, void *opaque) } } - object_child_foreach(obj, pc_dimm_count, opaque); + object_child_foreach(obj, pc_existing_dimms_capacity, opaque); return 0; } @@ -1623,8 +1616,9 @@ static void pc_dimm_plug(HotplugHandler *hotplug_dev, 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" RAM_ADDR_FMT, - existing_dimms_capacity, machine->maxram_size); + " in use of total hot pluggable 0x" RAM_ADDR_FMT, + existing_dimms_capacity, + machine->maxram_size - machine->ram_size); goto out; } -- 2.1.0