Remove patches, now upstream.

0001-launch-libvirt-Don-t-include-hpet-XML-fragment-on-AR.patch

@@ -1,46 +0,0 @@
-From 62cb3a606d4b349d45f2d178945a998a90d1e130 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Mon, 17 Feb 2014 15:17:27 -0500
-Subject: [PATCH] launch: libvirt: Don't include hpet XML fragment on ARM.
-
-See comment and https://bugzilla.redhat.com/show_bug.cgi?id=1066145
-for explanation.
----
- src/launch-libvirt.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c
-index 60213fd..9e59e36 100644
---- a/src/launch-libvirt.c
-+++ b/src/launch-libvirt.c
-@@ -1001,6 +1001,7 @@ construct_libvirt_xml_cpu (guestfs_h *g,
- 
-   start_element ("clock") {
-     attribute ("offset", "utc");
-+
-     /* These are recommended settings, see RHBZ#1053847. */
-     start_element ("timer") {
-       attribute ("name", "rtc");
-@@ -1010,10 +1011,19 @@ construct_libvirt_xml_cpu (guestfs_h *g,
-       attribute ("name", "pit");
-       attribute ("tickpolicy", "delay");
-     } 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.
-+     */
-+#ifndef __arm__
-     start_element ("timer") {
-       attribute ("name", "hpet");
-       attribute ("present", "no");
-     } end_element ();
-+#endif
-   } end_element ();
- 
-   return 0;
--- 
-1.8.4.2
-

0001-ppc64-Disable-hpet-fragment-in-libvirt-XML.patch

@@ -1,32 +0,0 @@
-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
-

libguestfs.spec

@@ -25,11 +25,6 @@ License:       LGPLv2+
 URL:           http://libguestfs.org/
 Source0:       http://libguestfs.org/download/1.25-development/%{name}-%{version}.tar.gz
 
-# Upstream workaround for libvirt on ARM bug.
-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:
 BuildRequires: perl(Pod::Simple)
 BuildRequires: perl(Pod::Man)
@@ -578,9 +573,6 @@ for %{name}.
 %prep
 %setup -q
 
-%patch0001 -p1
-%patch0002 -p1
-
 if [ "$(getenforce | tr '[A-Z]' '[a-z]')" != "disabled" ]; then
     # For sVirt to work, the local temporary directory we use in the
     # tests must be labelled the same way as /tmp.