ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nvdimm acpi: rename nvdimm_plugged_device_list 

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>
This commit is contained in:
Xiao Guangrong 2016-11-07 19:13:42 +08:00 committed by Michael S. Tsirkin
parent 45a994944a
commit cf7c0ff521
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/acpi/nvdimm.c
View File

@ -33,7 +33,7 @@
#include "hw/nvram/fw_cfg.h" #include "hw/nvram/fw_cfg.h"
#include "hw/mem/nvdimm.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; GSList **list = opaque;
@ -41,23 +41,22 @@ static int nvdimm_plugged_device_list(Object *obj, void *opaque)
*list = g_slist_append(*list, DEVICE(obj)); *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; 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. * returned to the caller.
* *
* Note: it is the caller's responsibility to free the list to avoid * Note: it is the caller's responsibility to free the list to avoid
* memory leak. * memory leak.
*/ */
static GSList *nvdimm_get_plugged_device_list(void) static GSList *nvdimm_get_device_list(void)
{ {
GSList *list = NULL; GSList *list = NULL;
object_child_foreach(qdev_get_machine(), nvdimm_plugged_device_list, object_child_foreach(qdev_get_machine(), nvdimm_device_list, &list);
&list);
return 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) static NVDIMMDevice *nvdimm_get_device_by_handle(uint32_t handle)
{ {
NVDIMMDevice *nvdimm = NULL; 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) { for (list = device_list; list; list = list->next) {
NVDIMMDevice *nvd = list->data; 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) 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); GArray *structures = g_array_new(false, true /* clear */, 1);
for (; device_list; device_list = device_list->next) { 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, nvdimm_build_ssdt(table_offsets, table_data, linker, state->dsm_mem,
ram_slots); ram_slots);
device_list = nvdimm_get_plugged_device_list(); device_list = nvdimm_get_device_list();
/* no NVDIMM device is plugged. */ /* no NVDIMM device is plugged. */
if (!device_list) { if (!device_list) {
return; return;