Don't fail qemu driver intialization if we can't determine hugepage size
Thanks: a lot to Jamie Heilman for testing it
Closes: #757609
Guido Günther
9 years ago
| 0 | From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org> | |
| 1 | Date: Sun, 10 Aug 2014 12:42:37 +0200 | |
| 2 | Subject: Don't fail qemu driver intialization if we can't determine hugepage | |
| 3 | size | |
| 4 | ||
| 5 | Otherwise we fail like | |
| 6 | ||
| 7 | libvirt version: 1.2.7, package: 6 (root 2014-08-08-16:09:22 bogon) | |
| 8 | virAuditOpen:62 : Unable to initialize audit layer: Protocol not supported | |
| 9 | virFileGetDefaultHugepageSize:2958 : internal error: Unable to parse /proc/meminfo | |
| 10 | virStateInitialize:749 : Initialization of QEMU state driver failed: internal error: Unable to parse /proc/meminfo | |
| 11 | daemonRunStateInit:922 : Driver state initialization failed | |
| 12 | ||
| 13 | if the data can't be determined. | |
| 14 | Closes: #757609 | |
| 15 | --- | |
| 16 | src/util/virfile.c | 5 +++-- | |
| 17 | 1 file changed, 3 insertions(+), 2 deletions(-) | |
| 18 | ||
| 19 | diff --git a/src/util/virfile.c b/src/util/virfile.c | |
| 20 | index 9863fd0..717882c 100644 | |
| 21 | --- a/src/util/virfile.c | |
| 22 | +++ b/src/util/virfile.c | |
| 23 | @@ -2953,8 +2953,9 @@ virFileGetDefaultHugepageSize(unsigned long long *size) | |
| 24 | goto cleanup; | |
| 25 | ||
| 26 | if (!(c = strstr(meminfo, HUGEPAGESIZE_STR))) { | |
| 27 | - virReportError(VIR_ERR_INTERNAL_ERROR, | |
| 28 | - _("Unable to parse %s"), | |
| 29 | + virReportError(VIR_ERR_NO_SUPPORT, | |
| 30 | + _("%s not found in %s"), | |
| 31 | + HUGEPAGESIZE_STR, | |
| 32 | PROC_MEMINFO); | |
| 33 | goto cleanup; | |
| 34 | } |