From: Cédric Bosdonnat <cbosdonnat@suse.com>
Date: Thu, 18 Dec 2014 14:42:06 +0000 (+0100)
Subject: Fix error when starting a container after an error
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a58e1cb40a86f438d82649d5a26f591e226bac29;p=libvirt.git

Fix error when starting a container after an error

The typical case for the problem is starting a domain needing a network
that isn't started. Even after starting the network, we get an unknown error
when starting the container.

This is due to dynamic security label not being removed.
---

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 1c0d4e5bf1..d7eb8bc86f 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -1372,6 +1372,7 @@ int virLXCProcessStart(virConnectPtr conn,
             VIR_FREE(vm->def->seclabels[0]->model);
             VIR_FREE(vm->def->seclabels[0]->label);
             VIR_FREE(vm->def->seclabels[0]->imagelabel);
+            VIR_DELETE_ELEMENT(vm->def->seclabels, 0, vm->def->nseclabels);
         }
     }
     for (i = 0; i < nttyFDs; i++)