Revert "qemu: Forbid <memoryBacking><locked> without <memtune><hard_limit>"

This reverts commit c2e60ad0e5.

Turns out this check is excessively strict: there are ways
other than <memtune><hard_limit> to raise the memory locking
limit for QEMU processes, one prominent example being
tweaking /etc/security/limits.conf.

Partially-resolves: https://bugzilla.redhat.com/1431793
This commit is contained in:
Andrea Bolognani 2017-03-16 18:23:56 +01:00
parent c2568133bb
commit 4b67e7a377
2 changed files with 0 additions and 13 deletions

View File

@ -2922,16 +2922,6 @@ qemuDomainDefValidate(const virDomainDef *def,
}
}
/* Memory locking can only work properly if the memory locking limit
* for the QEMU process has been raised appropriately: the default one
* is extrememly low, so there's no way the guest will fit in there */
if (def->mem.locked && !virMemoryLimitIsSet(def->mem.hard_limit)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting <memoryBacking><locked> requires "
"<memtune><hard_limit> to be set as well"));
goto cleanup;
}
if (qemuDomainDefValidateVideo(def) < 0)
goto cleanup;

View File

@ -3,9 +3,6 @@
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>219136</memory>
<currentMemory unit='KiB'>219136</currentMemory>
<memtune>
<hard_limit unit='KiB'>256000</hard_limit>
</memtune>
<memoryBacking>
<locked/>
</memoryBacking>