From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33304) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEdB9-0002v0-Bx for qemu-devel@nongnu.org; Fri, 23 Jan 2015 07:17:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YEdB4-0001tB-95 for qemu-devel@nongnu.org; Fri, 23 Jan 2015 07:17:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49710) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEdB3-0001t1-QX for qemu-devel@nongnu.org; Fri, 23 Jan 2015 07:17:30 -0500 Date: Fri, 23 Jan 2015 13:17:20 +0100 From: Igor Mammedov Message-ID: <20150123131720.09104d03@nial.brq.redhat.com> In-Reply-To: <1421984223-18734-3-git-send-email-bharata@linux.vnet.ibm.com> References: <1421984223-18734-1-git-send-email-bharata@linux.vnet.ibm.com> <1421984223-18734-3-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 v1 2/3] pc-dimm: Make pc_existing_dimms_capacity global List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Bharata B Rao Cc: qemu-devel@nongnu.org On Fri, 23 Jan 2015 09:07:02 +0530 Bharata B Rao wrote: > Move pc_existing_dimms_capacity() to pc-dimm.c since it would be needed > by PowerPC memory hotplug code too. > > Signed-off-by: Bharata B Rao Reviewed-by: Igor Mammedov > --- > hw/i386/pc.c | 24 ------------------------ > hw/mem/pc-dimm.c | 25 +++++++++++++++++++++++++ > include/hw/mem/pc-dimm.h | 1 + > 3 files changed, 26 insertions(+), 24 deletions(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 125cf0a..2ec45a4 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -1552,30 +1552,6 @@ 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)) { > - 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); > - error_free(local_err); > - return 1; > - } > - } > - > - object_child_foreach(obj, pc_existing_dimms_capacity, opaque); > - return 0; > -} > - > static void pc_dimm_plug(HotplugHandler *hotplug_dev, > DeviceState *dev, Error **errp) > { > diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c > index d431834..f02ce6e 100644 > --- a/hw/mem/pc-dimm.c > +++ b/hw/mem/pc-dimm.c > @@ -22,6 +22,31 @@ > #include "qemu/config-file.h" > #include "qapi/visitor.h" > #include "qemu/range.h" > +#include "qapi/qmp/qerror.h" > + > +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)) { > + 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); > + error_free(local_err); > + return 1; > + } > + } > + > + object_child_foreach(obj, pc_existing_dimms_capacity, opaque); > + return 0; > +} > > int qmp_pc_dimm_device_list(Object *obj, void *opaque) > { > diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h > index e1dcbbc..bbfa53f 100644 > --- a/include/hw/mem/pc-dimm.h > +++ b/include/hw/mem/pc-dimm.h > @@ -78,4 +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); > #endif