[Pkg-libvirt-commits] [libguestfs] 39/72: arm: Use -M virt on 32 bit ARM, don't pass -dtb parameter.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository libguestfs.

commit 0e03cbb2af49ed2de143bc738623fdcecc56607a
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Mar 5 10:25:46 2015 +0000

    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.
    
    (cherry picked from commit af762e43424382d895d3a10aa6632adc601fdbad)
---
 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 31d28aa..537cadc 100644
--- a/src/guestfs-internal.h
+++ b/src/guestfs-internal.h
@@ -150,12 +150,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"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git