[libvirt] [PATCH 1/9] Rename virResctrlInfo to virResctrlInfoPerCache
Just to ease the review of following patches.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
src/conf/capabilities.c | 2 +-
src/conf/capabilities.h | 2 +-
src/util/virresctrl.c | 4 ++--
src/util/virresctrl.h | 8 ++++----
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 798c9bdaeaf3..e93eaed2f0e0 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -904,7 +904,7 @@ virCapabilitiesFormatCaches(virBufferPtr buf,
virBufferSetChildIndent(&controlBuf, buf);
for (j = 0; j < bank->ncontrols; j++) {
const char *min_unit;
- virResctrlInfoPtr controls = bank->controls[j];
+ virResctrlInfoPerCachePtr controls = bank->controls[j];
unsigned long long gran_short_size = controls->granularity;
unsigned long long min_short_size = controls->min;
diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h
index 5048fa819d95..27b88cb5edfa 100644
--- a/src/conf/capabilities.h
+++ b/src/conf/capabilities.h
@@ -148,7 +148,7 @@ struct _virCapsHostCacheBank {
virCacheType type; /* Data, Instruction or Unified */
virBitmapPtr cpus; /* All CPUs that share this bank */
size_t ncontrols;
- virResctrlInfoPtr *controls;
+ virResctrlInfoPerCachePtr *controls;
};
typedef struct _virCapsHost virCapsHost;
diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c
index 2a11825a52dc..050a08178e24 100644
--- a/src/util/virresctrl.c
+++ b/src/util/virresctrl.c
@@ -59,7 +59,7 @@ int
virResctrlGetCacheInfo(unsigned int level,
unsigned long long size,
virCacheType scope,
- virResctrlInfoPtr **controls,
+ virResctrlInfoPerCachePtr **controls,
size_t *ncontrols)
{
int ret = -1;
@@ -69,7 +69,7 @@ virResctrlGetCacheInfo(unsigned int level,
char *type_upper = NULL;
unsigned int bits = 0;
unsigned int min_cbm_bits = 0;
- virResctrlInfoPtr control;
+ virResctrlInfoPerCachePtr control;
if (VIR_ALLOC(control) < 0)
goto cleanup;
diff --git a/src/util/virresctrl.h b/src/util/virresctrl.h
index 848b13e98aa3..42e852780318 100644
--- a/src/util/virresctrl.h
+++ b/src/util/virresctrl.h
@@ -36,9 +36,9 @@ typedef enum {
VIR_ENUM_DECL(virCache);
-typedef struct _virResctrlInfo virResctrlInfo;
-typedef virResctrlInfo *virResctrlInfoPtr;
-struct _virResctrlInfo {
+typedef struct _virResctrlInfoPerCache virResctrlInfoPerCache;
+typedef virResctrlInfoPerCache *virResctrlInfoPerCachePtr;
+struct _virResctrlInfoPerCache {
/* Smallest possible increase of the allocation size in bytes */
unsigned long long granularity;
/* Minimal allocatable size in bytes (if different from granularity) */
@@ -54,7 +54,7 @@ int
virResctrlGetCacheInfo(unsigned int level,
unsigned long long size,
virCacheType scope,
- virResctrlInfoPtr **controls,
+ virResctrlInfoPerCachePtr **controls,
size_t *ncontrols);
int
--
2.15.1