shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 21:34:54 +03:00
Code Releases Activity

qemu: driver: Make name of QEMU_SET_MEM_PARAMETER more universal

Browse Source 
Use a VIR_ prefix even when it's a local helper macro. It will be later
synced with the LXC implementation.
This commit is contained in:
Peter Krempa 2016-07-01 15:55:09 +02:00
parent 9a6e47c483
commit bcdbab891b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qemu/qemu_driver.c
View File

@ -9176,7 +9176,7 @@ qemuDomainSetMemoryParameters(virDomainPtr dom,
}
}
#define QEMU_SET_MEM_PARAMETER(FUNC, VALUE) \
#define VIR_SET_MEM_PARAMETER(FUNC, VALUE) \
if (set_ ## VALUE) { \
if (def) { \
if ((rc = FUNC(priv->cgroup, VALUE)) < 0) \
@ -9189,21 +9189,21 @@ qemuDomainSetMemoryParameters(virDomainPtr dom,
}
/* Soft limit doesn't clash with the others */
QEMU_SET_MEM_PARAMETER(virCgroupSetMemorySoftLimit, soft_limit);
VIR_SET_MEM_PARAMETER(virCgroupSetMemorySoftLimit, soft_limit);
/* set hard limit before swap hard limit if decreasing it */
if (def && def->mem.hard_limit > hard_limit) {
QEMU_SET_MEM_PARAMETER(virCgroupSetMemoryHardLimit, hard_limit);
VIR_SET_MEM_PARAMETER(virCgroupSetMemoryHardLimit, hard_limit);
/* inhibit changing the limit a second time */
set_hard_limit = false;
}
QEMU_SET_MEM_PARAMETER(virCgroupSetMemSwapHardLimit, swap_hard_limit);
VIR_SET_MEM_PARAMETER(virCgroupSetMemSwapHardLimit, swap_hard_limit);
/* otherwise increase it after swap hard limit */
QEMU_SET_MEM_PARAMETER(virCgroupSetMemoryHardLimit, hard_limit);
VIR_SET_MEM_PARAMETER(virCgroupSetMemoryHardLimit, hard_limit);
#undef QEMU_SET_MEM_PARAMETER
#undef VIR_SET_MEM_PARAMETER
if (def &&
virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0)