From 6313bf3dba101275af539ab11ca8bdfdf226e1b4 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com>
Date: Nov 23 2012 21:02:18 +0000
Subject: Fixes for i686.


- Remove non-upstream patch designed to work around
  https://bugzilla.redhat.com/show_bug.cgi?id=857026
  to see if this has been fixed.
- Re-enable tests on i686 to see if
  https://bugzilla.redhat.com/show_bug.cgi?id=870042
  has been fixed.

---

diff --git a/0001-i386-Add-noapic-flag-to-work-around-a-qemu-or-kernel.patch b/0001-i386-Add-noapic-flag-to-work-around-a-qemu-or-kernel.patch
deleted file mode 100644
index bf4a0bd..0000000
--- a/0001-i386-Add-noapic-flag-to-work-around-a-qemu-or-kernel.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a0fec28ff8679e7233cde035fe7506ceaac9991b Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Thu, 13 Sep 2012 15:25:56 +0100
-Subject: [PATCH] i386: Add noapic flag to work around a qemu or kernel bug.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=857026
----
- src/launch-libvirt.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c
-index 3711363..e3de406 100644
---- a/src/launch-libvirt.c
-+++ b/src/launch-libvirt.c
-@@ -588,6 +588,12 @@ construct_libvirt_xml_boot (guestfs_h *g, xmlTextWriterPtr xo,
- #define SERIAL_CONSOLE "ttyS0"
- #endif
- 
-+#ifdef __i386__
-+#define I386_NO_APIC "noapic " /* workaround for RHBZ#857026 */
-+#else
-+#define I386_NO_APIC
-+#endif
-+
- #define LINUX_CMDLINE							\
-     "panic=1 "         /* force kernel to panic if daemon exits */	\
-     "console=" SERIAL_CONSOLE " " /* serial console */		        \
-@@ -595,7 +601,8 @@ construct_libvirt_xml_boot (guestfs_h *g, xmlTextWriterPtr xo,
-     "no_timer_check "  /* fix for RHBZ#502058 */                        \
-     "acpi=off "        /* we don't need ACPI, turn it off */		\
-     "printk.time=1 "   /* display timestamp before kernel messages */   \
--    "cgroup_disable=memory " /* saves us about 5 MB of RAM */
-+    "cgroup_disable=memory " /* saves us about 5 MB of RAM */           \
-+    I386_NO_APIC
- 
-   /* Linux kernel command line. */
-   guestfs___drive_name (appliance_index, appliance_root);
--- 
-1.7.12
-
diff --git a/libguestfs.spec b/libguestfs.spec
index 57dda08..16c6aa9 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -22,7 +22,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.19.63
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -39,10 +39,6 @@ BuildRequires: autoconf, automake, libtool, gettext-devel
 # patch.
 Patch2:        libguestfs-1.19.2-remove-udev-from-packagelist.patch
 
-# Non-upstream patch to add the noapic flag on the kernel command line
-# on i386 only.  This works around a bug in 32-bit qemu (RHBZ#857026).
-Patch3:        0001-i386-Add-noapic-flag-to-work-around-a-qemu-or-kernel.patch
-
 %if 0%{?rhel} >= 7
 ExclusiveArch: x86_64
 %endif
@@ -710,7 +706,6 @@ fi
 autoreconf -i
 %endif
 %patch2 -p1
-%patch3 -p1
 
 mkdir -p daemon/m4
 
@@ -789,10 +784,8 @@ export SKIP_TEST_CHARSET_FIDELITY=1
 export SKIP_TEST_VIRT_FORMAT_SH=1
 
 %if %{runtests}
-%ifnarch %{ix86} # RHBZ#870042
 make check
 %endif
-%endif
 
 
 %install
@@ -1050,6 +1043,14 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs
 
 
 %changelog
+* Fri Nov 23 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.63-2
+- Remove non-upstream patch designed to work around
+  https://bugzilla.redhat.com/show_bug.cgi?id=857026
+  to see if this has been fixed.
+- Re-enable tests on i686 to see if
+  https://bugzilla.redhat.com/show_bug.cgi?id=870042
+  has been fixed.
+
 * Fri Nov 23 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.63-1
 - New upstream version 1.19.63.