<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Sep 18, 2018 at 5:45 PM, Pavel Hrdina <span dir="ltr"><<a href="mailto:phrdina@redhat.com" target="_blank">phrdina@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Pavel Hrdina <<a href="mailto:phrdina@redhat.com" target="_blank">phrdina@redhat.com</a>><br></blockquote><div><br></div><div>Reviewed-by: Fabiano Fidêncio <<a href="mailto:fidencio@redhat.com" target="_blank">fidencio@redhat.com</a>><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
---<br>
src/util/vircgroup.c | 20 +-------------------<br>
src/util/vircgroupbackend.h | 6 ++++++<br>
src/util/vircgroupv1.c | 28 ++++++++++++++++++++++++++++<br>
3 files changed, 35 insertions(+), 19 deletions(-)<br>
<br>
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c<br>
index ab50342dbb..b1c1bc9cf0 100644<br>
--- a/src/util/vircgroup.c<br>
+++ b/src/util/vircgroup.c<br>
@@ -1595,25 +1595,7 @@ virCgroupGetMemoryUnlimitedKB(<wbr>void)<br>
int<br>
virCgroupSetMemory(virCgroupP<wbr>tr group, unsigned long long kb)<br>
{<br>
- unsigned long long maxkb = VIR_DOMAIN_MEMORY_PARAM_UNLIMI<wbr>TED;<br>
-<br>
- if (kb > maxkb) {<br>
- virReportError(VIR_ERR_INVALID<wbr>_ARG,<br>
- _("Memory '%llu' must be less than %llu"),<br>
- kb, maxkb);<br>
- return -1;<br>
- }<br>
-<br>
- if (kb == maxkb)<br>
- return virCgroupSetValueI64(group,<br>
- VIR_CGROUP_CONTROLLER_MEMORY,<br>
- "memory.limit_in_bytes",<br>
- -1);<br>
- else<br>
- return virCgroupSetValueU64(group,<br>
- VIR_CGROUP_CONTROLLER_MEMORY,<br>
- "memory.limit_in_bytes",<br>
- kb << 10);<br>
+ VIR_CGROUP_BACKEND_CALL(group, setMemory, -1, kb);<br>
}<br>
<br>
<br>
diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h<br>
index b59462d6ab..2d59e4af20 100644<br>
--- a/src/util/vircgroupbackend.h<br>
+++ b/src/util/vircgroupbackend.h<br>
@@ -202,6 +202,10 @@ typedef int<br>
const char *path,<br>
unsigned long long *wbps);<br>
<br>
+typedef int<br>
+(*virCgroupSetMemoryCB)(virCg<wbr>roupPtr group,<br>
+ unsigned long long kb);<br>
+<br>
struct _virCgroupBackend {<br>
virCgroupBackendType type;<br>
<br>
@@ -240,6 +244,8 @@ struct _virCgroupBackend {<br>
<wbr>virCgroupGetBlkioDeviceReadBps<wbr>CB getBlkioDeviceReadBps;<br>
<wbr>virCgroupSetBlkioDeviceWriteBp<wbr>sCB setBlkioDeviceWriteBps;<br>
<wbr>virCgroupGetBlkioDeviceWriteBp<wbr>sCB getBlkioDeviceWriteBps;<br>
+<br>
+ virCgroupSetMemoryCB setMemory;<br>
};<br>
typedef struct _virCgroupBackend virCgroupBackend;<br>
typedef virCgroupBackend *virCgroupBackendPtr;<br>
diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c<br>
index 4f6d20e31f..3235ef3d2d 100644<br>
--- a/src/util/vircgroupv1.c<br>
+++ b/src/util/vircgroupv1.c<br>
@@ -1377,6 +1377,32 @@ virCgroupV1GetBlkioDeviceWrite<wbr>Bps(virCgroupPtr group,<br>
}<br>
<br>
<br>
+static int<br>
+virCgroupV1SetMemory(virCgrou<wbr>pPtr group,<br>
+ unsigned long long kb)<br>
+{<br>
+ unsigned long long maxkb = VIR_DOMAIN_MEMORY_PARAM_UNLIMI<wbr>TED;<br>
+<br>
+ if (kb > maxkb) {<br>
+ virReportError(VIR_ERR_INVALID<wbr>_ARG,<br>
+ _("Memory '%llu' must be less than %llu"),<br>
+ kb, maxkb);<br>
+ return -1;<br>
+ }<br>
+<br>
+ if (kb == maxkb)<br>
+ return virCgroupSetValueI64(group,<br>
+ VIR_CGROUP_CONTROLLER_MEMORY,<br>
+ "memory.limit_in_bytes",<br>
+ -1);<br>
+ else<br>
+ return virCgroupSetValueU64(group,<br>
+ VIR_CGROUP_CONTROLLER_MEMORY,<br>
+ "memory.limit_in_bytes",<br>
+ kb << 10);<br>
+}<br>
+<br>
+<br>
virCgroupBackend virCgroupV1Backend = {<br>
.type = VIR_CGROUP_BACKEND_TYPE_V1,<br>
<br>
@@ -1413,6 +1439,8 @@ virCgroupBackend virCgroupV1Backend = {<br>
.getBlkioDeviceReadBps = virCgroupV1GetBlkioDeviceReadB<wbr>ps,<br>
.setBlkioDeviceWriteBps = virCgroupV1SetBlkioDeviceWrite<wbr>Bps,<br>
.getBlkioDeviceWriteBps = virCgroupV1GetBlkioDeviceWrite<wbr>Bps,<br>
+<br>
+ .setMemory = virCgroupV1SetMemory,<br>
};<br>
<span class="m_-2089514148084442524HOEnZb"><font color="#888888"> <br>
<br>
-- <br>
2.17.1<br>
<br>
--<br>
libvir-list mailing list<br>
<a href="mailto:libvir-list@redhat.com" target="_blank">libvir-list@redhat.com</a><br>
<a href="https://www.redhat.com/mailman/listinfo/libvir-list" rel="noreferrer" target="_blank">https://www.redhat.com/mailman<wbr>/listinfo/libvir-list</a><br>
</font></span></blockquote></div><br></div></div>