forked from rpms/libvirt
182 lines
6.2 KiB
Diff
182 lines
6.2 KiB
Diff
From a9c415edc1bc386ac6f4be91e98fe23469b62011 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <a9c415edc1bc386ac6f4be91e98fe23469b62011@dist-git>
|
|
From: Pavel Hrdina <phrdina@redhat.com>
|
|
Date: Mon, 1 Jul 2019 17:06:48 +0200
|
|
Subject: [PATCH] vircgroup: extract virCgroupV1(Set|Get)BlkioDeviceWriteBps
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
(cherry picked from commit 02fe32d3aa965b21342bc2dee245e6e8e5ca8bf7)
|
|
|
|
Conflicts:
|
|
src/util/vircgroup.c - missing commit 34e9c29357
|
|
|
|
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
|
|
|
|
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
Message-Id: <3bbdc28fe71070c8e351679a17d6889b866b46fd.1561993100.git.phrdina@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
---
|
|
src/util/vircgroup.c | 34 ++-----------------------
|
|
src/util/vircgroupbackend.h | 12 +++++++++
|
|
src/util/vircgroupv1.c | 50 +++++++++++++++++++++++++++++++++++++
|
|
3 files changed, 64 insertions(+), 32 deletions(-)
|
|
|
|
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
|
|
index ab587ea306..684bce4997 100644
|
|
--- a/src/util/vircgroup.c
|
|
+++ b/src/util/vircgroup.c
|
|
@@ -1435,19 +1435,7 @@ virCgroupSetBlkioDeviceWriteBps(virCgroupPtr group,
|
|
const char *path,
|
|
unsigned long long wbps)
|
|
{
|
|
- VIR_AUTOFREE(char *) str = NULL;
|
|
- VIR_AUTOFREE(char *) blkstr = NULL;
|
|
-
|
|
- if (!(blkstr = virCgroupGetBlockDevString(path)))
|
|
- return -1;
|
|
-
|
|
- if (virAsprintf(&str, "%s%llu", blkstr, wbps) < 0)
|
|
- return -1;
|
|
-
|
|
- return virCgroupSetValueStr(group,
|
|
- VIR_CGROUP_CONTROLLER_BLKIO,
|
|
- "blkio.throttle.write_bps_device",
|
|
- str);
|
|
+ VIR_CGROUP_BACKEND_CALL(group, setBlkioDeviceWriteBps, -1, path, wbps);
|
|
}
|
|
|
|
|
|
@@ -1529,25 +1517,7 @@ virCgroupGetBlkioDeviceWriteBps(virCgroupPtr group,
|
|
const char *path,
|
|
unsigned long long *wbps)
|
|
{
|
|
- VIR_AUTOFREE(char *) str = NULL;
|
|
-
|
|
- if (virCgroupGetValueForBlkDev(group,
|
|
- VIR_CGROUP_CONTROLLER_BLKIO,
|
|
- "blkio.throttle.write_bps_device",
|
|
- path,
|
|
- &str) < 0)
|
|
- return -1;
|
|
-
|
|
- if (!str) {
|
|
- *wbps = 0;
|
|
- } else if (virStrToLong_ull(str, NULL, 10, wbps) < 0) {
|
|
- virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
- _("Unable to parse '%s' as an integer"),
|
|
- str);
|
|
- return -1;
|
|
- }
|
|
-
|
|
- return 0;
|
|
+ VIR_CGROUP_BACKEND_CALL(group, getBlkioDeviceWriteBps, -1, path, wbps);
|
|
}
|
|
|
|
/**
|
|
diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
|
|
index 3f1055a5d8..67e795a2b7 100644
|
|
--- a/src/util/vircgroupbackend.h
|
|
+++ b/src/util/vircgroupbackend.h
|
|
@@ -200,6 +200,16 @@ typedef int
|
|
const char *path,
|
|
unsigned long long *rbps);
|
|
|
|
+typedef int
|
|
+(*virCgroupSetBlkioDeviceWriteBpsCB)(virCgroupPtr group,
|
|
+ const char *path,
|
|
+ unsigned long long wbps);
|
|
+
|
|
+typedef int
|
|
+(*virCgroupGetBlkioDeviceWriteBpsCB)(virCgroupPtr group,
|
|
+ const char *path,
|
|
+ unsigned long long *wbps);
|
|
+
|
|
struct _virCgroupBackend {
|
|
virCgroupBackendType type;
|
|
|
|
@@ -236,6 +246,8 @@ struct _virCgroupBackend {
|
|
virCgroupGetBlkioDeviceWriteIopsCB getBlkioDeviceWriteIops;
|
|
virCgroupSetBlkioDeviceReadBpsCB setBlkioDeviceReadBps;
|
|
virCgroupGetBlkioDeviceReadBpsCB getBlkioDeviceReadBps;
|
|
+ virCgroupSetBlkioDeviceWriteBpsCB setBlkioDeviceWriteBps;
|
|
+ virCgroupGetBlkioDeviceWriteBpsCB getBlkioDeviceWriteBps;
|
|
};
|
|
typedef struct _virCgroupBackend virCgroupBackend;
|
|
typedef virCgroupBackend *virCgroupBackendPtr;
|
|
diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
|
|
index e5663ccfb9..c044414dfd 100644
|
|
--- a/src/util/vircgroupv1.c
|
|
+++ b/src/util/vircgroupv1.c
|
|
@@ -1330,6 +1330,54 @@ virCgroupV1GetBlkioDeviceReadBps(virCgroupPtr group,
|
|
}
|
|
|
|
|
|
+static int
|
|
+virCgroupV1SetBlkioDeviceWriteBps(virCgroupPtr group,
|
|
+ const char *path,
|
|
+ unsigned long long wbps)
|
|
+{
|
|
+ VIR_AUTOFREE(char *) str = NULL;
|
|
+ VIR_AUTOFREE(char *) blkstr = NULL;
|
|
+
|
|
+ if (!(blkstr = virCgroupGetBlockDevString(path)))
|
|
+ return -1;
|
|
+
|
|
+ if (virAsprintf(&str, "%s%llu", blkstr, wbps) < 0)
|
|
+ return -1;
|
|
+
|
|
+ return virCgroupSetValueStr(group,
|
|
+ VIR_CGROUP_CONTROLLER_BLKIO,
|
|
+ "blkio.throttle.write_bps_device",
|
|
+ str);
|
|
+}
|
|
+
|
|
+
|
|
+static int
|
|
+virCgroupV1GetBlkioDeviceWriteBps(virCgroupPtr group,
|
|
+ const char *path,
|
|
+ unsigned long long *wbps)
|
|
+{
|
|
+ VIR_AUTOFREE(char *) str = NULL;
|
|
+
|
|
+ if (virCgroupGetValueForBlkDev(group,
|
|
+ VIR_CGROUP_CONTROLLER_BLKIO,
|
|
+ "blkio.throttle.write_bps_device",
|
|
+ path,
|
|
+ &str) < 0)
|
|
+ return -1;
|
|
+
|
|
+ if (!str) {
|
|
+ *wbps = 0;
|
|
+ } else if (virStrToLong_ull(str, NULL, 10, wbps) < 0) {
|
|
+ virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
+ _("Unable to parse '%s' as an integer"),
|
|
+ str);
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+
|
|
virCgroupBackend virCgroupV1Backend = {
|
|
.type = VIR_CGROUP_BACKEND_TYPE_V1,
|
|
|
|
@@ -1364,6 +1412,8 @@ virCgroupBackend virCgroupV1Backend = {
|
|
.getBlkioDeviceWriteIops = virCgroupV1GetBlkioDeviceWriteIops,
|
|
.setBlkioDeviceReadBps = virCgroupV1SetBlkioDeviceReadBps,
|
|
.getBlkioDeviceReadBps = virCgroupV1GetBlkioDeviceReadBps,
|
|
+ .setBlkioDeviceWriteBps = virCgroupV1SetBlkioDeviceWriteBps,
|
|
+ .getBlkioDeviceWriteBps = virCgroupV1GetBlkioDeviceWriteBps,
|
|
};
|
|
|
|
|
|
--
|
|
2.22.0
|
|
|