From a045317680ac9445485394790544d2b9c01a921b Mon Sep 17 00:00:00 2001
From: Martin Kletzander <mkletzan@redhat.com>
Date: Thu, 10 Aug 2017 11:50:47 +0200
Subject: [PATCH] util: Rename virResctrl to virResctrlInfo

This way later patches can add another structures with virResctrl
prefix without the meaning being even more confusing than it needs to
be.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---
 src/conf/capabilities.h | 2 +-
 src/util/virresctrl.c   | 4 ++--
 src/util/virresctrl.h   | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h
index bd64498d1c..5048fa819d 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;
-    virResctrlPtr *controls;
+    virResctrlInfoPtr *controls;
 };
 
 typedef struct _virCapsHost virCapsHost;
diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c
index ec1ad7b6ed..2a11825a52 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,
-                       virResctrlPtr **controls,
+                       virResctrlInfoPtr **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;
-    virResctrlPtr control;
+    virResctrlInfoPtr control;
 
     if (VIR_ALLOC(control) < 0)
         goto cleanup;
diff --git a/src/util/virresctrl.h b/src/util/virresctrl.h
index ee219cbb92..848b13e98a 100644
--- a/src/util/virresctrl.h
+++ b/src/util/virresctrl.h
@@ -36,9 +36,9 @@ typedef enum {
 VIR_ENUM_DECL(virCache);
 
 
-typedef struct _virResctrl virResctrl;
-typedef virResctrl *virResctrlPtr;
-struct _virResctrl {
+typedef struct _virResctrlInfo virResctrlInfo;
+typedef virResctrlInfo *virResctrlInfoPtr;
+struct _virResctrlInfo {
     /* 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,
-                       virResctrlPtr **controls,
+                       virResctrlInfoPtr **controls,
                        size_t *ncontrols);
 
 int
-- 
GitLab