this patch addes fuse support for libvirt lxc. we can use fuse filesystem to generate sysinfo dynamically, So we can isolate /proc/meminfo,cpuinfo and so on through fuse filesystem. we mount fuse filesystem for every container.the mount name is Lxc-containename-fuse,mount point is localstatedir/run/libvirt/lxc/containername. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com&gt;

diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index e5aea11..c5f4951 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1657,6 +1659,14 @@ int main(int argc, char *argv[]) } } + rc = virThreadCreate(&thread, true, lxcRegisterFuse, + (void *)ctrl->def); + if (rc < 0) { + virReportSystemError(-rc, "%s", + _("Create Fuse filesystem failed")); + goto cleanup; + } +

+void lxcRegisterFuse(void *DomainDef)

+{ + int argc = 4; + char *argv[argc]; + char *path = NULL; + char *name = NULL; + virDomainDefPtr def = (virDomainDefPtr) DomainDef; + + if (virAsprintf(&name, "Lxc-%s-fuse", def->name) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (virAsprintf(&path, "%s/%s/", LXC_STATE_DIR, def->name) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (virFileMakePath(path) < 0) { + virReportSystemError(errno, _("Cannot create %s"), path); + goto cleanup; + } + + argv[0] = name; + argv[1] = path; + argv[2] = (char *)"-odirect_io"; + argv[3] = (char *)"-f"; + + if (fuse_main(argc, argv, &lxcProcOper, def) < 0) + virReportSystemError(errno, "%s", _("Cannot start fuse")); + +cleanup: + VIR_FREE(name); + VIR_FREE(path); + return; +} + +void lxcUnregisterFuse(virDomainDefPtr def) +{ + char *path = NULL; + + if (virAsprintf(&path, "%s/%s/", LXC_STATE_DIR, def->name) < 0) { + virReportOOMError(); + return; + } + + if (umount(path) < 0) + virReportSystemError(errno, "%s", + _("umount fuse filesystem failed")); + + VIR_FREE(path); +} + +#else +void lxcRegisterFuse(void *DomainDef ATTRIBUTE_UNUSED) +{ +} + +void lxcUnregisterFuse(virDomainDefPtr def ATTRIBUTE_UNUSED) +{ +} +#endif

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index bcd59cb..d5e1822 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -28,6 +28,7 @@ #include "lxc_process.h" #include "lxc_domain.h" #include "lxc_container.h" +#include "lxc_fuse.h" #include "datatypes.h" #include "virfile.h" #include "virpidfile.h" @@ -232,7 +233,7 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, NULL, xml, NULL); VIR_FREE(xml); } - + lxcUnregisterFuse(vm->def); /* Stop autodestroy in case guest is restarted */ virLXCProcessAutoDestroyRemove(driver, vm);

于 2012年09月26日 02:37, Daniel P. Berrange 写道: > > On Tue, Sep 11, 2012 at 10:54:48AM +0800, Gao feng wrote: >> >> this patch addes fuse support for libvirt lxc. >> >> we can use fuse filesystem to generate sysinfo dynamically, >> >> So we can isolate /proc/meminfo,cpuinfo and so on through >> >> fuse filesystem. >> >> >> >> we mount fuse filesystem for every container.the mount name >> >> is Lxc-containename-fuse,mount point is >> >> localstatedir/run/libvirt/lxc/containername. >> >> >> >> Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com&gt; > > >> >> diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c >> >> index e5aea11..c5f4951 100644 >> >> --- a/src/lxc/lxc_controller.c >> >> +++ b/src/lxc/lxc_controller.c >> >> @@ -1657,6 +1659,14 @@ int main(int argc, char *argv[]) >> >> } >> >> } >> >> >> >> + rc = virThreadCreate(&thread, true, lxcRegisterFuse, >> >> + (void *)ctrl->def); >> >> + if (rc < 0) { >> >> + virReportSystemError(-rc, "%s", >> >> + _("Create Fuse filesystem failed")); >> >> + goto cleanup; >> >> + } >> >> + > > > > This is the wrong place to start FUSE. At this point the LXC > > controller is still sharing its mount namespace with the host > > OS. This causes the FUSE mount for each container to become > > visible in the host, which is not what we want. sorry for the delay. I think it's correct,because host can see container's meminfo through cgroup too.NOW the container's cgroup can be seen and modified in container too,I don't know why this is necessary?

On Mon, Oct 08, 2012 at 08:43:28AM +0800, Gao feng wrote: > 于 2012年09月26日 02:37, Daniel P. Berrange 写道: >> On Tue, Sep 11, 2012 at 10:54:48AM +0800, Gao feng wrote: >>> this patch addes fuse support for libvirt lxc. >>> we can use fuse filesystem to generate sysinfo dynamically, >>> So we can isolate /proc/meminfo,cpuinfo and so on through >>> fuse filesystem. >>> >>> we mount fuse filesystem for every container.the mount name >>> is Lxc-containename-fuse,mount point is >>> localstatedir/run/libvirt/lxc/containername. >>> >>> Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com&gt; >> >>> diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c >>> index e5aea11..c5f4951 100644 >>> --- a/src/lxc/lxc_controller.c >>> +++ b/src/lxc/lxc_controller.c >>> @@ -1657,6 +1659,14 @@ int main(int argc, char *argv[]) >>> } >>> } >>> >>> + rc = virThreadCreate(&thread, true, lxcRegisterFuse, >>> + (void *)ctrl->def); >>> + if (rc < 0) { >>> + virReportSystemError(-rc, "%s", >>> + _("Create Fuse filesystem failed")); >>> + goto cleanup; >>> + } >>> + >> >> This is the wrong place to start FUSE. At this point the LXC >> controller is still sharing its mount namespace with the host >> OS. This causes the FUSE mount for each container to become >> visible in the host, which is not what we want. > sorry for the delay. > > I think it's correct,because host can see container's meminfo > through cgroup too.NOW the container's cgroup can be seen and > modified in container too,I don't know why this is necessary? The key point is that if you do 'cat /proc/mounts' with your current patch, you see all the LXC container FUSE mounts. These mounts should *not* be visible on the host. Only the libvirt_lxc process and the container itself shoudl see the mounts. This is why you must not start FUSE until after the unshare() call in libvirt_lxc. This also ensures that the FUSE mount is automatically destroyed when libvirt_lxc dies, without you needing to unregister or unmount it.

> >> >> We must only start FUSE, after, we have done the unshare() >> call while setting up /dev/pts. Daniel

于 2012年10月16日 20:23, Daniel P. Berrange 写道: > On Mon, Oct 08, 2012 at 08:43:28AM +0800, Gao feng wrote: >> 于 2012年09月26日 02:37, Daniel P. Berrange 写道: >>> On Tue, Sep 11, 2012 at 10:54:48AM +0800, Gao feng wrote: >>>> this patch addes fuse support for libvirt lxc. >>>> we can use fuse filesystem to generate sysinfo dynamically, >>>> So we can isolate /proc/meminfo,cpuinfo and so on through >>>> fuse filesystem. >>>> >>>> we mount fuse filesystem for every container.the mount name >>>> is Lxc-containename-fuse,mount point is >>>> localstatedir/run/libvirt/lxc/containername. >>>> >>>> Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com&gt; >>> >>>> diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c >>>> index e5aea11..c5f4951 100644 >>>> --- a/src/lxc/lxc_controller.c >>>> +++ b/src/lxc/lxc_controller.c >>>> @@ -1657,6 +1659,14 @@ int main(int argc, char *argv[]) >>>> } >>>> } >>>> >>>> + rc = virThreadCreate(&thread, true, lxcRegisterFuse, >>>> + (void *)ctrl->def); >>>> + if (rc < 0) { >>>> + virReportSystemError(-rc, "%s", >>>> + _("Create Fuse filesystem failed")); >>>> + goto cleanup; >>>> + } >>>> + >>> >>> This is the wrong place to start FUSE. At this point the LXC >>> controller is still sharing its mount namespace with the host >>> OS. This causes the FUSE mount for each container to become >>> visible in the host, which is not what we want. >> sorry for the delay. >> >> I think it's correct,because host can see container's meminfo >> through cgroup too.NOW the container's cgroup can be seen and >> modified in container too,I don't know why this is necessary? > > The key point is that if you do 'cat /proc/mounts' with your > current patch, you see all the LXC container FUSE mounts. These > mounts should *not* be visible on the host. Only the libvirt_lxc > process and the container itself shoudl see the mounts. This is > why you must not start FUSE until after the unshare() call in > libvirt_lxc. This also ensures that the FUSE mount is automatically > destroyed when libvirt_lxc dies, without you needing to unregister > or unmount it. > If we start FUSE after the unshare() call in libvirt_lxc,the fuse will work in container's environment. and the cgroup is set in the host. Can we get host's information in container? I think this is incorrect.

I regard the FUSE as a service on host,it provides host's cgroup info for the container.

On Tue, Sep 11, 2012 at 10:54:51AM +0800, Gao feng wrote: > with this patch,container's meminfo will be shown based on > containers' mem cgroup. > > Right now,it's impossible to virtualize all values in meminfo, > I collect some values such as MemTotal,MemFree,Cached,Active, > Inactive,Active(anon),Inactive(anon),Active(file),Inactive(anon), > Active(file),Inactive(file),Unevictable,SwapTotal,SwapFree. > > if I miss something, please let me know. > > Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com&gt; > --- > src/lxc/lxc_cgroup.c | 151 +++++++++++++++++++++++++++++++++++ > src/lxc/lxc_cgroup.h | 1 + > src/lxc/lxc_fuse.c | 216 +++++++++++++++++++++++++++++++++++++++++++++++-- > src/lxc/lxc_fuse.h | 14 +++ > 4 files changed, 373 insertions(+), 9 deletions(-) > > diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c > index aca6309..2fd1b10 100644 > --- a/src/lxc/lxc_cgroup.c > +++ b/src/lxc/lxc_cgroup.c > @@ -23,6 +23,8 @@ > > #include "lxc_cgroup.h" > #include "lxc_container.h" > +#include "lxc_fuse.h" > +#include "virfile.h" > #include "virterror_internal.h" > #include "logging.h" > #include "memory.h" > @@ -138,6 +140,155 @@ cleanup: > } > > > +static int virLXCCgroupGetMemSwapUsage(virCgroupPtr cgroup, > + unsigned long long *usage) > +{ > + return virCgroupGetMemSwapUsage(cgroup, usage); > +} > + > + > +static int virLXCCgroupGetMemSwapTotal(virCgroupPtr cgroup, > + unsigned long long *total) > +{ > + return virCgroupGetMemSwapHardLimit(cgroup, total); > +} > + > + > +static int virLXCCgroupGetMemUsage(virCgroupPtr cgroup, > + unsigned long long *usage) > +{ > + int ret; > + unsigned long memUsage; > + > + ret = virCgroupGetMemoryUsage(cgroup, &memUsage); > + *usage = (unsigned long long) memUsage; > + > + return ret; > +} > + > + > +static int virLXCCgroupGetMemTotal(virCgroupPtr cgroup, > + unsigned long long *total) > +{ > + return virCgroupGetMemoryHardLimit(cgroup, total); > +} > + > + > +static int virLXCCgroupGetMemStat(virCgroupPtr cgroup, > + unsigned long long *meminfo) > +{ > + int ret = 0; > + FILE *statfd = NULL; > + char *statFile = NULL; > + char line[1024]; > + > + ret = virCgroupPathOfController(cgroup, VIR_CGROUP_CONTROLLER_MEMORY, > + "memory.stat", &statFile); > + if (ret < 0) { > + virReportSystemError(-ret, "%s", > + _("cannot get the path of MEMORY cgroup controller")); > + return ret; > + } > + > + statfd = fopen(statFile, "r"); > + if (statfd == NULL) { > + ret = -ENOENT; > + goto out_free; > + } > + > + while (fgets(line, sizeof(line), statfd) != NULL) { > + char *value = strchr(line, ' '); > + char *nl = value ? strchr(line, '\n') : NULL; > + unsigned long long stat_value; > + > + if (!value) > + continue; > + > + if (nl) > + *nl = '\0'; > + > + *value = '\0'; > + > + if ((ret = virStrToLong_ull(value + 1, NULL, 10, &stat_value)) < 0) > + goto out; > + > + if (STREQ(line, "cache")) > + meminfo[CACHED] = stat_value >> 10; > + else if (STREQ(line, "inactive_anon")) > + meminfo[INACTIVE_ANON] = stat_value >> 10; > + else if (STREQ(line, "active_anon")) > + meminfo[ACTIVE_ANON] = stat_value >> 10; > + else if (STREQ(line, "inactive_file")) > + meminfo[INACTIVE_FILE] = stat_value >> 10; > + else if (STREQ(line, "active_file")) > + meminfo[ACTIVE_FILE] = stat_value >> 10; > + else if (STREQ(line, "unevictable")) > + meminfo[UNEVICTABLE] = stat_value >> 10; > + } > + ret = 0; > +out: > + VIR_FORCE_FCLOSE(statfd); > +out_free: > + VIR_FREE(statFile); > + return ret; > +} > + > + > +int virLXCCgroupGetMeminfo(unsigned long long *meminfo) > +{ > + int ret; > + virCgroupPtr cgroup; > + > + ret = virCgroupGetAppRoot(&cgroup); > + if (ret < 0) { > + virReportSystemError(-ret, "%s", > + _("Unable to get cgroup for container")); > + return ret; > + } > + > + ret = virLXCCgroupGetMemStat(cgroup, meminfo); > + if (ret < 0) { > + virReportSystemError(-ret, "%s", > + _("Unable to get memory cgroup stat info")); > + goto out; > + } > + > + ret = virLXCCgroupGetMemTotal(cgroup, &meminfo[MEMTOTAL]); > + if (ret < 0) { > + virReportSystemError(-ret, "%s", > + _("Unable to get memory cgroup total")); > + goto out; > + } > + > + ret = virLXCCgroupGetMemUsage(cgroup, &meminfo[MEMUSAGE]); > + if (ret < 0) { > + virReportSystemError(-ret, "%s", > + _("Unable to get memory cgroup stat usage")); > + goto out; > + } > + > + ret = virLXCCgroupGetMemSwapTotal(cgroup, &meminfo[SWAPTOTAL]); > + if (ret < 0) { > + virReportSystemError(-ret, "%s", > + _("Unable to get memory cgroup stat swaptotal")); > + goto out; > + } > + > + ret = virLXCCgroupGetMemSwapUsage(cgroup, &meminfo[SWAPUSAGE]); > + if (ret < 0) { > + virReportSystemError(-ret, "%s", > + _("Unable to get memory cgroup stat swapusage")); > + goto out; > + } > + > + ret = 0; > +out: > + virCgroupFree(&cgroup); > + > + return ret; > +} > + > + > typedef struct _virLXCCgroupDevicePolicy virLXCCgroupDevicePolicy; > typedef virLXCCgroupDevicePolicy *virLXCCgroupDevicePolicyPtr; > > diff --git a/src/lxc/lxc_cgroup.h b/src/lxc/lxc_cgroup.h > index 8ff1015..eccdcba 100644 > --- a/src/lxc/lxc_cgroup.h > +++ b/src/lxc/lxc_cgroup.h > @@ -25,5 +25,6 @@ > # include "domain_conf.h" > > int virLXCCgroupSetup(virDomainDefPtr def); > +int virLXCCgroupGetMeminfo(unsigned long long *meminfo); > > #endif /* __VIR_LXC_CGROUP_H__ */ > diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c > index 868a698..a073e30 100644 > --- a/src/lxc/lxc_fuse.c > +++ b/src/lxc/lxc_fuse.c > @@ -29,25 +29,48 @@ > #include <sys/mount.h> > > #include "lxc_fuse.h" > +#include "lxc_cgroup.h" > #include "virterror_internal.h" > +#include "virfile.h" > > #define VIR_FROM_THIS VIR_FROM_LXC > > #if HAVE_FUSE > > +static const char *meminfo_path = "/meminfo"; > + > static int lxcProcGetattr(const char *path, struct stat *stbuf) > { > - int res = 0; > + int res; > + char *mempath = NULL; > + struct stat sb; > > memset(stbuf, 0, sizeof(struct stat)); > + if ((res = virAsprintf(&mempath, "/proc/%s", path)) < 0) { > + virReportOOMError(); > + return res; > + } > + > + res = 0; > > if (STREQ(path, "/")) { > stbuf->st_mode = S_IFDIR | 0755; > stbuf->st_nlink = 2; > + } else if (STREQ(path, meminfo_path)) { > + stat(mempath, &sb); > + stbuf->st_mode = sb.st_mode; > + stbuf->st_nlink = 1; > + stbuf->st_blksize = sb.st_blksize; > + stbuf->st_blocks = sb.st_blocks; > + stbuf->st_size = sb.st_size; > + stbuf->st_atime = sb.st_atime; > + stbuf->st_ctime = sb.st_ctime; > + stbuf->st_mtime = sb.st_mtime; > } else { > res = -ENOENT; > } > > + VIR_FREE(mempath); > return res; > } > > @@ -61,23 +84,198 @@ static int lxcProcReaddir(const char *path, void *buf, > > filler(buf, ".", NULL, 0); > filler(buf, "..", NULL, 0); > + filler(buf, meminfo_path + 1, NULL, 0); > > return 0; > } > > -static int lxcProcOpen(const char *path ATTRIBUTE_UNUSED, > - struct fuse_file_info *fi ATTRIBUTE_UNUSED) > +static int lxcProcOpen(const char *path, > + struct fuse_file_info *fi) > +{ > + if (!STREQ(path, meminfo_path)) > + return -ENOENT; > + > + if ((fi->flags & 3) != O_RDONLY) > + return -EACCES; > + > + return 0; > +} > + > +static int lxcProcHostRead(char *path, char *buf, size_t size, off_t offset) > { > - return -ENOENT; > + int fd; > + int res; > + > + fd = open(path, O_RDONLY); > + if (fd == -1) > + return -errno; > + > + res = pread(fd, buf, size, offset); > + if (res == -1) > + res = -errno; > + > + VIR_FORCE_CLOSE(fd); > + return res; > } > > -static int lxcProcRead(const char *path ATTRIBUTE_UNUSED, > - char *buf ATTRIBUTE_UNUSED, > - size_t size ATTRIBUTE_UNUSED, > - off_t offset ATTRIBUTE_UNUSED, > +static int lxcProcReadMeminfo(char *hostpath, virDomainDefPtr def, > + char *buf, size_t size, off_t offset) > +{ > + int copied = 0; > + int res = 0; > + FILE *fd = NULL; > + char line[1024]; > + unsigned long long meminfo[MEMMAX]; > + memset(meminfo, 0, sizeof(meminfo)); > + > + if ((res = virLXCCgroupGetMeminfo(meminfo)) < 0) > + return res; > + > + fd = fopen(hostpath, "r"); > + if (fd == NULL) { > + virReportSystemError(errno, _("Cannot open %s"), hostpath); > + res = -errno; > + goto out; > + } > + > + fseek(fd, offset, SEEK_SET); > + > + while (copied < size && fgets(line, sizeof(line), fd) != NULL) { > + int len = 0; > + char *new_line = NULL; > + char *ptr = strchr(line, ':'); > + if (ptr) { > + *ptr = '\0'; > + new_line = line; > + > + if (STREQ(line, "MemTotal") && > + (def->mem.hard_limit || def->mem.max_balloon)) { > + if ((res = virAsprintf(&new_line, "MemTotal: %8llu KB\n", > + meminfo[MEMTOTAL])) < 0) { > + goto out_oom; > + } > + } else if (STREQ(line, "MemFree") && > + (def->mem.hard_limit || def->mem.max_balloon)) { > + if ((res = virAsprintf(&new_line, "MemFree: %8llu KB\n", > + (meminfo[MEMTOTAL] - meminfo[MEMUSAGE]))) < 0) { > + goto out_oom; > + } > + } else if (STREQ(line, "Buffers")) { > + if ((res = virAsprintf(&new_line, "Buffers: %8d KB\n", 0)) < 0) { > + goto out_oom; > + } > + } else if (STREQ(line, "Cached")) { > + if ((res = virAsprintf(&new_line, "Cached: %8llu KB\n", > + meminfo[CACHED])) < 0) { > + goto out_oom; > + } > + } else if (STREQ(line, "Active")) { > + if ((res = virAsprintf(&new_line, "Active: %8llu KB\n", > + (meminfo[ACTIVE_ANON] + meminfo[ACTIVE_FILE]))) < 0) { > + goto out_oom; > + } > + } else if (STREQ(line, "Inactive")) { > + if ((res = virAsprintf(&new_line, "Inactive: %8llu KB\n", > + (meminfo[INACTIVE_ANON] + meminfo[INACTIVE_FILE]))) < 0) { > + goto out_oom; > + } > + } else if (STREQ(line, "Active(anon)")) { > + if ((res = virAsprintf(&new_line, "Active(anon): %8llu KB\n", > + meminfo[ACTIVE_ANON])) < 0) { > + goto out_oom; > + } > + } else if (STREQ(line, "Inactive(anon)")) { > + if ((res = virAsprintf(&new_line, "Inactive(anon): %8llu KB\n", > + meminfo[INACTIVE_ANON])) < 0) { > + goto out_oom; > + } > + } else if (STREQ(line, "Active(file)")) { > + if ((res = virAsprintf(&new_line, "Active(file): %8llu KB\n", > + meminfo[ACTIVE_FILE])) < 0) { > + goto out_oom; > + } > + } else if (STREQ(line, "Inactive(file)")) { > + if ((res = virAsprintf(&new_line, "Inactive(file): %8llu KB\n", > + meminfo[INACTIVE_FILE])) < 0) { > + goto out_oom; > + } > + } else if (STREQ(line, "Unevictable")) { > + if ((res = virAsprintf(&new_line, "Unevictable: %8llu KB\n", > + meminfo[UNEVICTABLE])) < 0) { > + goto out_oom; > + } > + } else if (STREQ(line, "SwapTotal") && def->mem.swap_hard_limit) { > + if ((res = virAsprintf(&new_line, "SwapTotal: %8llu KB\n", > + (meminfo[SWAPTOTAL] - meminfo[MEMTOTAL]))) < 0){ > + goto out_oom; > + } > + } else if (STREQ(line, "SwapFree") && def->mem.swap_hard_limit) { > + if ((res = virAsprintf(&new_line, "SwapFree: %8llu KB\n", > + (meminfo[SWAPTOTAL] - meminfo[MEMTOTAL] - > + meminfo[SWAPUSAGE] + meminfo[MEMUSAGE]))) < 0) { > + goto out_oom; > + } > + } > + *ptr=':'; > + } > + > + len = strlen(new_line); > + > + if (copied + len > size) > + len = size - copied; > + > + memcpy(buf + copied, new_line, len); > + copied += len; > + memset(line, 0, sizeof(line)); > + if (new_line != line) > + VIR_FREE(new_line); > + } > + res = copied; > + > +out: > + VIR_FORCE_FCLOSE(fd); > + return res; > + > +out_oom: > + virReportOOMError(); > + goto out; > +} > + > +static int lxcProcRead(const char *path, > + char *buf, > + size_t size, > + off_t offset, > struct fuse_file_info *fi ATTRIBUTE_UNUSED) > { > - return -ENOENT; > + int res = 0; > + char *hostpath = NULL; > + struct fuse_context *context = NULL; > + virDomainDefPtr def = NULL; > + > + if ((res = virAsprintf(&hostpath, "/proc/%s", path)) < 0) { > + virReportOOMError(); > + return res; > + } > + > + context = fuse_get_context(); > + def = (virDomainDefPtr)context->private_data; > + > + if (STREQ(path, meminfo_path)) { > + res = lxcProcReadMeminfo(hostpath, def, buf, size, offset); > + } else { > + res = -ENOENT; > + goto out; > + } The second branch suggests that we should be returning errno values upon failure. At least one code path in lxcProcReadMeminfo instead returns simply -1. This code should all use normal libvirt error reporting APIs and return -1 on error. Then right at the end of this method, if res == -1, then use virGetLastError() to fetch any virErrorPtr object. If the code == VIR_ERR_SYSTEM_ERROR then you can get the errno value from the 'int1' field in virErrorPtr. Otherwise you can just use EIO

> + > + if (res < 0) { > + if((res = lxcProcHostRead(hostpath, buf, size, offset)) < 0) > + virReportSystemError(errno, "%s", > + _("failed to show host's meminfo")); > + } > + > +out: > + VIR_FREE(hostpath); > + return res; > } > > static struct fuse_operations lxcProcOper = { > diff --git a/src/lxc/lxc_fuse.h b/src/lxc/lxc_fuse.h > index d60c238..7db534b 100644 > --- a/src/lxc/lxc_fuse.h > +++ b/src/lxc/lxc_fuse.h > @@ -35,6 +35,20 @@ > #include "util.h" > #include "memory.h" > > +enum { > + MEMTOTAL, > + MEMUSAGE, > + CACHED, > + ACTIVE_ANON, > + INACTIVE_ANON, > + ACTIVE_FILE, > + INACTIVE_FILE, > + UNEVICTABLE, > + SWAPTOTAL, > + SWAPUSAGE, > + MEMMAX, > +}; Please use a prefix on any constants, ie VIR_LXC_FUSE_MEMTOTAL

add a configure option --with-fuse to prepare introduction of fuse support for libvirt lxc. With help from Daniel Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com&gt; --- configure.ac | 35 +++++++++++++++++++++++++++++++++++ libvirt.spec.in | 9 +++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 47a72b9..cc7de9d 100644 --- a/configure.ac +++ b/configure.ac @@ -1847,6 +1847,36 @@ AC_SUBST([CAPNG_CFLAGS]) AC_SUBST([CAPNG_LIBS]) +dnl libfuse +AC_ARG_WITH([fuse], + AC_HELP_STRING([--with-fuse], [use libfuse to proivde fuse filesystem support for libvirt lxc]), + [], + [with_fuse=check]) +dnl +dnl This check looks for 'fuse' +dnl +FUSE_CFLAGS= +FUSE_LIBS= +if test "x$with_fuse" != "xno"; then + PKG_CHECK_MODULES([FUSE], [fuse],

+ [with_fuse=yes], [ + if test "x$with_fuse" = "xcheck" ; then + with_fuse=no + else + AC_MSG_ERROR( + [You must install fuse-devel to compile libvirt])

+ fi + ]) + if test "x$with_fuse" = "xyes" ; then + FUSE_LIBS="-lfuse" + FUSE_CFLAGS="-D_FILE_OFFSET_BITS=64" + AC_DEFINE_UNQUOTED([HAVE_FUSE], 1, [whether fuse is available for libvirt lxc]) + fi +fi +AM_CONDITIONAL([HAVE_FUSE], [test "x$with_fuse" = "xyes"]) +AC_SUBST([FUSE_CFLAGS]) +AC_SUBST([FUSE_LIBS]) + dnl virsh libraries AC_CHECK_HEADERS([readline/readline.h]) @@ -3103,6 +3133,11 @@ AC_MSG_NOTICE([ capng: $CAPNG_CFLAGS $CAPNG_LIBS]) else AC_MSG_NOTICE([ capng: no]) fi +if test "$with_fuse" = "yes" ; then +AC_MSG_NOTICE([ fuse: $FUSE_CFLAGS $FUSE_LIBS]) +else +AC_MSG_NOTICE([ fuse: no]) +fi if test "$with_xen" = "yes" ; then AC_MSG_NOTICE([ xen: $XEN_CFLAGS $XEN_LIBS]) else diff --git a/libvirt.spec.in b/libvirt.spec.in index 8c4c08d..a63999c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -92,6 +92,7 @@ # A few optional bits off by default, we enable later %define with_polkit 0%{!?_without_polkit:0} %define with_capng 0%{!?_without_capng:0} +%define with_fuse 0%{!?_without_fuse:0} %define with_netcf 0%{!?_without_netcf:0} %define with_udev 0%{!?_without_udev:0} %define with_hal 0%{!?_without_hal:0} @@ -490,6 +491,9 @@ BuildRequires: numactl-devel %if %{with_capng} BuildRequires: libcap-ng-devel >= 0.5.0 %endif +%if %{with_fuse} +BuildRequires: fuse-devel +%endif %if %{with_phyp} BuildRequires: libssh2-devel %endif @@ -1157,6 +1161,10 @@ of recent versions of Linux (and other OSes). %define _without_capng --without-capng %endif +%if ! %{with_fuse} +%define _without_fuse --without-fuse +%endif + %if ! %{with_netcf} %define _without_netcf --without-netcf %endif @@ -1261,6 +1269,7 @@ autoreconf -if %{?_without_numactl} \ %{?_without_numad} \ %{?_without_capng} \ + %{?_without_fuse} \ %{?_without_netcf} \ %{?_without_selinux} \ %{?_with_selinux_mount} \ -- 1.7.7.6 -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list

On Mon, Sep 10, 2012 at 9:54 PM, Gao feng <gaofeng(a)cn.fujitsu.com&gt; wrote: > add a configure option --with-fuse to prepare introduction > of fuse support for libvirt lxc. > > With help from Daniel > > Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com&gt; > --- > configure.ac | 35 +++++++++++++++++++++++++++++++++++ > libvirt.spec.in | 9 +++++++++ > 2 files changed, 44 insertions(+), 0 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 47a72b9..cc7de9d 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1847,6 +1847,36 @@ AC_SUBST([CAPNG_CFLAGS]) > AC_SUBST([CAPNG_LIBS]) > > > +dnl libfuse > +AC_ARG_WITH([fuse], > + AC_HELP_STRING([--with-fuse], [use libfuse to proivde fuse filesystem support for libvirt lxc]), > + [], > + [with_fuse=check]) > +dnl > +dnl This check looks for 'fuse' > +dnl > +FUSE_CFLAGS= > +FUSE_LIBS= > +if test "x$with_fuse" != "xno"; then > + PKG_CHECK_MODULES([FUSE], [fuse], Probably want to figure out your minimum supported version and check for at least that or newer.

> + [with_fuse=yes], [ > + if test "x$with_fuse" = "xcheck" ; then > + with_fuse=no > + else > + AC_MSG_ERROR( > + [You must install fuse-devel to compile libvirt]) Very Fedora/RHEL-y message. Probably better to be a bit more abstract. See other messages in confugure.ac for an example.

Other than the 2 small comments, it looks fine.