External/libvirt
1
0
Fork 0
Code

numatune: unify numatune struct and enum names

Browse Source 
Since there was already public virDomainNumatune*, I changed the
private virNumaTune to match the same, so all the uses are unified and
public API is kept:

s/vir\(Domain\)\?Numa[tT]une/virDomainNumatune/g

then shrunk long lines, and mainly functions, that were created after
that:

sed -i 's/virDomainNumatuneMemPlacementMode/virDomainNumatunePlacement/g'

And to cope with the enum name, I haad to change the constants as
well:

s/VIR_NUMA_TUNE_MEM_PLACEMENT_MODE/VIR_DOMAIN_NUMATUNE_PLACEMENT/g

Last thing I did was at least a little shortening of already long
name:

s/virDomainNumatuneDef/virDomainNumatune/g

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander 2014-06-08 19:15:42 +02:00
parent 293d5f21b6
commit e764ec7ae3
13 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/conf/domain_conf.c
View File

@ -11849,7 +11849,7 @@ virDomainDefParseXML(xmlDocPtr xml,
int placement_mode = 0; int placement_mode = 0;
if (placement) { if (placement) {
if ((placement_mode = if ((placement_mode =
virNumaTuneMemPlacementModeTypeFromString(placement)) < 0) { virDomainNumatunePlacementTypeFromString(placement)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unsupported memory placement " _("Unsupported memory placement "
"mode '%s'"), placement); "mode '%s'"), placement);
@ -11859,18 +11859,18 @@ virDomainDefParseXML(xmlDocPtr xml,
VIR_FREE(placement); VIR_FREE(placement);
} else if (def->numatune.memory.nodemask) { } else if (def->numatune.memory.nodemask) {
/* Defaults to "static" if nodeset is specified. */ /* Defaults to "static" if nodeset is specified. */
placement_mode = VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_STATIC; placement_mode = VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC;
} else { } else {
/* Defaults to "placement" of <vcpu> if nodeset is /* Defaults to "placement" of <vcpu> if nodeset is
* not specified. * not specified.
*/ */
if (def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_STATIC) if (def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_STATIC)
placement_mode = VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_STATIC; placement_mode = VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC;
else else
placement_mode = VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_AUTO; placement_mode = VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO;
} }
if (placement_mode == VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_STATIC && if (placement_mode == VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC &&
!def->numatune.memory.nodemask) { !def->numatune.memory.nodemask) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("nodeset for NUMA memory tuning must be set " _("nodeset for NUMA memory tuning must be set "
@ -11879,7 +11879,7 @@ virDomainDefParseXML(xmlDocPtr xml,
} }
/* Ignore 'nodeset' if 'placement' is 'auto' finally */ /* Ignore 'nodeset' if 'placement' is 'auto' finally */
if (placement_mode == VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_AUTO) { if (placement_mode == VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO) {
virBitmapFree(def->numatune.memory.nodemask); virBitmapFree(def->numatune.memory.nodemask);
def->numatune.memory.nodemask = NULL; def->numatune.memory.nodemask = NULL;
} }
@ -11887,7 +11887,7 @@ virDomainDefParseXML(xmlDocPtr xml,
/* Copy 'placement' of <numatune> to <vcpu> if its 'placement' /* Copy 'placement' of <numatune> to <vcpu> if its 'placement'
* is not specified and 'placement' of <numatune> is specified. * is not specified and 'placement' of <numatune> is specified.
*/ */
if (placement_mode == VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_AUTO && if (placement_mode == VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO &&
!def->cpumask) !def->cpumask)
def->placement_mode = VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO; def->placement_mode = VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO;
@ -11906,7 +11906,7 @@ virDomainDefParseXML(xmlDocPtr xml,
* and 'placement' of <vcpu> is 'auto'. * and 'placement' of <vcpu> is 'auto'.
*/ */
if (def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) { if (def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) {
def->numatune.memory.placement_mode = VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_AUTO; def->numatune.memory.placement_mode = VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO;
def->numatune.memory.mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT; def->numatune.memory.mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT;
} }
} }
@ -17539,13 +17539,13 @@ virDomainDefFormatInternal(virDomainDefPtr def,
virBufferAsprintf(buf, "<memory mode='%s' ", mode); virBufferAsprintf(buf, "<memory mode='%s' ", mode);
if (def->numatune.memory.placement_mode == if (def->numatune.memory.placement_mode ==
VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_STATIC) { VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC) {
if (!(nodemask = virBitmapFormat(def->numatune.memory.nodemask))) if (!(nodemask = virBitmapFormat(def->numatune.memory.nodemask)))
goto error; goto error;
virBufferAsprintf(buf, "nodeset='%s'/>\n", nodemask); virBufferAsprintf(buf, "nodeset='%s'/>\n", nodemask);
VIR_FREE(nodemask); VIR_FREE(nodemask);
} else if (def->numatune.memory.placement_mode) { } else if (def->numatune.memory.placement_mode) {
placement = virNumaTuneMemPlacementModeTypeToString(def->numatune.memory.placement_mode); placement = virDomainNumatunePlacementTypeToString(def->numatune.memory.placement_mode);
virBufferAsprintf(buf, "placement='%s'/>\n", placement); virBufferAsprintf(buf, "placement='%s'/>\n", placement);
} }
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);

2
src/conf/domain_conf.h
View File

@ -1897,7 +1897,7 @@ struct _virDomainDef {
virDomainVcpuPinDefPtr emulatorpin; virDomainVcpuPinDefPtr emulatorpin;
} cputune; } cputune;
virNumaTuneDef numatune; virDomainNumatune numatune;
virDomainResourceDefPtr resource; virDomainResourceDefPtr resource;
virDomainIdMapDef idmap; virDomainIdMapDef idmap;

4
src/conf/numatune_conf.c
View File

@ -30,8 +30,8 @@ VIR_ENUM_IMPL(virDomainNumatuneMemMode,
"preferred", "preferred",
"interleave"); "interleave");
VIR_ENUM_IMPL(virNumaTuneMemPlacementMode, VIR_ENUM_IMPL(virDomainNumatunePlacement,
VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_LAST, VIR_DOMAIN_NUMATUNE_PLACEMENT_LAST,
"default", "default",
"static", "static",
"auto"); "auto");

20
src/conf/numatune_conf.h
View File

@ -28,24 +28,24 @@
# include "virbitmap.h" # include "virbitmap.h"
typedef enum { typedef enum {
VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_DEFAULT = 0, VIR_DOMAIN_NUMATUNE_PLACEMENT_DEFAULT = 0,
VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_STATIC, VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC,
VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_AUTO, VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO,
VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_LAST VIR_DOMAIN_NUMATUNE_PLACEMENT_LAST
} virDomainNumaTuneMemPlacementMode; } virDomainNumatunePlacement;
VIR_ENUM_DECL(virNumaTuneMemPlacementMode) VIR_ENUM_DECL(virDomainNumatunePlacement)
VIR_ENUM_DECL(virDomainNumatuneMemMode) VIR_ENUM_DECL(virDomainNumatuneMemMode)
typedef struct _virNumaTuneDef virNumaTuneDef; typedef struct _virDomainNumatune virDomainNumatune;
typedef virNumaTuneDef *virNumaTuneDefPtr; typedef virDomainNumatune *virDomainNumatunePtr;
struct _virNumaTuneDef { struct _virDomainNumatune {
struct { struct {
virBitmapPtr nodemask; virBitmapPtr nodemask;
int mode; /* enum virDomainNumatuneMemMode */ int mode; /* enum virDomainNumatuneMemMode */
int placement_mode; /* enum virNumaTuneMemPlacementMode */ int placement_mode; /* enum virDomainNumatunePlacement */
} memory; /* pinning for all the memory */ } memory; /* pinning for all the memory */
/* Future NUMA tuning related stuff should go here. */ /* Future NUMA tuning related stuff should go here. */

4
src/libvirt_private.syms
View File

@ -609,8 +609,8 @@ virNodeDeviceObjUnlock;
# conf/numatune_conf.h # conf/numatune_conf.h
virDomainNumatuneMemModeTypeFromString; virDomainNumatuneMemModeTypeFromString;
virDomainNumatuneMemModeTypeToString; virDomainNumatuneMemModeTypeToString;
virNumaTuneMemPlacementModeTypeFromString; virDomainNumatunePlacementTypeFromString;
virNumaTuneMemPlacementModeTypeToString; virDomainNumatunePlacementTypeToString;
# conf/nwfilter_conf.h # conf/nwfilter_conf.h

4
src/lxc/lxc_cgroup.c
View File

@ -81,10 +81,10 @@ static int virLXCCgroupSetupCpusetTune(virDomainDefPtr def,
if ((def->numatune.memory.nodemask || if ((def->numatune.memory.nodemask ||
(def->numatune.memory.placement_mode == (def->numatune.memory.placement_mode ==
VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_AUTO)) && VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO)) &&
def->numatune.memory.mode == VIR_DOMAIN_NUMATUNE_MEM_STRICT) { def->numatune.memory.mode == VIR_DOMAIN_NUMATUNE_MEM_STRICT) {
if (def->numatune.memory.placement_mode == if (def->numatune.memory.placement_mode ==
VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_AUTO) VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO)
mask = virBitmapFormat(nodemask); mask = virBitmapFormat(nodemask);
else else
mask = virBitmapFormat(def->numatune.memory.nodemask); mask = virBitmapFormat(def->numatune.memory.nodemask);

2
src/lxc/lxc_controller.c
View File

@ -656,7 +656,7 @@ static int virLXCControllerGetNumadAdvice(virLXCControllerPtr ctrl,
if ((ctrl->def->placement_mode == if ((ctrl->def->placement_mode ==
VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) || VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) ||
(ctrl->def->numatune.memory.placement_mode == (ctrl->def->numatune.memory.placement_mode ==
VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_AUTO)) { VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO)) {
nodeset = virNumaGetAutoPlacementAdvice(ctrl->def->vcpus, nodeset = virNumaGetAutoPlacementAdvice(ctrl->def->vcpus,
ctrl->def->mem.cur_balloon); ctrl->def->mem.cur_balloon);
if (!nodeset) if (!nodeset)

2
src/lxc/lxc_native.c
View File

@ -720,7 +720,7 @@ lxcSetCpusetTune(virDomainDefPtr def, virConfPtr properties)
if ((value = virConfGetValue(properties, "lxc.cgroup.cpuset.mems")) && if ((value = virConfGetValue(properties, "lxc.cgroup.cpuset.mems")) &&
value->str) { value->str) {
def->numatune.memory.placement_mode = VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_STATIC; def->numatune.memory.placement_mode = VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC;
def->numatune.memory.mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT; def->numatune.memory.mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT;
if (virBitmapParse(value->str, 0, &def->numatune.memory.nodemask, if (virBitmapParse(value->str, 0, &def->numatune.memory.nodemask,
VIR_DOMAIN_CPUMASK_LEN) < 0) VIR_DOMAIN_CPUMASK_LEN) < 0)

4
src/qemu/qemu_cgroup.c
View File

@ -603,11 +603,11 @@ qemuSetupCpusetCgroup(virDomainObjPtr vm,
if ((vm->def->numatune.memory.nodemask || if ((vm->def->numatune.memory.nodemask ||
(vm->def->numatune.memory.placement_mode == (vm->def->numatune.memory.placement_mode ==
VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_AUTO)) && VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO)) &&
vm->def->numatune.memory.mode == VIR_DOMAIN_NUMATUNE_MEM_STRICT) { vm->def->numatune.memory.mode == VIR_DOMAIN_NUMATUNE_MEM_STRICT) {
if (vm->def->numatune.memory.placement_mode == if (vm->def->numatune.memory.placement_mode ==
VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_AUTO) VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO)
mem_mask = virBitmapFormat(nodemask); mem_mask = virBitmapFormat(nodemask);
else else
mem_mask = virBitmapFormat(vm->def->numatune.memory.nodemask); mem_mask = virBitmapFormat(vm->def->numatune.memory.nodemask);

10
src/qemu/qemu_driver.c
View File

@ -8754,8 +8754,8 @@ qemuDomainSetNumaParameters(virDomainPtr dom,
if (STREQ(param->field, VIR_DOMAIN_NUMA_MODE)) { if (STREQ(param->field, VIR_DOMAIN_NUMA_MODE)) {
int mode = param->value.i; int mode = param->value.i;
if (mode >= VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_LAST || if (mode >= VIR_DOMAIN_NUMATUNE_PLACEMENT_LAST ||
mode < VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_DEFAULT) mode < VIR_DOMAIN_NUMATUNE_PLACEMENT_DEFAULT)
{ {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("unsupported numa_mode: '%d'"), mode); _("unsupported numa_mode: '%d'"), mode);
@ -8791,7 +8791,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom,
virBitmapFree(vm->def->numatune.memory.nodemask); virBitmapFree(vm->def->numatune.memory.nodemask);
vm->def->numatune.memory.placement_mode = vm->def->numatune.memory.placement_mode =
VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_STATIC; VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC;
vm->def->numatune.memory.nodemask = virBitmapNewCopy(nodeset); vm->def->numatune.memory.nodemask = virBitmapNewCopy(nodeset);
} }
@ -8800,7 +8800,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom,
persistentDef->numatune.memory.nodemask = nodeset; persistentDef->numatune.memory.nodemask = nodeset;
persistentDef->numatune.memory.placement_mode = persistentDef->numatune.memory.placement_mode =
VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_STATIC; VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC;
nodeset = NULL; nodeset = NULL;
} }
virBitmapFree(nodeset); virBitmapFree(nodeset);
@ -8810,7 +8810,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom,
if (flags & VIR_DOMAIN_AFFECT_CONFIG) { if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
if (!persistentDef->numatune.memory.placement_mode) if (!persistentDef->numatune.memory.placement_mode)
persistentDef->numatune.memory.placement_mode = persistentDef->numatune.memory.placement_mode =
VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_AUTO; VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO;
if (virDomainSaveConfig(cfg->configDir, persistentDef) < 0) if (virDomainSaveConfig(cfg->configDir, persistentDef) < 0)
goto cleanup; goto cleanup;
} }

2
src/qemu/qemu_process.c
View File

@ -3901,7 +3901,7 @@ int qemuProcessStart(virConnectPtr conn,
if ((vm->def->placement_mode == if ((vm->def->placement_mode ==
VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) || VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) ||
(vm->def->numatune.memory.placement_mode == (vm->def->numatune.memory.placement_mode ==
VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_AUTO)) { VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO)) {
nodeset = virNumaGetAutoPlacementAdvice(vm->def->vcpus, nodeset = virNumaGetAutoPlacementAdvice(vm->def->vcpus,
vm->def->mem.max_balloon); vm->def->mem.max_balloon);
if (!nodeset) if (!nodeset)

8
src/util/virnuma.c
View File

@ -87,7 +87,7 @@ virNumaGetAutoPlacementAdvice(unsigned short vcpus ATTRIBUTE_UNUSED,
#if WITH_NUMACTL #if WITH_NUMACTL
int int
virNumaSetupMemoryPolicy(virNumaTuneDef numatune, virNumaSetupMemoryPolicy(virDomainNumatune numatune,
virBitmapPtr nodemask) virBitmapPtr nodemask)
{ {
nodemask_t mask; nodemask_t mask;
@ -100,13 +100,13 @@ virNumaSetupMemoryPolicy(virNumaTuneDef numatune,
virBitmapPtr tmp_nodemask = NULL; virBitmapPtr tmp_nodemask = NULL;
if (numatune.memory.placement_mode == if (numatune.memory.placement_mode ==
VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_STATIC) { VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC) {
if (!numatune.memory.nodemask) if (!numatune.memory.nodemask)
return 0; return 0;
VIR_DEBUG("Set NUMA memory policy with specified nodeset"); VIR_DEBUG("Set NUMA memory policy with specified nodeset");
tmp_nodemask = numatune.memory.nodemask; tmp_nodemask = numatune.memory.nodemask;
} else if (numatune.memory.placement_mode == } else if (numatune.memory.placement_mode ==
VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_AUTO) { VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO) {
VIR_DEBUG("Set NUMA memory policy with advisory nodeset from numad"); VIR_DEBUG("Set NUMA memory policy with advisory nodeset from numad");
tmp_nodemask = nodemask; tmp_nodemask = nodemask;
} else { } else {
@ -327,7 +327,7 @@ virNumaGetNodeCPUs(int node,
#else #else
int int
virNumaSetupMemoryPolicy(virNumaTuneDef numatune, virNumaSetupMemoryPolicy(virDomainNumatune numatune,
virBitmapPtr nodemask ATTRIBUTE_UNUSED) virBitmapPtr nodemask ATTRIBUTE_UNUSED)
{ {
if (numatune.memory.nodemask) { if (numatune.memory.nodemask) {

2
src/util/virnuma.h
View File

@ -31,7 +31,7 @@
char *virNumaGetAutoPlacementAdvice(unsigned short vcups, char *virNumaGetAutoPlacementAdvice(unsigned short vcups,
unsigned long long balloon); unsigned long long balloon);
int virNumaSetupMemoryPolicy(virNumaTuneDef numatune, int virNumaSetupMemoryPolicy(virDomainNumatune numatune,
virBitmapPtr nodemask); virBitmapPtr nodemask);
bool virNumaIsAvailable(void); bool virNumaIsAvailable(void);