Move virCacheKernel enum implemetation from conf/ to util/

It will be used in that file later on, plus it makes sense for all the
implementations to be in same place.  Also comment each one of them nicely and
add a comment explaining why they all need to end with the same _LAST value.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Martin Kletzander 2018-02-08 15:55:09 +01:00
parent c95b9557b5
commit f1d7625e13
4 changed files with 17 additions and 11 deletions

View File

@ -1544,12 +1544,6 @@ virCapabilitiesInitPages(virCapsPtr caps)
return ret;
}
/* Cache name mapping for Linux kernel naming */
VIR_ENUM_DECL(virCacheKernel);
VIR_ENUM_IMPL(virCacheKernel, VIR_CACHE_TYPE_LAST,
"Unified",
"Instruction",
"Data")
bool
virCapsHostCacheBankEquals(virCapsHostCacheBankPtr a,

View File

@ -2619,6 +2619,8 @@ virRandomInt;
# util/virresctrl.h
virCacheKernelTypeFromString;
virCacheKernelTypeToString;
virCacheTypeFromString;
virCacheTypeToString;
virResctrlAllocAddPID;

View File

@ -48,15 +48,24 @@ VIR_LOG_INIT("util.virresctrl")
#define SYSFS_RESCTRL_PATH "/sys/fs/resctrl"
/* Our naming for cache types and scopes */
/* Following are three different enum implementations for the same enum. Each
* one of them helps translating to/from strings for different interfaces. The
* delimiter must be VIR_CACHE_TYPE_LAST for all of them in order to stay
* consistent in between all of them. */
/* Cache name mapping for Linux kernel naming. */
VIR_ENUM_IMPL(virCacheKernel, VIR_CACHE_TYPE_LAST,
"Unified",
"Instruction",
"Data")
/* Cache name mapping for our XML naming. */
VIR_ENUM_IMPL(virCache, VIR_CACHE_TYPE_LAST,
"both",
"code",
"data")
/*
* This is the same enum, but for the resctrl naming
* of the type (L<level><type>)
*/
/* Cache name mapping for resctrl interface naming. */
VIR_ENUM_DECL(virResctrl)
VIR_ENUM_IMPL(virResctrl, VIR_CACHE_TYPE_LAST,
"",

View File

@ -34,6 +34,7 @@ typedef enum {
} virCacheType;
VIR_ENUM_DECL(virCache);
VIR_ENUM_DECL(virCacheKernel);
typedef struct _virResctrlInfoPerCache virResctrlInfoPerCache;