提交 2c78a270 编写于 作者: M Michal Privoznik

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

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: NMichal Privoznik <mprivozn@redhat.com>
上级 3499eedd
...@@ -738,7 +738,7 @@ virNumaGetPages(int node, ...@@ -738,7 +738,7 @@ virNumaGetPages(int node,
int ret = -1; int ret = -1;
char *path = NULL; char *path = NULL;
DIR *dir = NULL; DIR *dir = NULL;
int direrr; int direrr = 0;
struct dirent *entry; struct dirent *entry;
unsigned int *tmp_size = NULL, *tmp_avail = NULL, *tmp_free = NULL; unsigned int *tmp_size = NULL, *tmp_avail = NULL, *tmp_free = NULL;
unsigned int ntmp = 0; unsigned int ntmp = 0;
...@@ -760,13 +760,17 @@ virNumaGetPages(int node, ...@@ -760,13 +760,17 @@ virNumaGetPages(int node,
goto cleanup; goto cleanup;
if (!(dir = opendir(path))) { if (!(dir = opendir(path))) {
/* 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, virReportSystemError(errno,
_("unable to open path: %s"), _("unable to open path: %s"),
path); path);
goto cleanup; goto cleanup;
} }
}
while ((direrr = virDirRead(dir, &entry, path)) > 0) { while (dir && (direrr = virDirRead(dir, &entry, path)) > 0) {
const char *page_name = entry->d_name; const char *page_name = entry->d_name;
unsigned int page_size, page_avail = 0, page_free = 0; unsigned int page_size, page_avail = 0, page_free = 0;
char *end; char *end;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册