| Message ID | 1478517229-140028-8-git-send-email-guangrong.xiao@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Nov 07, 2016 at 07:13:42PM +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 <imammedo@redhat.com> > Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> > --- > hw/acpi/nvdimm.c | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
On Mon, 7 Nov 2016 19:13:42 +0800 Xiao Guangrong <guangrong.xiao@linux.intel.com> 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 <imammedo@redhat.com> > Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > 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;
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;
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 <imammedo@redhat.com> Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> --- hw/acpi/nvdimm.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)