On Tue, Sep 18, 2018 at 05:45:43PM +0200, Pavel Hrdina wrote:
Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- src/util/vircgroup.c | 87 ++-------------------------------- src/util/vircgroupbackend.h | 8 ++++ src/util/vircgroupv1.c | 94 +++++++++++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+), 84 deletions(-) diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index 380a310589..4b9c03830c 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -956,6 +956,99 @@ virCgroupV1GetBlkioWeight(virCgroupPtr group, } +static int +virCgroupV1GetBlkioIoServiced(virCgroupPtr group, + long long *bytes_read, + long long *bytes_write, + long long *requests_read, + long long *requests_write) +{ + long long stats_val; + VIR_AUTOFREE(char *) str1 = NULL; + VIR_AUTOFREE(char *) str2 = NULL;
+ char *p1, *p2;
These were written as:
- char *p1 = NULL; - char *p2 = NULL;
in the original function. Perhaps incorrect conflict resolution with commit 94f1855f util: cgroup: use VIR_AUTOFREE instead of VIR_FREE for scalar types
+ size_t i; + + const char *value_names[] = { + "Read ", + "Write " + };
With that addressed: Reviewed-by: Ján Tomko <jtomko@xxxxxxxxxx> Jano
Attachment:
signature.asc
Description: Digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list