summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-08-04 17:14:01 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-08-04 17:14:01 -0500
commit6e855de900a4c5557816a662f412170b31b66d68 (patch)
treeecf9560ae018481fa9a49e1cae4c51f9442af0c9 /configure
parentdfa79e8acd0ffce337d78f3e1473647f1c38dc58 (diff)
parent793553acb3d70ae64e459fa067486c6c741133e7 (diff)
downloadqemu-6e855de900a4c5557816a662f412170b31b66d68.tar.gz
qemu-6e855de900a4c5557816a662f412170b31b66d68.tar.bz2
qemu-6e855de900a4c5557816a662f412170b31b66d68.zip
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 27f1fa9266..408d454759 100755
--- a/configure
+++ b/configure
@@ -113,7 +113,6 @@ curl=""
curses=""
docs=""
fdt=""
-kvm=""
nptl=""
sdl=""
vnc="yes"
@@ -129,9 +128,10 @@ xen=""
xen_ctrl_version=""
linux_aio=""
attr=""
-vhost_net=""
xfs=""
+vhost_net="no"
+kvm="no"
gprof="no"
debug_tcg="no"
debug_mon="no"