NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove conn parameter from virReportOOMError

Browse Source
This commit is contained in:
Matthias Bolte
2010-02-04 19:19:08 +01:00
parent 3b9027c401
commit 8ce5e2c1ab
82 changed files with 1001 additions and 1014 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/lxc/lxc_container.c
View File

@@ -314,7 +314,7 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root)
}
if (virAsprintf(&oldroot, "%s/.oldroot", root->src) < 0) {
virReportOOMError(NULL);
virReportOOMError();
goto err;
}
@@ -336,7 +336,7 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root)
/* Create a directory called 'new' in tmpfs */
if (virAsprintf(&newroot, "%s/new", oldroot) < 0) {
virReportOOMError(NULL);
virReportOOMError();
goto err;
}
@@ -403,7 +403,7 @@ static int lxcContainerMountBasicFS(virDomainFSDefPtr root)
char *devpts;
if (virAsprintf(&devpts, "/.oldroot%s/dev/pts", root->src) < 0) {
virReportOOMError(NULL);
virReportOOMError();
return rc;
}
@@ -507,7 +507,7 @@ static int lxcContainerMountNewFS(virDomainDefPtr vmDef)
continue;
if (virAsprintf(&src, "/.oldroot/%s", vmDef->fss[i]->src) < 0) {
virReportOOMError(NULL);
virReportOOMError();
return -1;
}
@@ -553,12 +553,12 @@ static int lxcContainerUnmountOldFS(void)
if (VIR_REALLOC_N(mounts, nmounts+1) < 0) {
endmntent(procmnt);
virReportOOMError(NULL);
virReportOOMError();
return -1;
}
if (!(mounts[nmounts++] = strdup(mntent.mnt_dir))) {
endmntent(procmnt);
virReportOOMError(NULL);
virReportOOMError();
return -1;
}
}
@@ -738,12 +738,12 @@ static int lxcContainerChild( void *data )
if (root) {
if (virAsprintf(&ttyPath, "%s%s", root->src, argv->ttyPath) < 0) {
virReportOOMError(NULL);
virReportOOMError();
return -1;
}
} else {
if (!(ttyPath = strdup(argv->ttyPath))) {
virReportOOMError(NULL);
virReportOOMError();
return -1;
}
}
@@ -815,7 +815,7 @@ int lxcContainerStart(virDomainDefPtr def,
/* allocate a stack for the container */
if (VIR_ALLOC_N(stack, stacksize) < 0) {
virReportOOMError(NULL);
virReportOOMError();
return -1;
}
stacktop = stack + stacksize;