From mboxrd@z Thu Jan 1 00:00:00 1970 From: Igor Mammedov Subject: Re: [PATCH 07/14] nvdimm acpi: rename nvdimm_plugged_device_list Date: Wed, 9 Nov 2016 17:39:47 +0100 Message-ID: <20161109173947.592f25cb@nial.brq.redhat.com> References: <1478517229-140028-1-git-send-email-guangrong.xiao@linux.intel.com> <1478517229-140028-8-git-send-email-guangrong.xiao@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: pbonzini@redhat.com, gleb@kernel.org, mtosatti@redhat.com, stefanha@redhat.com, mst@redhat.com, rth@twiddle.net, ehabkost@redhat.com, dan.j.williams@intel.com, kvm@vger.kernel.org, qemu-devel@nongnu.org To: Xiao Guangrong Return-path: Received: from mx1.redhat.com ([209.132.183.28]:43908 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752941AbcKIQju (ORCPT ); Wed, 9 Nov 2016 11:39:50 -0500 In-Reply-To: <1478517229-140028-8-git-send-email-guangrong.xiao@linux.intel.com> Sender: kvm-owner@vger.kernel.org List-ID: On Mon, 7 Nov 2016 19:13:42 +0800 Xiao Guangrong wrote: > Its behavior has been changed as the nvdimm device which is being > realized also will be handled in this function, so rename it to > reflect the fact > > Suggested-by: Igor Mammedov > Signed-off-by: Xiao Guangrong Reviewed-by: Igor Mammedov > --- > hw/acpi/nvdimm.c | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) > > diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c > index 65eb6c9..f2c0659 100644 > --- a/hw/acpi/nvdimm.c > +++ b/hw/acpi/nvdimm.c > @@ -33,7 +33,7 @@ > #include "hw/nvram/fw_cfg.h" > #include "hw/mem/nvdimm.h" > > -static int nvdimm_plugged_device_list(Object *obj, void *opaque) > +static int nvdimm_device_list(Object *obj, void *opaque) > { > GSList **list = opaque; > > @@ -41,23 +41,22 @@ static int nvdimm_plugged_device_list(Object *obj, void *opaque) > *list = g_slist_append(*list, DEVICE(obj)); > } > > - object_child_foreach(obj, nvdimm_plugged_device_list, opaque); > + object_child_foreach(obj, nvdimm_device_list, opaque); > return 0; > } > > /* > - * inquire plugged NVDIMM devices and link them into the list which is > + * inquire NVDIMM devices and link them into the list which is > * returned to the caller. > * > * Note: it is the caller's responsibility to free the list to avoid > * memory leak. > */ > -static GSList *nvdimm_get_plugged_device_list(void) > +static GSList *nvdimm_get_device_list(void) > { > GSList *list = NULL; > > - object_child_foreach(qdev_get_machine(), nvdimm_plugged_device_list, > - &list); > + object_child_foreach(qdev_get_machine(), nvdimm_device_list, &list); > return list; > } > > @@ -215,7 +214,7 @@ static uint32_t nvdimm_slot_to_dcr_index(int slot) > static NVDIMMDevice *nvdimm_get_device_by_handle(uint32_t handle) > { > NVDIMMDevice *nvdimm = NULL; > - GSList *list, *device_list = nvdimm_get_plugged_device_list(); > + GSList *list, *device_list = nvdimm_get_device_list(); > > for (list = device_list; list; list = list->next) { > NVDIMMDevice *nvd = list->data; > @@ -346,7 +345,7 @@ static void nvdimm_build_structure_dcr(GArray *structures, DeviceState *dev) > > static GArray *nvdimm_build_device_structure(void) > { > - GSList *device_list = nvdimm_get_plugged_device_list(); > + GSList *device_list = nvdimm_get_device_list(); > GArray *structures = g_array_new(false, true /* clear */, 1); > > for (; device_list; device_list = device_list->next) { > @@ -1279,7 +1278,7 @@ void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data, > nvdimm_build_ssdt(table_offsets, table_data, linker, state->dsm_mem, > ram_slots); > > - device_list = nvdimm_get_plugged_device_list(); > + device_list = nvdimm_get_device_list(); > /* no NVDIMM device is plugged. */ > if (!device_list) { > return;