Skip to content

Commit

Permalink
mem: move nvdimm_device_list to utilities
Browse files Browse the repository at this point in the history
nvdimm_device_list is required for parsing the list for devices
in subsequent patches. Move it to common utility area.

Signed-off-by: Shivaprasad G Bhat <sbhat@linux.ibm.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Message-Id: <158131055857.2897.15658377276504711773.stgit@lep8c.aus.stglabs.ibm.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
  • Loading branch information
ShivaprasadGBhat authored and dgibson committed Feb 20, 2020
1 parent a784926 commit 3f350f6
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 27 deletions.
28 changes: 1 addition & 27 deletions hw/acpi/nvdimm.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,33 +32,7 @@
#include "hw/acpi/bios-linker-loader.h"
#include "hw/nvram/fw_cfg.h"
#include "hw/mem/nvdimm.h"

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_device_list, opaque);
return 0;
}

/*
* 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_device_list(void)
{
GSList *list = NULL;

object_child_foreach(qdev_get_machine(), nvdimm_device_list, &list);
return list;
}
#include "qemu/nvdimm-utils.h"

#define NVDIMM_UUID_LE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
{ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \
Expand Down
7 changes: 7 additions & 0 deletions include/qemu/nvdimm-utils.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#ifndef NVDIMM_UTILS_H
#define NVDIMM_UTILS_H

#include "qemu/osdep.h"

GSList *nvdimm_get_device_list(void);
#endif
1 change: 1 addition & 0 deletions util/Makefile.objs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ util-obj-y += envlist.o path.o module.o
util-obj-y += host-utils.o
util-obj-y += bitmap.o bitops.o hbitmap.o
util-obj-y += fifo8.o
util-obj-y += nvdimm-utils.o
util-obj-y += cacheinfo.o
util-obj-y += error.o qemu-error.o
util-obj-y += qemu-print.o
Expand Down
29 changes: 29 additions & 0 deletions util/nvdimm-utils.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#include "qemu/nvdimm-utils.h"
#include "hw/mem/nvdimm.h"

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_device_list, opaque);
return 0;
}

/*
* 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.
*/
GSList *nvdimm_get_device_list(void)
{
GSList *list = NULL;

object_child_foreach(qdev_get_machine(), nvdimm_device_list, &list);
return list;
}

0 comments on commit 3f350f6

Please sign in to comment.