Various fixes to build and test in Koji.

diff --git a/libguestfs.spec.in b/libguestfs.spec.in
index fb95c18..ef07ea8 100644 (file)
--- a/libguestfs.spec.in
+++ b/libguestfs.spec.in
@@ -13,6 +13,10 @@ URL:         http://et.redhat.com/~rjones/libguestfs/
 Source0:     http://et.redhat.com/~rjones/libguestfs/files/%{name}-%{version}.tar.gz
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Source0:     http://et.redhat.com/~rjones/libguestfs/files/%{name}-%{version}.tar.gz
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
 

+# Currently fails on non-x86 because of this error:
+# "qemu: linux kernel too old to load a ram disk"
+ExclusiveArch: %{ix86} x86_64
+

 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text

diff --git a/src/guestfs.c b/src/guestfs.c
index 74fd76b..0b3142c 100644 (file)
--- a/src/guestfs.c
+++ b/src/guestfs.c
@@ -730,7 +730,9 @@ guestfs_launch (guestfs_h *g)
 
     add_cmdline (g, "-m");
     add_cmdline (g, "384");      /* XXX Choose best size. */
 
     add_cmdline (g, "-m");
     add_cmdline (g, "384");      /* XXX Choose best size. */

+#if defined(__i386__) || defined(__x86_64)

     add_cmdline (g, "-no-kqemu"); /* Avoids a warning. */
     add_cmdline (g, "-no-kqemu"); /* Avoids a warning. */

+#endif

     add_cmdline (g, "-kernel");
     add_cmdline (g, (char *) kernel);
     add_cmdline (g, "-initrd");
     add_cmdline (g, "-kernel");
     add_cmdline (g, (char *) kernel);
     add_cmdline (g, "-initrd");