[libvirt] [PATCH] Set default partition in libvirtd instead of libvirt_lxc

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; By setting the default partition in libvirt_lxc it is not visible when querying the live XML. Move setting of the default partition into libvirtd virLXCProcessStart Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/lxc/lxc_cgroup.c | 14 -------------- src/lxc/lxc_process.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index af91b04..0b0ca02 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -433,20 +433,6 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def) { virCgroupPtr cgroup = NULL; - if (!def->resource) { - virDomainResourceDefPtr res; - - if (VIR_ALLOC(res) < 0) - goto cleanup; - - if (VIR_STRDUP(res->partition, "/machine") < 0) { - VIR_FREE(res); - goto cleanup; - } - - def->resource = res; - } - if (def->resource->partition[0] != '/') { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Resource partition '%s' must start with '/'"), diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 1a5686f..247e516 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1007,6 +1007,20 @@ int virLXCProcessStart(virConnectPtr conn, return -1; } + if (!vm->def->resource) { + virDomainResourceDefPtr res; + + if (VIR_ALLOC(res) < 0) + goto cleanup; + + if (VIR_STRDUP(res->partition, "/machine") < 0) { + VIR_FREE(res); + goto cleanup; + } + + vm->def->resource = res; + } + if (virAsprintf(&logfile, "%s/%s.log", cfg->logDir, vm->def->name) < 0) return -1; -- 1.8.1.4