rpms/libguestfs
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Add upstream patch, workaround for libvirt on ppc64 bug.

Browse Source
This commit is contained in:
Richard W.M. Jones 2014-02-18 16:14:57 +01:00
parent 2313648572
commit 7f64f547da
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
0001-ppc64-Disable-hpet-fragment-in-libvirt-XML.patch Normal file
View File

@ -0,0 +1,32 @@
From 4a845bf6ea5b72381b579df0d4ca9ead4271b55e Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 18 Feb 2014 15:12:13 +0000
Subject: [PATCH] ppc64: Disable hpet fragment in libvirt XML.
Related change in commit 62cb3a606d4b349d45f2d178945a998a90d1e130.
---
src/launch-libvirt.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c
index 9e59e36..1bfc069 100644
--- a/src/launch-libvirt.c
+++ b/src/launch-libvirt.c
@@ -1013,12 +1013,9 @@ construct_libvirt_xml_cpu (guestfs_h *g,
} end_element ();
/* libvirt has a bug (RHBZ#1066145) where it adds the -no-hpet
- * flag on ARM even though this causes qemu-system-arm to break
- * and ARM has never had a High Precision Timer anyway. It's not
- * worth arguing about who is right or wrong here, just disable
- * this XML fragment on ARM.
+ * flag on ARM & ppc64.
*/
-#ifndef __arm__
+#if !defined(__arm__) && !defined(__powerpc__)
start_element ("timer") {
attribute ("name", "hpet");
attribute ("present", "no");
--
1.8.4.2

9
libguestfs.spec
View File

@ -18,7 +18,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs Name: libguestfs
Epoch: 1 Epoch: 1
Version: 1.25.36 Version: 1.25.36
Release: 4%{?dist} Release: 5%{?dist}
License: LGPLv2+ License: LGPLv2+
# Source and patches. # Source and patches.
@ -27,6 +27,8 @@ Source0: http://libguestfs.org/download/1.25-development/%{name}-%{version
# Upstream workaround for libvirt on ARM bug. # Upstream workaround for libvirt on ARM bug.
Patch0001: 0001-launch-libvirt-Don-t-include-hpet-XML-fragment-on-AR.patch Patch0001: 0001-launch-libvirt-Don-t-include-hpet-XML-fragment-on-AR.patch
# Same for ppc64:
Patch0002: 0001-ppc64-Disable-hpet-fragment-in-libvirt-XML.patch
# Basic build requirements: # Basic build requirements:
BuildRequires: perl(Pod::Simple) BuildRequires: perl(Pod::Simple)
@ -577,6 +579,7 @@ for %{name}.
%setup -q %setup -q
%patch0001 -p1 %patch0001 -p1
%patch0002 -p1
if [ "$(getenforce | tr '[A-Z]' '[a-z]')" != "disabled" ]; then if [ "$(getenforce | tr '[A-Z]' '[a-z]')" != "disabled" ]; then
# For sVirt to work, the local temporary directory we use in the # For sVirt to work, the local temporary directory we use in the
@ -998,8 +1001,8 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs
%changelog %changelog
* Tue Feb 18 2014 Richard W.M. Jones <rjones@redhat.com> - 1:1.25.36-4 * Tue Feb 18 2014 Richard W.M. Jones <rjones@redhat.com> - 1:1.25.36-5
- Add upstream patch, workaround for libvirt on ARM bug. - Add upstream patches, workaround for libvirt on ARM / ppc64 bug.
- Run make quickcheck (and fail early) before doing full make check. - Run make quickcheck (and fail early) before doing full make check.
* Mon Feb 17 2014 Richard W.M. Jones <rjones@redhat.com> - 1:1.25.36-1 * Mon Feb 17 2014 Richard W.M. Jones <rjones@redhat.com> - 1:1.25.36-1