[libguestfs/f21] Upstream patch to use -M virt on 32 bit ARM (RHBZ#1199733).

[Richard W.M. Jones]

commit ede1943c26a5848cb7281b889803291d63259acb
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Mar 9 09:10:32 2015 +0000

    Upstream patch to use -M virt on 32 bit ARM (RHBZ#1199733).

 ...irt-on-32-bit-ARM-don-t-pass-dtb-paramete.patch | 32 ++++++++++++++++++++++
 libguestfs.spec                                    | 10 ++++++-
 2 files changed, 41 insertions(+), 1 deletion(-)
---
diff --git a/0001-arm-Use-M-virt-on-32-bit-ARM-don-t-pass-dtb-paramete.patch b/0001-arm-Use-M-virt-on-32-bit-ARM-don-t-pass-dtb-paramete.patch
new file mode 100644
index 0000000..8e2210d
--- /dev/null
+++ b/0001-arm-Use-M-virt-on-32-bit-ARM-don-t-pass-dtb-paramete.patch
@@ -0,0 +1,32 @@
+From af762e43424382d895d3a10aa6632adc601fdbad Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones at redhat.com>
+Date: Thu, 5 Mar 2015 10:25:46 +0000
+Subject: [PATCH] arm: Use -M virt on 32 bit ARM, don't pass -dtb parameter.
+
+Note this means all the dtb code in libguestfs & supermin is
+obsolete/unused, and may be deleted at some point in future.
+---
+ src/guestfs-internal.h | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h
+index 64bad70..43cdd4d 100644
+--- a/src/guestfs-internal.h
++++ b/src/guestfs-internal.h
+@@ -151,12 +151,7 @@
+ 
+ /* Machine types.  XXX Make these configurable. */
+ #ifdef __arm__
+-/* In future, we can use mach-virt and drop the device tree completely
+- * (because the plan is for qemu to entirely generate the device tree
+- * internally when using mach-virt).
+- */
+-#define MACHINE_TYPE "vexpress-a15"
+-#define DTB_WILDCARD "vexpress*a15-tc1.dtb"
++#define MACHINE_TYPE "virt"
+ #endif
+ #ifdef __aarch64__
+ #define MACHINE_TYPE "virt"
+-- 
+2.3.1
+
diff --git a/libguestfs.spec b/libguestfs.spec
index 18186a0..ab566f8 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -25,13 +25,16 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.28.6
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       LGPLv2+
 
 # Source and patches.
 URL:           http://libguestfs.org/
 Source0:       http://libguestfs.org/download/1.28-stable/%{name}-%{version}.tar.gz
 
+# Upstream patch to use -M virt on 32 bit ARM (RHBZ#1199733).
+Patch1:        0001-arm-Use-M-virt-on-32-bit-ARM-don-t-pass-dtb-paramete.patch
+
 # Basic build requirements:
 BuildRequires: perl(Pod::Simple)
 BuildRequires: perl(Pod::Man)
@@ -728,6 +731,8 @@ for %{name}.
 %prep
 %setup -q
 
+%patch1 -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.
@@ -1225,6 +1230,9 @@ popd
 
 
 %changelog
+* Mon Mar  9 2015 Richard W.M. Jones <rjones at redhat.com> - 1:1.28.6-2
+- Upstream patch to use -M virt on 32 bit ARM (RHBZ#1199733).
+
 * Tue Feb 03 2015 Richard W.M. Jones <rjones at redhat.com> - 1:1.28.6-1
 - New upstream version 1.28.6.