From 3814680423984b3c46c2f99e944c2a71862bde9f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 24 Oct 2011 13:24:16 +0100 Subject: Add test for qemu broken -machine option (RHBZ#748266). Also add this option, if necessary, when testing for virtio-serial support. When the workaround is enabled, we specify machine type 'pc'. --- src/launch.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src') diff --git a/src/launch.c b/src/launch.c index 1988f70c..7b3372c2 100644 --- a/src/launch.c +++ b/src/launch.c @@ -586,7 +586,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 -- cgit