X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Flaunch.c;h=8bc96fd6efe05eff3bfee905a5312400554a3618;hb=0132890790a082c5d0f31cc64367b4897c8e88b7;hp=9262cc5c7db281f0dd1c3181b2a9144d67517366;hpb=4963be850090933e5769f9d3412d9eb86f522b1b;p=libguestfs.git diff --git a/src/launch.c b/src/launch.c index 9262cc5..8bc96fd 100644 --- a/src/launch.c +++ b/src/launch.c @@ -61,9 +61,7 @@ #include #include -#include "c-ctype.h" #include "glthread/lock.h" -#include "ignore-value.h" #include "guestfs.h" #include "guestfs-internal.h" @@ -342,6 +340,9 @@ guestfs__launch (guestfs_h *g) */ g->cmdline[0] = g->qemu; + if (qemu_supports (g, "-nodefconfig")) + add_cmdline (g, "-nodefconfig"); + /* qemu sometimes needs this option to enable hardware * virtualization, but some versions of 'qemu-kvm' will use KVM * regardless (even where this option appears in the help text). @@ -761,7 +762,7 @@ test_qemu (guestfs_h *g) goto error; snprintf (cmd, sizeof cmd, "LC_ALL=C '%s' -nographic -version 2>/dev/null", - g->qemu); + g->qemu); fp = popen (cmd, "r"); if (fp) {