render / rpms / libvirt

Forked from rpms/libvirt 5 months ago
Clone
Pablo Greco 40546a
From 9697d24cc223028555629af325af8607de350d06 Mon Sep 17 00:00:00 2001
Pablo Greco 40546a
Message-Id: <9697d24cc223028555629af325af8607de350d06@dist-git>
Pablo Greco 40546a
From: Pavel Hrdina <phrdina@redhat.com>
Pablo Greco 40546a
Date: Mon, 1 Jul 2019 17:07:39 +0200
Pablo Greco 40546a
Subject: [PATCH] vircgroup: introduce virCgroupV2SetMemory
Pablo Greco 40546a
MIME-Version: 1.0
Pablo Greco 40546a
Content-Type: text/plain; charset=UTF-8
Pablo Greco 40546a
Content-Transfer-Encoding: 8bit
Pablo Greco 40546a
Pablo Greco 40546a
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Pablo Greco 40546a
(cherry picked from commit 63bd23a6ad17331cdc31bc07fd8b21a96d4b2eb0)
Pablo Greco 40546a
Pablo Greco 40546a
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
Pablo Greco 40546a
Pablo Greco 40546a
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Pablo Greco 40546a
Message-Id: <d2076f596f9e8b58571e19334f23e295f72a2ee5.1561993100.git.phrdina@redhat.com>
Pablo Greco 40546a
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Pablo Greco 40546a
---
Pablo Greco 40546a
 src/util/vircgroupv2.c | 29 +++++++++++++++++++++++++++++
Pablo Greco 40546a
 1 file changed, 29 insertions(+)
Pablo Greco 40546a
Pablo Greco 40546a
diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
Pablo Greco 40546a
index 52d31925c2..1b7215d98b 100644
Pablo Greco 40546a
--- a/src/util/vircgroupv2.c
Pablo Greco 40546a
+++ b/src/util/vircgroupv2.c
Pablo Greco 40546a
@@ -1015,6 +1015,33 @@ virCgroupV2GetBlkioDeviceWriteBps(virCgroupPtr group,
Pablo Greco 40546a
 }
Pablo Greco 40546a
 
Pablo Greco 40546a
 
Pablo Greco 40546a
+static int
Pablo Greco 40546a
+virCgroupV2SetMemory(virCgroupPtr group,
Pablo Greco 40546a
+                     unsigned long long kb)
Pablo Greco 40546a
+{
Pablo Greco 40546a
+    unsigned long long maxkb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED;
Pablo Greco 40546a
+
Pablo Greco 40546a
+    if (kb > maxkb) {
Pablo Greco 40546a
+        virReportError(VIR_ERR_INVALID_ARG,
Pablo Greco 40546a
+                       _("Memory '%llu' must be less than %llu"),
Pablo Greco 40546a
+                       kb, maxkb);
Pablo Greco 40546a
+        return -1;
Pablo Greco 40546a
+    }
Pablo Greco 40546a
+
Pablo Greco 40546a
+    if (kb == maxkb) {
Pablo Greco 40546a
+        return virCgroupSetValueStr(group,
Pablo Greco 40546a
+                                    VIR_CGROUP_CONTROLLER_MEMORY,
Pablo Greco 40546a
+                                    "memory.max",
Pablo Greco 40546a
+                                    "max");
Pablo Greco 40546a
+    } else {
Pablo Greco 40546a
+        return virCgroupSetValueU64(group,
Pablo Greco 40546a
+                                    VIR_CGROUP_CONTROLLER_MEMORY,
Pablo Greco 40546a
+                                    "memory.max",
Pablo Greco 40546a
+                                    kb << 10);
Pablo Greco 40546a
+    }
Pablo Greco 40546a
+}
Pablo Greco 40546a
+
Pablo Greco 40546a
+
Pablo Greco 40546a
 virCgroupBackend virCgroupV2Backend = {
Pablo Greco 40546a
     .type = VIR_CGROUP_BACKEND_TYPE_V2,
Pablo Greco 40546a
 
Pablo Greco 40546a
@@ -1051,6 +1078,8 @@ virCgroupBackend virCgroupV2Backend = {
Pablo Greco 40546a
     .getBlkioDeviceReadBps = virCgroupV2GetBlkioDeviceReadBps,
Pablo Greco 40546a
     .setBlkioDeviceWriteBps = virCgroupV2SetBlkioDeviceWriteBps,
Pablo Greco 40546a
     .getBlkioDeviceWriteBps = virCgroupV2GetBlkioDeviceWriteBps,
Pablo Greco 40546a
+
Pablo Greco 40546a
+    .setMemory = virCgroupV2SetMemory,
Pablo Greco 40546a
 };
Pablo Greco 40546a
 
Pablo Greco 40546a
 
Pablo Greco 40546a
-- 
Pablo Greco 40546a
2.22.0
Pablo Greco 40546a