Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
L
libvirt
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Libvirt Packaging Team
libvirt
Commits
3583f4bb
Commit
3583f4bb
authored
10 years ago
by
Guido Günther
Browse files
Options
Downloads
Patches
Plain Diff
Don't fail qemu driver intialization if we can't determine hugepage size
Thanks: a lot to Jamie Heilman for testing it Closes: #757609
parent
4914adc6
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
debian/patches/Don-t-fail-qemu-driver-intialization-if-we-can-t-det.patch
+35
-0
35 additions, 0 deletions
...on-t-fail-qemu-driver-intialization-if-we-can-t-det.patch
debian/patches/series
+1
-0
1 addition, 0 deletions
debian/patches/series
with
36 additions
and
0 deletions
debian/patches/Don-t-fail-qemu-driver-intialization-if-we-can-t-det.patch
0 → 100644
+
35
−
0
View file @
3583f4bb
From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
Date: Sun, 10 Aug 2014 12:42:37 +0200
Subject: Don't fail qemu driver intialization if we can't determine hugepage
size
Otherwise we fail like
libvirt version: 1.2.7, package: 6 (root 2014-08-08-16:09:22 bogon)
virAuditOpen:62 : Unable to initialize audit layer: Protocol not supported
virFileGetDefaultHugepageSize:2958 : internal error: Unable to parse /proc/meminfo
virStateInitialize:749 : Initialization of QEMU state driver failed: internal error: Unable to parse /proc/meminfo
daemonRunStateInit:922 : Driver state initialization failed
if the data can't be determined.
Closes: #757609
---
src/util/virfile.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/util/virfile.c b/src/util/virfile.c
index 9863fd0..717882c 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -2953,8 +2953,9 @@
virFileGetDefaultHugepageSize(unsigned long long *size)
goto cleanup;
if (!(c = strstr(meminfo, HUGEPAGESIZE_STR))) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Unable to parse %s"),
+ virReportError(VIR_ERR_NO_SUPPORT,
+ _("%s not found in %s"),
+ HUGEPAGESIZE_STR,
PROC_MEMINFO);
goto cleanup;
}
This diff is collapsed.
Click to expand it.
debian/patches/series
+
1
−
0
View file @
3583f4bb
...
...
@@ -13,3 +13,4 @@ Allow-xen-toolstack-to-find-it-s-binaries.patch
Skip-vircgrouptest.patch
Include-param.h-on-kFreeBSD.patch
Use-sensible-editor-as-fallback.patch
Don-t-fail-qemu-driver-intialization-if-we-can-t-det.patch
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment