[Pkg-libvirt-commits] [libvirt] 01/01: Don't fail qemu driver intialization if we can't determine hugepage size

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to branch master
in repository libvirt.

commit 3583f4bba02b66899a0b707e8e75fd66b9d86cfe
Author: Guido Günther <agx at sigxcpu.org>
Date:   Mon Aug 11 01:18:40 2014 +0200

    Don't fail qemu driver intialization if we can't determine hugepage size
    
    Thanks: a lot to Jamie Heilman for testing it
    Closes: #757609
---
 ...qemu-driver-intialization-if-we-can-t-det.patch | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 36 insertions(+)

diff --git a/debian/patches/Don-t-fail-qemu-driver-intialization-if-we-can-t-det.patch b/debian/patches/Don-t-fail-qemu-driver-intialization-if-we-can-t-det.patch
new file mode 100644
index 0000000..7d47c1a
--- /dev/null
+++ b/debian/patches/Don-t-fail-qemu-driver-intialization-if-we-can-t-det.patch
@@ -0,0 +1,35 @@
+From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at 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;
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 3f373df..df2a6e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git