X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Flaunch.c;h=6c7a833633f4ab4a14fca52d73c3865d6e29a81f;hb=64fcfa644aca8a83412991520f7e5b7a652e505f;hp=ae1e10031c190b5c32428fe1c125df719a62e4c5;hpb=7ab934c605d0bf08843413a145c4068d2d35e7f3;p=libguestfs.git

diff --git a/src/launch.c b/src/launch.c
index ae1e100..6c7a833 100644
--- a/src/launch.c
+++ b/src/launch.c
@@ -530,7 +530,19 @@ launch_appliance (guestfs_h *g)
      */
     if (qemu_supports (g, "-machine")) {
       add_cmdline (g, "-machine");
+#if QEMU_MACHINE_TYPE_IS_BROKEN
+      /* Workaround for qemu 0.15: We have to add the '[type=]pc'
+       * since there is no default.  This is not a permanent solution
+       * because this only works on PC-like hardware.  Other platforms
+       * like ppc would need a different machine type.
+       *
+       * This bug is fixed in qemu commit 2645c6dcaf6ea2a51a, and was
+       * not a problem in qemu < 0.15.
+       */
+      add_cmdline (g, "pc,accel=kvm:tcg");
+#else
       add_cmdline (g, "accel=kvm:tcg");
+#endif
     } else {
       /* qemu sometimes needs this option to enable hardware
        * virtualization, but some versions of 'qemu-kvm' will use KVM