From: Daniel Berrange <berrange@redhat.com>
Date: Tue, 24 Aug 2010 13:27:15 +0000 (+0100)
Subject: Add -nodefconfig command line option to qemu.
X-Git-Tag: 1.2.12~2
X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=58e18536854785ab033fb80b0b96f6adc389079e

Add -nodefconfig command line option to qemu.

Without this option, qemu will read some defaults from /etc/qemu/
configuration files.

Cherry picked from commit 6d15d4e7c27477507ba355384a340ce86cec617b
and backported to stable 1.2 branch.
---

diff --git a/src/guestfs.c b/src/guestfs.c
index 68b5b06..5f6be02 100644
--- a/src/guestfs.c
+++ b/src/guestfs.c
@@ -1143,6 +1143,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).