On 15.05.2013 11:53, Daniel P. Berrange wrote:
From: "Daniel P. Berrange" <berrange@redhat.com>
Many methods accept a string parameter specifying the old root directory prefix. Since removal of the non-pivot root container setup codepaths, this parameter is obsolete in many methods where the callers always pass "/.oldroot".
Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- src/lxc/lxc_container.c | 85 ++++++++++++++++++++----------------------------- 1 file changed, 35 insertions(+), 50 deletions(-)
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index f0a085e..1ebb625 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -745,15 +745,14 @@ cleanup: }
#if WITH_FUSE -static int lxcContainerMountProcFuse(virDomainDefPtr def, - const char *srcprefix) +static int lxcContainerMountProcFuse(virDomainDefPtr def) { int ret; char *meminfo_path = NULL;
if ((ret = virAsprintf(&meminfo_path, - "%s/%s/%s.fuse/meminfo", - srcprefix ? srcprefix : "", LXC_STATE_DIR, + "/.oldroot/%s/%s.fuse/meminfo",
Don't we wanna define "/.oldroot/" as a macro?
+ LXC_STATE_DIR, def->name)) < 0) return ret;