Re-add: 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,
https://bugzilla.redhat.com/show_bug.cgi?id=857026

0001-i386-Add-noapic-flag-to-work-around-a-qemu-or-kernel.patch

@@ -0,0 +1,14 @@
+diff --git a/src/launch.c b/src/launch.c
+index cb1d80b..31d5c65 100644
+--- a/src/launch.c
++++ b/src/launch.c
+@@ -812,6 +812,9 @@ guestfs___appliance_command_line (guestfs_h *g, const char *appliance_dev)
+   ret = safe_asprintf
+     (g,
+      "panic=1"             /* force kernel to panic if daemon exits */
++#ifdef __i386__
++     " noapic"                  /* workaround for RHBZ#857026 */
++#endif
+      " console=" SERIAL_CONSOLE /* serial console */
+      " udevtimeout=600" /* good for very slow systems (RHBZ#480319) */
+      " no_timer_check"  /* fix for RHBZ#502058 */

libguestfs.spec

@@ -22,7 +22,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.19.63
-Release:       2%{?dist}
+Release:       3%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -39,6 +39,10 @@ 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
@@ -706,6 +710,7 @@ fi
 autoreconf -i
 %endif
 %patch2 -p1
+%patch3 -p1
 
 mkdir -p daemon/m4
 
@@ -1043,6 +1048,11 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs
 
 
 %changelog
+* Sat Nov 24 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.63-3
+- Re-add: 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,
+  https://bugzilla.redhat.com/show_bug.cgi?id=857026
+
 * 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