From patchwork Thu Jan 22 14:34:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bharata B Rao X-Patchwork-Id: 431825 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 963B11402A7 for ; Fri, 23 Jan 2015 01:35:55 +1100 (AEDT) Received: from localhost ([::1]:53537 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEIrR-0005JW-Kh for incoming@patchwork.ozlabs.org; Thu, 22 Jan 2015 09:35:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEIqo-0004kK-B9 for qemu-devel@nongnu.org; Thu, 22 Jan 2015 09:35:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YEIqj-0004cb-Ud for qemu-devel@nongnu.org; Thu, 22 Jan 2015 09:35:14 -0500 Received: from e23smtp01.au.ibm.com ([202.81.31.143]:53120) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEIqj-0004Ul-Av for qemu-devel@nongnu.org; Thu, 22 Jan 2015 09:35:09 -0500 Received: from /spool/local by e23smtp01.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 23 Jan 2015 00:35:03 +1000 Received: from d23dlp02.au.ibm.com (202.81.31.213) by e23smtp01.au.ibm.com (202.81.31.207) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 23 Jan 2015 00:35:01 +1000 Received: from d23relay09.au.ibm.com (d23relay09.au.ibm.com [9.185.63.181]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 324822BB0051 for ; Fri, 23 Jan 2015 01:35:01 +1100 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay09.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t0MEZ0Vr34144428 for ; Fri, 23 Jan 2015 01:35:01 +1100 Received: from d23av01.au.ibm.com (localhost [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t0MEYxGR031814 for ; Fri, 23 Jan 2015 01:34:59 +1100 Received: from in.ibm.com ([9.77.124.20]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t0MEYk1U031636 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Fri, 23 Jan 2015 01:34:58 +1100 Date: Thu, 22 Jan 2015 20:04:46 +0530 From: Bharata B Rao To: Igor Mammedov Message-ID: <20150122143446.GD17897@in.ibm.com> References: <1421035354-14721-1-git-send-email-bharata@linux.vnet.ibm.com> <1421035354-14721-3-git-send-email-bharata@linux.vnet.ibm.com> <20150120111837.4b0b2335@nial.brq.redhat.com> <20150121085817.GB17897@in.ibm.com> <20150121113852.37998dd6@nial.brq.redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20150121113852.37998dd6@nial.brq.redhat.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15012214-1618-0000-0000-0000017F3231 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 202.81.31.143 Cc: qemu-devel@nongnu.org Subject: Re: [Qemu-devel] [PATCH v0 2/2] pc-dimm: Make pc_existing_dimms_capacity global X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: bharata@linux.vnet.ibm.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On Wed, Jan 21, 2015 at 11:38:52AM +0100, Igor Mammedov wrote: > On Wed, 21 Jan 2015 14:28:18 +0530 > > > > +int pc_existing_dimms_capacity(Object *obj, void *opaque) > > > > +{ > > > since you are making it API, could you pass Error **errp argument > > > and deal with error in caller? > > > Along with it you can make function return void. > > > > I don't think that can be done because pc_existing_dimms_capacity() calls > > itself recursively via object_child_foreach() and hence its signature > > if fixed. > how about: > > typedef struct somename { > uint64_t size; > Error **errp; > } somename; > > > somename *foo = opaque; > > ... > > and if you'd be able to hide this structure from API caller, > then function could return it's existing capacity via its return value. > For example: > > static int pc_existing_dimms_capacity_internal(Object *obj, void *opaque) > { > ... > } > > /* API */ > uint64_t pc_existing_dimms_capacity(Error **errp) > { > ... > object_child_foreach(obj, pc_existing_dimms_capacity_internal, opaque); > ... > } If you find the below patch to be fine, I will repost the series with this patch included. pc-dimm: Add Error argument to pc_existing_dimms_capacity From: Bharata B Rao Now that pc_existing_dimms_capacity() is an API, include Error pointer as an argument and modify the caller appropriately. Signed-off-by: Bharata B Rao --- hw/i386/pc.c | 4 ++-- hw/mem/pc-dimm.c | 31 ++++++++++++++++++++++--------- include/hw/mem/pc-dimm.h | 2 +- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 2ec45a4..c7af6aa 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1584,8 +1584,8 @@ 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"); + existing_dimms_capacity = pc_existing_dimms_capacity(&local_err); + if (local_err) { goto out; } diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index f02ce6e..3e908b3 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -24,30 +24,43 @@ #include "qemu/range.h" #include "qapi/qmp/qerror.h" -int pc_existing_dimms_capacity(Object *obj, void *opaque) +typedef struct pc_dimms_capacity { + uint64_t size; + Error **errp; +} pc_dimms_capacity; + +static int pc_existing_dimms_capacity_internal(Object *obj, void *opaque) { - Error *local_err = NULL; - uint64_t *size = opaque; + pc_dimms_capacity *cap = opaque; + uint64_t *size = &cap->size; if (object_dynamic_cast(obj, TYPE_PC_DIMM)) { DeviceState *dev = DEVICE(obj); if (dev->realized) { (*size) += object_property_get_int(obj, PC_DIMM_SIZE_PROP, - &local_err); + cap->errp); } - if (local_err) { - qerror_report_err(local_err); - error_free(local_err); + if (cap->errp && *cap->errp) { return 1; } } - - object_child_foreach(obj, pc_existing_dimms_capacity, opaque); + object_child_foreach(obj, pc_existing_dimms_capacity_internal, opaque); return 0; } +uint64_t pc_existing_dimms_capacity(Error **errp) +{ + pc_dimms_capacity cap; + + cap.size = 0; + cap.errp = errp; + + pc_existing_dimms_capacity_internal(qdev_get_machine(), &cap); + return cap.size; +} + int qmp_pc_dimm_device_list(Object *obj, void *opaque) { MemoryDeviceInfoList ***prev = opaque; diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h index bbfa53f..f7b80b4 100644 --- a/include/hw/mem/pc-dimm.h +++ b/include/hw/mem/pc-dimm.h @@ -78,5 +78,5 @@ uint64_t pc_dimm_get_free_addr(uint64_t address_space_start, int pc_dimm_get_free_slot(const int *hint, int max_slots, Error **errp); int qmp_pc_dimm_device_list(Object *obj, void *opaque); -int pc_existing_dimms_capacity(Object *obj, void *opaque); +uint64_t pc_existing_dimms_capacity(Error **errp); #endif