From patchwork Tue Jan 27 04:05:01 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: 433180 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 859791401DD for ; Tue, 27 Jan 2015 15:07:04 +1100 (AEDT) Received: from localhost ([::1]:45218 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFxQc-0002k0-Mq for incoming@patchwork.ozlabs.org; Mon, 26 Jan 2015 23:07:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38593) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFxOz-0000Uj-MJ for qemu-devel@nongnu.org; Mon, 26 Jan 2015 23:05:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YFxOq-0004wE-CI for qemu-devel@nongnu.org; Mon, 26 Jan 2015 23:05:20 -0500 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:42147) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFxOp-0004vj-Os for qemu-devel@nongnu.org; Mon, 26 Jan 2015 23:05:12 -0500 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 27 Jan 2015 09:35:07 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp03.in.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 27 Jan 2015 09:35:06 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 11541394005A for ; Tue, 27 Jan 2015 09:35:06 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay05.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t0R4540639911608 for ; Tue, 27 Jan 2015 09:35:05 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t0R454oV024351 for ; Tue, 27 Jan 2015 09:35:04 +0530 Received: from bharata.in.ibm.com ([9.124.35.50]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t0R454DR024299; Tue, 27 Jan 2015 09:35:04 +0530 From: Bharata B Rao To: qemu-devel@nongnu.org Date: Tue, 27 Jan 2015 09:35:01 +0530 Message-Id: <1422331502-24636-3-git-send-email-bharata@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1422331502-24636-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1422331502-24636-1-git-send-email-bharata@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15012704-0009-0000-0000-000003ADC139 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 122.248.162.3 Cc: imammedo@redhat.com, Bharata B Rao Subject: [Qemu-devel] [PATCH v2 2/3] pc-dimm: Make pc_existing_dimms_capacity global X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list 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 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