10:45 a.m.
Signed-off-by: Pavel Hrdina <phrdina(a)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 5fbad25d5c..3fa8aebe04 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -1404,19 +1404,7 @@ virCgroupSetBlkioDeviceWriteIops(virCgroupPtr group,
const char *path,
unsigned int wiops)
{
- VIR_AUTOFREE(char *) str = NULL;
- VIR_AUTOFREE(char *) blkstr = NULL;
-
- if (!(blkstr = virCgroupGetBlockDevString(path)))
- return -1;
-
- if (virAsprintf(&str, "%s%u", blkstr, wiops) < 0)
- return -1;
-
- return virCgroupSetValueStr(group,
- VIR_CGROUP_CONTROLLER_BLKIO,
- "blkio.throttle.write_iops_device",
- str);
+ VIR_CGROUP_BACKEND_CALL(group, setBlkioDeviceWriteIops, -1, path, wiops);
}
@@ -1523,25 +1511,7 @@ virCgroupGetBlkioDeviceWriteIops(virCgroupPtr group,
const char *path,
unsigned int *wiops)
{
- VIR_AUTOFREE(char *) str = NULL;
-
- if (virCgroupGetValueForBlkDev(group,
- VIR_CGROUP_CONTROLLER_BLKIO,
- "blkio.throttle.write_iops_device",
- path,
- &str) < 0)
- return -1;
-
- if (!str) {
- *wiops = 0;
- } else if (virStrToLong_ui(str, NULL, 10, wiops) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Unable to parse '%s' as an integer"),
- str);
- return -1;
- }
-
- return 0;
+ VIR_CGROUP_BACKEND_CALL(group, getBlkioDeviceWriteIops, -1, path, wiops);
}
/**
diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
index 813ed61b6a..e19a3820bf 100644
--- a/src/util/vircgroupbackend.h
+++ b/src/util/vircgroupbackend.h
@@ -172,6 +172,16 @@ typedef int
const char *path,
unsigned int *riops);
+typedef int
+(*virCgroupSetBlkioDeviceWriteIopsCB)(virCgroupPtr group,
+ const char *path,
+ unsigned int wiops);
+
+typedef int
+(*virCgroupGetBlkioDeviceWriteIopsCB)(virCgroupPtr group,
+ const char *path,
+ unsigned int *wiops);
+
struct _virCgroupBackend {
virCgroupBackendType type;
@@ -204,6 +214,8 @@ struct _virCgroupBackend {
virCgroupGetBlkioDeviceWeightCB getBlkioDeviceWeight;
virCgroupSetBlkioDeviceReadIopsCB setBlkioDeviceReadIops;
virCgroupGetBlkioDeviceReadIopsCB getBlkioDeviceReadIops;
+ virCgroupSetBlkioDeviceWriteIopsCB setBlkioDeviceWriteIops;
+ virCgroupGetBlkioDeviceWriteIopsCB getBlkioDeviceWriteIops;
};
typedef struct _virCgroupBackend virCgroupBackend;
typedef virCgroupBackend *virCgroupBackendPtr;
diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
index d418ef41df..feeefc287d 100644
--- a/src/util/vircgroupv1.c
+++ b/src/util/vircgroupv1.c
@@ -1233,6 +1233,54 @@ virCgroupV1GetBlkioDeviceReadIops(virCgroupPtr group,
}
+static int
+virCgroupV1SetBlkioDeviceWriteIops(virCgroupPtr group,
+ const char *path,
+ unsigned int wiops)
+{
+ VIR_AUTOFREE(char *) str = NULL;
+ VIR_AUTOFREE(char *) blkstr = NULL;
+
+ if (!(blkstr = virCgroupGetBlockDevString(path)))
+ return -1;
+
+ if (virAsprintf(&str, "%s%u", blkstr, wiops) < 0)
+ return -1;
+
+ return virCgroupSetValueStr(group,
+ VIR_CGROUP_CONTROLLER_BLKIO,
+ "blkio.throttle.write_iops_device",
+ str);
+}
+
+
+static int
+virCgroupV1GetBlkioDeviceWriteIops(virCgroupPtr group,
+ const char *path,
+ unsigned int *wiops)
+{
+ VIR_AUTOFREE(char *) str = NULL;
+
+ if (virCgroupGetValueForBlkDev(group,
+ VIR_CGROUP_CONTROLLER_BLKIO,
+ "blkio.throttle.write_iops_device",
+ path,
+ &str) < 0)
+ return -1;
+
+ if (!str) {
+ *wiops = 0;
+ } else if (virStrToLong_ui(str, NULL, 10, wiops) < 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,
@@ -1263,6 +1311,8 @@ virCgroupBackend virCgroupV1Backend = {
.getBlkioDeviceWeight = virCgroupV1GetBlkioDeviceWeight,
.setBlkioDeviceReadIops = virCgroupV1SetBlkioDeviceReadIops,
.getBlkioDeviceReadIops = virCgroupV1GetBlkioDeviceReadIops,
+ .setBlkioDeviceWriteIops = virCgroupV1SetBlkioDeviceWriteIops,
+ .getBlkioDeviceWriteIops = virCgroupV1GetBlkioDeviceWriteIops,
};
--
2.17.1