]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemuDomainGetPreservedMountPath: rename @mount
authorMichal Privoznik <mprivozn@redhat.com>
Wed, 12 Jul 2017 08:01:25 +0000 (10:01 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Wed, 12 Jul 2017 08:01:25 +0000 (10:01 +0200)
Obviously, old gcc-s ale sad when a variable shares the name with
a function. And we do have such variable (added in 4d8a914be0):
@mount. Rename it to @mountpoint so that compiler's happy again.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
src/qemu/qemu_domain.c

index e146bc88a8f528841e53165ecbd320c694f2e64f..ae260de0066f9a698993dfe8a018d4719b9ea829 100644 (file)
@@ -7578,9 +7578,9 @@ qemuDomainGetHostdevPath(virDomainDefPtr def,
  * qemuDomainGetPreservedMountPath:
  * @cfg: driver configuration data
  * @vm: domain object
- * @mount: mount point path to convert
+ * @mountpoint: mount point path to convert
  *
- * For given @mount point return new path where the mount point
+ * For given @mountpoint return new path where the mount point
  * should be moved temporarily whilst building the namespace.
  *
  * Returns: allocated string on success which the caller must free,
@@ -7589,21 +7589,21 @@ qemuDomainGetHostdevPath(virDomainDefPtr def,
 static char *
 qemuDomainGetPreservedMountPath(virQEMUDriverConfigPtr cfg,
                                 virDomainObjPtr vm,
-                                const char *mount)
+                                const char *mountpoint)
 {
     char *path = NULL;
     char *tmp;
-    const char *suffix = mount + strlen(DEVPREFIX);
+    const char *suffix = mountpoint + strlen(DEVPREFIX);
     size_t off;
 
-    if (STREQ(mount, "/dev"))
+    if (STREQ(mountpoint, "/dev"))
         suffix = "dev";
 
     if (virAsprintf(&path, "%s/%s.%s",
                     cfg->stateDir, vm->def->name, suffix) < 0)
         return NULL;
 
-    /* Now consider that @mount is "/dev/blah/blah2".
+    /* Now consider that @mountpoint is "/dev/blah/blah2".
      * @suffix then points to "blah/blah2". However, caller
      * expects all the @paths to be the same depth. The
      * caller doesn't always do `mkdir -p` but sometimes bare