util: Return a list of pointer in virResctrlMonitorGetStats

Return a list of virResctrlMonitorStatsPtr instead of
a virResctrlMonitorStats array in virResctrlMonitorGetStats.

Signed-off-by: Wang Huaqiang <huaqiang.wang@intel.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>

diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c
index b32eedc3b18f6a0a0d247ffe1c5b11b578881423..326831080dda613f543676d1ff191f935639f1ac 100644 (file)
--- a/src/util/virresctrl.c
+++ b/src/util/virresctrl.c
@@ -2647,8 +2647,8 @@ virResctrlMonitorStatsSorter(const void *a,
  * @monitor: The monitor that the statistic data will be retrieved from.
  * @resource: The name for resource name. 'llc_occupancy' for cache resource.
  * "mbm_total_bytes" and "mbm_local_bytes" for memory bandwidth resource.
- * @stats: Array of virResctrlMonitorStatsPtr for holding cache or memory
- * bandwidth usage data.
+ * @stats: Pointer of of virResctrlMonitorStatsPtr array for holding cache or
+ * memory bandwidth usage data.
  * @nstats: A size_t pointer to hold the returned array length of @stats
  *
  * Get cache or memory bandwidth utilization information.
@@ -2658,7 +2658,7 @@ virResctrlMonitorStatsSorter(const void *a,
 static int
 virResctrlMonitorGetStats(virResctrlMonitorPtr monitor,
                           const char *resource,
-                          virResctrlMonitorStatsPtr *stats,
+                          virResctrlMonitorStatsPtr **stats,
                           size_t *nstats)
 {
     int rv = -1;
@@ -2729,7 +2729,7 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor,
         if (rv < 0)
             goto cleanup;
 
-        if (VIR_APPEND_ELEMENT(*stats, *nstats, *stat) < 0)
+        if (VIR_APPEND_ELEMENT(*stats, *nstats, stat) < 0)
             goto cleanup;
     }
 
@@ -2762,7 +2762,7 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor,
 
 int
 virResctrlMonitorGetCacheOccupancy(virResctrlMonitorPtr monitor,
-                                   virResctrlMonitorStatsPtr *stats,
+                                   virResctrlMonitorStatsPtr **stats,
                                    size_t *nstats)
 {
     return virResctrlMonitorGetStats(monitor, "llc_occupancy",

diff --git a/src/util/virresctrl.h b/src/util/virresctrl.h
index 45ec9676304e02dab6d9fae7db8ed1688adb36df..e2ed4ee74a59edc369a6a180b608dea97fb317be 100644 (file)
--- a/src/util/virresctrl.h
+++ b/src/util/virresctrl.h
@@ -229,6 +229,6 @@ virResctrlMonitorRemove(virResctrlMonitorPtr monitor);
 
 int
 virResctrlMonitorGetCacheOccupancy(virResctrlMonitorPtr monitor,
-                                   virResctrlMonitorStatsPtr *caches,
-                                   size_t *ncaches);
+                                   virResctrlMonitorStatsPtr **stats,
+                                   size_t *nstats);
 #endif /*  __VIR_RESCTRL_H__ */