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

virNumaGetPages: Don't fail on huge page-less systems

Browse Source 
If we are running on a system that is not capable of huge pages (e.g.
because the kernel is not configured that way) we still try to open
"/sys/kernel/mm/hugepages/" which however does not exist. We should
be tolerant to this specific use case.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2014-06-23 15:46:31 +02:00
parent 3499eedd4b
commit 2c78a270da
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/util/virnuma.c
View File

@ -738,7 +738,7 @@ virNumaGetPages(int node,
int ret = -1;
char *path = NULL;
DIR *dir = NULL;
int direrr;
int direrr = 0;
struct dirent *entry;
unsigned int *tmp_size = NULL, *tmp_avail = NULL, *tmp_free = NULL;
unsigned int ntmp = 0;
@ -760,13 +760,17 @@ virNumaGetPages(int node,
goto cleanup;
if (!(dir = opendir(path))) {
virReportSystemError(errno,
_("unable to open path: %s"),
path);
goto cleanup;
/* It's okay if the @path doesn't exist. Maybe we are running on
* system without huge pages support where the path may not exist. */
if (errno != ENOENT) {
virReportSystemError(errno,
_("unable to open path: %s"),
path);
goto cleanup;
}
}
while ((direrr = virDirRead(dir, &entry, path)) > 0) {
while (dir && (direrr = virDirRead(dir, &entry, path)) > 0) {
const char *page_name = entry->d_name;
unsigned int page_size, page_avail = 0, page_free = 0;
char *end;