From nobody Wed Oct 22 13:04:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15207374882451002.3323508546132; Sat, 10 Mar 2018 19:04:48 -0800 (PST) Received: from localhost ([::1]:52759 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eurHz-0005Wi-BU for importer@patchew.org; Sat, 10 Mar 2018 22:04:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eurFj-0004CK-Up for qemu-devel@nongnu.org; Sat, 10 Mar 2018 22:02:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eurFh-00024g-N5 for qemu-devel@nongnu.org; Sat, 10 Mar 2018 22:02:28 -0500 Received: from mga04.intel.com ([192.55.52.120]:52978) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eurFh-00023F-CP; Sat, 10 Mar 2018 22:02:25 -0500 Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Mar 2018 19:02:24 -0800 Received: from hz-desktop.sh.intel.com (HELO localhost) ([10.239.13.35]) by orsmga006.jf.intel.com with ESMTP; 10 Mar 2018 19:02:21 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,453,1515484800"; d="scan'208";a="24605789" From: Haozhong Zhang To: qemu-devel@nongnu.org Date: Sun, 11 Mar 2018 11:02:11 +0800 Message-Id: <20180311030215.11488-2-haozhong.zhang@intel.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180311030215.11488-1-haozhong.zhang@intel.com> References: <20180311030215.11488-1-haozhong.zhang@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.120 Subject: [Qemu-devel] [PATCH v6 1/5] pc-dimm: make qmp_pc_dimm_device_list() sort devices by address X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Haozhong Zhang , Xiao Guangrong , mst@redhat.com, Bharata B Rao , Alexander Graf , Eduardo Habkost , Markus Armbruster , qemu-ppc@nongnu.org, Stefan Hajnoczi , Paolo Bonzini , Marcel Apfelbaum , Igor Mammedov , Dan Williams , David Gibson , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Make qmp_pc_dimm_device_list() return sorted by start address list of devices so that it could be reused in places that would need sorted list*. Reuse existing pc_dimm_built_list() to get sorted list. While at it hide recursive callbacks from callers, so that: qmp_pc_dimm_device_list(qdev_get_machine(), &list); could be replaced with simpler: list =3D qmp_pc_dimm_device_list(); * follow up patch will use it in build_srat() Signed-off-by: Haozhong Zhang Reviewed-by: Igor Mammedov Acked-by: David Gibson for ppc part Reviewed-by: Bharata B Rao --- hw/mem/pc-dimm.c | 83 +++++++++++++++++++++++++-------------------= ---- hw/ppc/spapr.c | 3 +- include/hw/mem/pc-dimm.h | 2 +- numa.c | 4 +-- qmp.c | 7 +--- stubs/qmp_pc_dimm.c | 4 +-- 6 files changed, 50 insertions(+), 53 deletions(-) diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 6e74b61cb6..4d050fe2cd 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -162,45 +162,6 @@ uint64_t get_plugged_memory_size(void) return pc_existing_dimms_capacity(&error_abort); } =20 -int qmp_pc_dimm_device_list(Object *obj, void *opaque) -{ - MemoryDeviceInfoList ***prev =3D opaque; - - if (object_dynamic_cast(obj, TYPE_PC_DIMM)) { - DeviceState *dev =3D DEVICE(obj); - - if (dev->realized) { - MemoryDeviceInfoList *elem =3D g_new0(MemoryDeviceInfoList, 1); - MemoryDeviceInfo *info =3D g_new0(MemoryDeviceInfo, 1); - PCDIMMDeviceInfo *di =3D g_new0(PCDIMMDeviceInfo, 1); - DeviceClass *dc =3D DEVICE_GET_CLASS(obj); - PCDIMMDevice *dimm =3D PC_DIMM(obj); - - if (dev->id) { - di->has_id =3D true; - di->id =3D g_strdup(dev->id); - } - di->hotplugged =3D dev->hotplugged; - di->hotpluggable =3D dc->hotpluggable; - di->addr =3D dimm->addr; - di->slot =3D dimm->slot; - di->node =3D dimm->node; - di->size =3D object_property_get_uint(OBJECT(dimm), PC_DIMM_SI= ZE_PROP, - NULL); - di->memdev =3D object_get_canonical_path(OBJECT(dimm->hostmem)= ); - - info->u.dimm.data =3D di; - elem->value =3D info; - elem->next =3D NULL; - **prev =3D elem; - *prev =3D &elem->next; - } - } - - object_child_foreach(obj, qmp_pc_dimm_device_list, opaque); - return 0; -} - static int pc_dimm_slot2bitmap(Object *obj, void *opaque) { unsigned long *bitmap =3D opaque; @@ -276,6 +237,50 @@ static int pc_dimm_built_list(Object *obj, void *opaqu= e) return 0; } =20 +MemoryDeviceInfoList *qmp_pc_dimm_device_list(void) +{ + GSList *dimms =3D NULL, *item; + MemoryDeviceInfoList *list =3D NULL, *prev =3D NULL; + + object_child_foreach(qdev_get_machine(), pc_dimm_built_list, &dimms); + + for (item =3D dimms; item; item =3D g_slist_next(item)) { + PCDIMMDevice *dimm =3D PC_DIMM(item->data); + Object *obj =3D OBJECT(dimm); + MemoryDeviceInfoList *elem =3D g_new0(MemoryDeviceInfoList, 1); + MemoryDeviceInfo *info =3D g_new0(MemoryDeviceInfo, 1); + PCDIMMDeviceInfo *di =3D g_new0(PCDIMMDeviceInfo, 1); + DeviceClass *dc =3D DEVICE_GET_CLASS(obj); + DeviceState *dev =3D DEVICE(obj); + + if (dev->id) { + di->has_id =3D true; + di->id =3D g_strdup(dev->id); + } + di->hotplugged =3D dev->hotplugged; + di->hotpluggable =3D dc->hotpluggable; + di->addr =3D dimm->addr; + di->slot =3D dimm->slot; + di->node =3D dimm->node; + di->size =3D object_property_get_uint(obj, PC_DIMM_SIZE_PROP, NULL= ); + di->memdev =3D object_get_canonical_path(OBJECT(dimm->hostmem)); + + info->u.dimm.data =3D di; + elem->value =3D info; + elem->next =3D NULL; + if (prev) { + prev->next =3D elem; + } else { + list =3D elem; + } + prev =3D elem; + } + + g_slist_free(dimms); + + return list; +} + uint64_t pc_dimm_get_free_addr(uint64_t address_space_start, uint64_t address_space_size, uint64_t *hint, uint64_t align, uint64_t si= ze, diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 7e1c858566..44a0670d11 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -722,8 +722,7 @@ static int spapr_populate_drconf_memory(sPAPRMachineSta= te *spapr, void *fdt) } =20 if (hotplug_lmb_start) { - MemoryDeviceInfoList **prev =3D &dimms; - qmp_pc_dimm_device_list(qdev_get_machine(), &prev); + dimms =3D qmp_pc_dimm_device_list(); } =20 /* ibm,dynamic-memory */ diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h index d83b957829..1fc479281c 100644 --- a/include/hw/mem/pc-dimm.h +++ b/include/hw/mem/pc-dimm.h @@ -93,7 +93,7 @@ uint64_t pc_dimm_get_free_addr(uint64_t address_space_sta= rt, =20 int pc_dimm_get_free_slot(const int *hint, int max_slots, Error **errp); =20 -int qmp_pc_dimm_device_list(Object *obj, void *opaque); +MemoryDeviceInfoList *qmp_pc_dimm_device_list(void); uint64_t pc_existing_dimms_capacity(Error **errp); uint64_t get_plugged_memory_size(void); void pc_dimm_memory_plug(DeviceState *dev, MemoryHotplugState *hpms, diff --git a/numa.c b/numa.c index 398e2c9a85..94427046ec 100644 --- a/numa.c +++ b/numa.c @@ -520,12 +520,10 @@ void memory_region_allocate_system_memory(MemoryRegio= n *mr, Object *owner, =20 static void numa_stat_memory_devices(NumaNodeMem node_mem[]) { - MemoryDeviceInfoList *info_list =3D NULL; - MemoryDeviceInfoList **prev =3D &info_list; + MemoryDeviceInfoList *info_list =3D qmp_pc_dimm_device_list(); MemoryDeviceInfoList *info; PCDIMMDeviceInfo *pcdimm_info; =20 - qmp_pc_dimm_device_list(qdev_get_machine(), &prev); for (info =3D info_list; info; info =3D info->next) { MemoryDeviceInfo *value =3D info->value; =20 diff --git a/qmp.c b/qmp.c index 8c7d1cc479..4b2517d8b5 100644 --- a/qmp.c +++ b/qmp.c @@ -731,12 +731,7 @@ void qmp_object_del(const char *id, Error **errp) =20 MemoryDeviceInfoList *qmp_query_memory_devices(Error **errp) { - MemoryDeviceInfoList *head =3D NULL; - MemoryDeviceInfoList **prev =3D &head; - - qmp_pc_dimm_device_list(qdev_get_machine(), &prev); - - return head; + return qmp_pc_dimm_device_list(); } =20 ACPIOSTInfoList *qmp_query_acpi_ospm_status(Error **errp) diff --git a/stubs/qmp_pc_dimm.c b/stubs/qmp_pc_dimm.c index 9ddc4f619a..b6b2cca89e 100644 --- a/stubs/qmp_pc_dimm.c +++ b/stubs/qmp_pc_dimm.c @@ -2,9 +2,9 @@ #include "qom/object.h" #include "hw/mem/pc-dimm.h" =20 -int qmp_pc_dimm_device_list(Object *obj, void *opaque) +MemoryDeviceInfoList *qmp_pc_dimm_device_list(void) { - return 0; + return NULL; } =20 uint64_t get_plugged_memory_size(void) --=20 2.14.1