[libvirt] [PATCH 1/3] qemu: Add missing goto error in qemuRestoreCgroupState

Martin Kletzander mkletzan at redhat.com
Tue Dec 16 19:13:53 UTC 2014


Commit af2a1f05 tried clearly separating each condition in
qemuRestoreCgroupState() for the sake of readability, however somehow
one condition body was missing.  That means that the body of the next
condition got executed only if both of there were true, which is
impossible, thus resulting in a dead code and a logic error.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 src/qemu/qemu_cgroup.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index 1e383c4..164ad05 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -801,6 +801,7 @@ qemuRestoreCgroupState(virDomainObjPtr vm)

     if ((empty = virCgroupHasEmptyTasks(priv->cgroup,
                                         VIR_CGROUP_CONTROLLER_CPUSET)) < 0)
+        goto error;

     if (!empty)
         goto error;
-- 
2.2.0




More information about the libvir-list mailing list