External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

qemuDomainGetPreservedMountPath: rename @mount

Browse Source 
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>
This commit is contained in:
Michal Privoznik 2017-07-12 10:01:25 +02:00
parent a4d9c31eac
commit c19d98d7c4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qemu/qemu_domain.c
View 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