[Pkg-libvirt-commits] [libguestfs] 51/66: launch: direct: Supply -M option when testing qemu for devices.

[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 272b3ae7df1e6358422fc6576c042aeaa4b79188
Author: Hilko Bengen <bengen at hilluzination.de>
Date:   Tue Apr 29 23:18:01 2014 +0200

    launch: direct: Supply -M option when testing qemu for devices.
    
    qemu-system-arm 2.0 as currently available through Debian/unstable
    doesn't want to tell us anything about available devices unless we
    specify a machine type.
    
    (cherry picked from commit c4a91a1866ddba3a52a2b9f2be7d66f519d958ba)
---
 src/launch-direct.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/launch-direct.c b/src/launch-direct.c
index 1460c56..2332368 100644
--- a/src/launch-direct.c
+++ b/src/launch-direct.c
@@ -1020,6 +1020,10 @@ test_qemu (guestfs_h *g, struct backend_direct_data *data)
   guestfs___cmd_add_arg (cmd3, g->hv);
   guestfs___cmd_add_arg (cmd3, "-display");
   guestfs___cmd_add_arg (cmd3, "none");
+#ifdef MACHINE_TYPE
+  guestfs___cmd_add_arg (cmd3, "-M");
+  guestfs___cmd_add_arg (cmd3, MACHINE_TYPE);
+#endif
   guestfs___cmd_add_arg (cmd3, "-machine");
   guestfs___cmd_add_arg (cmd3, "accel=kvm:tcg");
   guestfs___cmd_add_arg (cmd3, "-device");

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