Skip to content

Commit

Permalink
nvdimm acpi: rename nvdimm_plugged_device_list
Browse files Browse the repository at this point in the history
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: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
  • Loading branch information
Xiao Guangrong authored and mstsirkin committed Nov 15, 2016
1 parent 45a9949 commit cf7c0ff
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions hw/acpi/nvdimm.c
Expand Up @@ -33,31 +33,30 @@
#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;

if (object_dynamic_cast(obj, TYPE_NVDIMM)) {
*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;
}

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit cf7c0ff

Please sign in to comment.