[libvirt] [PATCH v2 43/53] [ACKED] vircgroupmock: change cgroup prefix

[Pavel Hrdina]

Remove the trailing '/' from prefix.  This change is required in order
to introduce tests for unified cgroups.  They are usually mounted in
'/sys/fs/cgroup'.

Signed-off-by: Pavel Hrdina <phrd...@redhat.com>
---
 tests/vircgroupmock.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c
index cfff1f0b7a..5c48ef012a 100644
--- a/tests/vircgroupmock.c
+++ b/tests/vircgroupmock.c
@@ -56,7 +56,7 @@ const char *fakedevicedir0 = FAKEDEVDIR0;
 const char *fakedevicedir1 = FAKEDEVDIR1;
 
 
-# define SYSFS_CGROUP_PREFIX "/not/really/sys/fs/cgroup/"
+# define SYSFS_CGROUP_PREFIX "/not/really/sys/fs/cgroup"
 # define SYSFS_CPU_PRESENT "/sys/devices/system/cpu/present"
 # define SYSFS_CPU_PRESENT_MOCKED "devices_system_cpu_present"
 
@@ -354,7 +354,7 @@ int access(const char *path, int mode)
     if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) {
         init_sysfs();
         char *newpath;
-        if (asprintf(&newpath, "%s/%s",
+        if (asprintf(&newpath, "%s%s",
                      fakesysfscgroupdir,
                      path + strlen(SYSFS_CGROUP_PREFIX)) < 0) {
             errno = ENOMEM;
@@ -386,7 +386,7 @@ int __lxstat(int ver, const char *path, struct stat *sb)
     if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) {
         init_sysfs();
         char *newpath;
-        if (asprintf(&newpath, "%s/%s",
+        if (asprintf(&newpath, "%s%s",
                      fakesysfscgroupdir,
                      path + strlen(SYSFS_CGROUP_PREFIX)) < 0) {
             errno = ENOMEM;
@@ -417,7 +417,7 @@ int lstat(const char *path, struct stat *sb)
     if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) {
         init_sysfs();
         char *newpath;
-        if (asprintf(&newpath, "%s/%s",
+        if (asprintf(&newpath, "%s%s",
                      fakesysfscgroupdir,
                      path + strlen(SYSFS_CGROUP_PREFIX)) < 0) {
             errno = ENOMEM;
@@ -448,7 +448,7 @@ int __xstat(int ver, const char *path, struct stat *sb)
     if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) {
         init_sysfs();
         char *newpath;
-        if (asprintf(&newpath, "%s/%s",
+        if (asprintf(&newpath, "%s%s",
                      fakesysfscgroupdir,
                      path + strlen(SYSFS_CGROUP_PREFIX)) < 0) {
             errno = ENOMEM;
@@ -487,7 +487,7 @@ int stat(const char *path, struct stat *sb)
         }
     } else if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) {
         init_sysfs();
-        if (asprintf(&newpath, "%s/%s",
+        if (asprintf(&newpath, "%s%s",
                      fakesysfscgroupdir,
                      path + strlen(SYSFS_CGROUP_PREFIX)) < 0) {
             errno = ENOMEM;
@@ -519,7 +519,7 @@ int mkdir(const char *path, mode_t mode)
     if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) {
         init_sysfs();
         char *newpath;
-        if (asprintf(&newpath, "%s/%s",
+        if (asprintf(&newpath, "%s%s",
                      fakesysfscgroupdir,
                      path + strlen(SYSFS_CGROUP_PREFIX)) < 0) {
             errno = ENOMEM;
@@ -552,7 +552,7 @@ int open(const char *path, int flags, ...)
 
     if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) {
         init_sysfs();
-        if (asprintf(&newpath, "%s/%s",
+        if (asprintf(&newpath, "%s%s",
                      fakesysfscgroupdir,
                      path + strlen(SYSFS_CGROUP_PREFIX)) < 0) {
             errno = ENOMEM;
-- 
2.17.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list