From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47846) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDVp1-0002OJ-Nz for qemu-devel@nongnu.org; Tue, 20 Jan 2015 05:14:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YDVoy-0003P6-IJ for qemu-devel@nongnu.org; Tue, 20 Jan 2015 05:14:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35621) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDVoy-0003Ou-AA for qemu-devel@nongnu.org; Tue, 20 Jan 2015 05:14:04 -0500 Date: Tue, 20 Jan 2015 11:14:00 +0100 From: Igor Mammedov Message-ID: <20150120111400.1a578bd9@nial.brq.redhat.com> In-Reply-To: <1421035354-14721-2-git-send-email-bharata@linux.vnet.ibm.com> References: <1421035354-14721-1-git-send-email-bharata@linux.vnet.ibm.com> <1421035354-14721-2-git-send-email-bharata@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v0 1/2] pc: Fix DIMMs capacity calculation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Bharata B Rao Cc: qemu-devel@nongnu.org On Mon, 12 Jan 2015 09:32:33 +0530 Bharata B Rao wrote: > 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; > } >