6291e25165
- sync some bugfix patches from upstream - support vhostuser disk - libvirt: support dirtyrate (calc-dirty-rate, dirtyrate-param.mode) Signed-off-by: yezengruan <yezengruan@huawei.com>
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From 420abccb9e834938a5f03726559f044fb0aa426b Mon Sep 17 00:00:00 2001
|
|
From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
Date: Tue, 29 Nov 2022 09:36:57 +0000
|
|
Subject: [PATCH 05/24] virCgroupKillRecursive: Return -1 on failure condition
|
|
virCgroupKillRecursive sneakily initializes 'ret' to 0 rather than the usual
|
|
-1. 401030499bf moved an error condition but didn't actually modify 'ret'
|
|
return the proper error code.
|
|
|
|
Fixes: 401030499bf
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
|
Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
|
|
(cherry-pick from 0778cff2aedd1da142562c396d482335df18e620)
|
|
---
|
|
src/util/vircgroup.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
|
|
index 70d85200cb..f52a8cc843 100644
|
|
--- a/src/util/vircgroup.c
|
|
+++ b/src/util/vircgroup.c
|
|
@@ -2613,6 +2613,7 @@ virCgroupKillRecursive(virCgroupPtr group, int signum)
|
|
if (!backends || !backendAvailable) {
|
|
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
_("no cgroup backend available"));
|
|
+ ret = -1;
|
|
goto cleanup;
|
|
}
|
|
|
|
--
|
|
2.27.0
|
|
|