45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From a5fc7d4f76779c242d78ecf78317ff68c330b78b Mon Sep 17 00:00:00 2001
|
|
From: Pavel Hrdina <phrdina@redhat.com>
|
|
Date: Tue, 11 Aug 2020 15:56:54 +0200
|
|
Subject: [PATCH 065/108] qemu: fix crash in qemuDomainSetBlkioParameters
|
|
without cgroups
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
If we don't have cgroups available and user tries to update blkio
|
|
parameters for running VM it will crash.
|
|
|
|
It should have been protected by the virCgroupHasController() check but
|
|
it was never called if the API was executed without any flags.
|
|
|
|
We call virDomainObjGetDefs() which sets `def` and `persistentDef` based
|
|
on the flags and these two variables should be used to figure out if we
|
|
need to update LIVE, CONFIG or both states.
|
|
|
|
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1808293
|
|
|
|
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
(cherry picked from commit a6886aafacaf25d1ce667ae961264ae1eb69900f)
|
|
---
|
|
src/qemu/qemu_driver.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
index 508d246146..41e9bff17b 100644
|
|
--- a/src/qemu/qemu_driver.c
|
|
+++ b/src/qemu/qemu_driver.c
|
|
@@ -9380,7 +9380,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom,
|
|
if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0)
|
|
goto endjob;
|
|
|
|
- if (flags & VIR_DOMAIN_AFFECT_LIVE) {
|
|
+ if (def) {
|
|
if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_BLKIO)) {
|
|
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
|
|
_("blkio cgroup isn't mounted"));
|
|
--
|
|
2.33.0
|
|
|