<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 | 34 ++-----------------------<br>
src/util/vircgroupbackend.h | 12 +++++++++<br>
src/util/vircgroupv1.c | 50 ++++++++++++++++++++++++++++++<wbr>+++++++<br>
3 files changed, 64 insertions(+), 32 deletions(-)<br>
<br>
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c<br>
index 5fbad25d5c..3fa8aebe04 100644<br>
--- a/src/util/vircgroup.c<br>
+++ b/src/util/vircgroup.c<br>
@@ -1404,19 +1404,7 @@ virCgroupSetBlkioDeviceWriteIo<wbr>ps(virCgroupPtr group,<br>
const char *path,<br>
unsigned int wiops)<br>
{<br>
- VIR_AUTOFREE(char *) str = NULL;<br>
- VIR_AUTOFREE(char *) blkstr = NULL;<br>
-<br>
- if (!(blkstr = virCgroupGetBlockDevString(pat<wbr>h)))<br>
- return -1;<br>
-<br>
- if (virAsprintf(&str, "%s%u", blkstr, wiops) < 0)<br>
- return -1;<br>
-<br>
- return virCgroupSetValueStr(group,<br>
- VIR_CGROUP_CONTROLLER_BLKIO,<br>
- "blkio.throttle.write_iops_de<wbr>vice",<br>
- str);<br>
+ VIR_CGROUP_BACKEND_CALL(group, setBlkioDeviceWriteIops, -1, path, wiops);<br>
}<br>
<br>
<br>
@@ -1523,25 +1511,7 @@ virCgroupGetBlkioDeviceWriteIo<wbr>ps(virCgroupPtr group,<br>
const char *path,<br>
unsigned int *wiops)<br>
{<br>
- VIR_AUTOFREE(char *) str = NULL;<br>
-<br>
- if (virCgroupGetValueForBlkDev(gr<wbr>oup,<br>
- VIR_CGROUP_CONTROLLER_BLKIO,<br>
- "blkio.throttle.write_iops_de<wbr>vice",<br>
- path,<br>
- &str) < 0)<br>
- return -1;<br>
-<br>
- if (!str) {<br>
- *wiops = 0;<br>
- } else if (virStrToLong_ui(str, NULL, 10, wiops) < 0) {<br>
- virReportError(VIR_ERR_INTERNA<wbr>L_ERROR,<br>
- _("Unable to parse '%s' as an integer"),<br>
- str);<br>
- return -1;<br>
- }<br>
-<br>
- return 0;<br>
+ VIR_CGROUP_BACKEND_CALL(group, getBlkioDeviceWriteIops, -1, path, wiops);<br>
}<br>
<br>
/**<br>
diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h<br>
index 813ed61b6a..e19a3820bf 100644<br>
--- a/src/util/vircgroupbackend.h<br>
+++ b/src/util/vircgroupbackend.h<br>
@@ -172,6 +172,16 @@ typedef int<br>
const char *path,<br>
unsigned int *riops);<br>
<br>
+typedef int<br>
+(*virCgroupSetBlkioDeviceWrit<wbr>eIopsCB)(virCgroupPtr group,<br>
+ const char *path,<br>
+ unsigned int wiops);<br>
+<br>
+typedef int<br>
+(*virCgroupGetBlkioDeviceWrit<wbr>eIopsCB)(virCgroupPtr group,<br>
+ const char *path,<br>
+ unsigned int *wiops);<br>
+<br>
struct _virCgroupBackend {<br>
virCgroupBackendType type;<br>
<br>
@@ -204,6 +214,8 @@ struct _virCgroupBackend {<br>
<wbr>virCgroupGetBlkioDeviceWeightC<wbr>B getBlkioDeviceWeight;<br>
<wbr>virCgroupSetBlkioDeviceReadIop<wbr>sCB setBlkioDeviceReadIops;<br>
<wbr>virCgroupGetBlkioDeviceReadIop<wbr>sCB getBlkioDeviceReadIops;<br>
+ virCgroupSetBlkioDeviceWriteIo<wbr>psCB setBlkioDeviceWriteIops;<br>
+ virCgroupGetBlkioDeviceWriteIo<wbr>psCB getBlkioDeviceWriteIops;<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 d418ef41df..feeefc287d 100644<br>
--- a/src/util/vircgroupv1.c<br>
+++ b/src/util/vircgroupv1.c<br>
@@ -1233,6 +1233,54 @@ virCgroupV1GetBlkioDeviceReadI<wbr>ops(virCgroupPtr group,<br>
}<br>
<br>
<br>
+static int<br>
+virCgroupV1SetBlkioDeviceWrit<wbr>eIops(virCgroupPtr group,<br>
+ const char *path,<br>
+ unsigned int wiops)<br>
+{<br>
+ VIR_AUTOFREE(char *) str = NULL;<br>
+ VIR_AUTOFREE(char *) blkstr = NULL;<br>
+<br>
+ if (!(blkstr = virCgroupGetBlockDevString(pat<wbr>h)))<br>
+ return -1;<br>
+<br>
+ if (virAsprintf(&str, "%s%u", blkstr, wiops) < 0)<br>
+ return -1;<br>
+<br>
+ return virCgroupSetValueStr(group,<br>
+ VIR_CGROUP_CONTROLLER_BLKIO,<br>
+ "blkio.throttle.write_iops_dev<wbr>ice",<br>
+ str);<br>
+}<br>
+<br>
+<br>
+static int<br>
+virCgroupV1GetBlkioDeviceWrit<wbr>eIops(virCgroupPtr group,<br>
+ const char *path,<br>
+ unsigned int *wiops)<br>
+{<br>
+ VIR_AUTOFREE(char *) str = NULL;<br>
+<br>
+ if (virCgroupGetValueForBlkDev(gr<wbr>oup,<br>
+ VIR_CGROUP_CONTROLLER_BLKIO,<br>
+ "blkio.throttle.write_iops_de<wbr>vice",<br>
+ path,<br>
+ &str) < 0)<br>
+ return -1;<br>
+<br>
+ if (!str) {<br>
+ *wiops = 0;<br>
+ } else if (virStrToLong_ui(str, NULL, 10, wiops) < 0) {<br>
+ virReportError(VIR_ERR_INTERNA<wbr>L_ERROR,<br>
+ _("Unable to parse '%s' as an integer"),<br>
+ str);<br>
+ return -1;<br>
+ }<br>
+<br>
+ return 0;<br>
+}<br>
+<br>
+<br>
virCgroupBackend virCgroupV1Backend = {<br>
.type = VIR_CGROUP_BACKEND_TYPE_V1,<br>
<br>
@@ -1263,6 +1311,8 @@ virCgroupBackend virCgroupV1Backend = {<br>
.getBlkioDeviceWeight = virCgroupV1GetBlkioDeviceWeigh<wbr>t,<br>
.setBlkioDeviceReadIops = virCgroupV1SetBlkioDeviceReadI<wbr>ops,<br>
.getBlkioDeviceReadIops = virCgroupV1GetBlkioDeviceReadI<wbr>ops,<br>
+ .setBlkioDeviceWriteIops = virCgroupV1SetBlkioDeviceWrite<wbr>Iops,<br>
+ .getBlkioDeviceWriteIops = virCgroupV1GetBlkioDeviceWrite<wbr>Iops,<br>
};<br>
<span class="m_8903434922279023768HOEnZb"><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>