[Pkg-libvirt-commits] [libguestfs] 44/66: Added fix for qemu -device ?

[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 4f7acd3a25f215e823f83d8def7a886549d0a954
Author: Hilko Bengen <bengen at debian.org>
Date:   Tue Apr 29 23:42:39 2014 +0200

    Added fix for qemu -device ?
---
 ...qemu-2.0-needs-a-machine-type-for-display.patch | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 25 insertions(+)

diff --git a/debian/patches/0004-apparently-qemu-2.0-needs-a-machine-type-for-display.patch b/debian/patches/0004-apparently-qemu-2.0-needs-a-machine-type-for-display.patch
new file mode 100644
index 0000000..8096eef
--- /dev/null
+++ b/debian/patches/0004-apparently-qemu-2.0-needs-a-machine-type-for-display.patch
@@ -0,0 +1,24 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Tue, 29 Apr 2014 22:12:07 +0200
+Subject: apparently,
+ qemu 2.0 needs a machine type for displaying -device options.
+
+---
+ 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");
diff --git a/debian/patches/series b/debian/patches/series
index 68794b0..65c168f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
 0002-golang-Fix-for-out-of-tree-builds.patch
 0003-configure-Make-sure-grep-matches-qemu-2.x-version-st.patch
+0004-apparently-qemu-2.0-needs-a-machine-type-for-display.patch

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