mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
qemu: Drop @unionMems argument from qemuProcessSetupPid()
The @unionMems argument of qemuProcessSetupPid() function is not necessary really as all callers pass 'true'. Drop it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
parent
83adba541a
commit
d09b73b560
@ -2550,8 +2550,7 @@ qemuProcessSetupPid(virDomainObj *vm,
|
|||||||
virBitmap *cpumask,
|
virBitmap *cpumask,
|
||||||
unsigned long long period,
|
unsigned long long period,
|
||||||
long long quota,
|
long long quota,
|
||||||
virDomainThreadSchedParam *sched,
|
virDomainThreadSchedParam *sched)
|
||||||
bool unionMems)
|
|
||||||
{
|
{
|
||||||
qemuDomainObjPrivate *priv = vm->privateData;
|
qemuDomainObjPrivate *priv = vm->privateData;
|
||||||
virDomainNuma *numatune = vm->def->numa;
|
virDomainNuma *numatune = vm->def->numa;
|
||||||
@ -2591,19 +2590,15 @@ qemuProcessSetupPid(virDomainObj *vm,
|
|||||||
if (virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPU) ||
|
if (virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPU) ||
|
||||||
virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPUSET)) {
|
virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPUSET)) {
|
||||||
|
|
||||||
if (virDomainNumatuneGetMode(numatune, -1, &mem_mode) == 0 &&
|
if (virDomainNumatuneGetMode(numatune, -1, &mem_mode) == 0) {
|
||||||
(mem_mode == VIR_DOMAIN_NUMATUNE_MEM_STRICT ||
|
|
||||||
mem_mode == VIR_DOMAIN_NUMATUNE_MEM_RESTRICTIVE)) {
|
|
||||||
|
|
||||||
/* QEMU allocates its memory from the emulator thread. Thus it
|
/* QEMU allocates its memory from the emulator thread. Thus it
|
||||||
* needs to access union of all host nodes configured. */
|
* needs to access union of all host nodes configured. */
|
||||||
if (unionMems &&
|
if (mem_mode == VIR_DOMAIN_NUMATUNE_MEM_STRICT) {
|
||||||
mem_mode != VIR_DOMAIN_NUMATUNE_MEM_RESTRICTIVE) {
|
|
||||||
qemuDomainNumatuneMaybeFormatNodesetUnion(vm, NULL, &mem_mask);
|
qemuDomainNumatuneMaybeFormatNodesetUnion(vm, NULL, &mem_mask);
|
||||||
} else {
|
} else if (mem_mode == VIR_DOMAIN_NUMATUNE_MEM_RESTRICTIVE &&
|
||||||
if (virDomainNumatuneMaybeFormatNodeset(numatune,
|
virDomainNumatuneMaybeFormatNodeset(numatune,
|
||||||
priv->autoNodeset,
|
priv->autoNodeset,
|
||||||
&mem_mask, -1) < 0)
|
&mem_mask, -1) < 0) {
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -2705,8 +2700,7 @@ qemuProcessSetupEmulator(virDomainObj *vm)
|
|||||||
0, vm->def->cputune.emulatorpin,
|
0, vm->def->cputune.emulatorpin,
|
||||||
vm->def->cputune.emulator_period,
|
vm->def->cputune.emulator_period,
|
||||||
vm->def->cputune.emulator_quota,
|
vm->def->cputune.emulator_quota,
|
||||||
vm->def->cputune.emulatorsched,
|
vm->def->cputune.emulatorsched);
|
||||||
true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -5909,8 +5903,7 @@ qemuProcessSetupVcpu(virDomainObj *vm,
|
|||||||
vcpuid, vcpu->cpumask,
|
vcpuid, vcpu->cpumask,
|
||||||
vm->def->cputune.period,
|
vm->def->cputune.period,
|
||||||
vm->def->cputune.quota,
|
vm->def->cputune.quota,
|
||||||
&vcpu->sched,
|
&vcpu->sched) < 0)
|
||||||
true) < 0)
|
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if (schedCore &&
|
if (schedCore &&
|
||||||
@ -6065,8 +6058,7 @@ qemuProcessSetupIOThread(virDomainObj *vm,
|
|||||||
iothread->cpumask,
|
iothread->cpumask,
|
||||||
vm->def->cputune.iothread_period,
|
vm->def->cputune.iothread_period,
|
||||||
vm->def->cputune.iothread_quota,
|
vm->def->cputune.iothread_quota,
|
||||||
&iothread->sched,
|
&iothread->sched);
|
||||||
true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user