From d41a75a20f2e8f9ccc64c27b61f730e4cb4ee2c5 Mon Sep 17 00:00:00 2001 From: Brad Date: Tue, 26 Jul 2011 23:11:26 -0400 Subject: [PATCH 1/3] configure: display "no" for disabled kvm/vhost-net Fix configure display for non-Linux OS's and the KVM / vhost-net features to show "no" output instead of nothing at the end of the line. Signed-off-by: Brad Smith Acked-by: Jan Kiszka Signed-off-by: Stefan Hajnoczi --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 77194cf9a7..9d467802dd 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" From 0f1b583ee7db23cb31f68a9d9b55755ca95f9f3f Mon Sep 17 00:00:00 2001 From: Zhi Yong Wu Date: Wed, 27 Jul 2011 17:48:16 +0800 Subject: [PATCH 2/3] HMP: Remove the duplicated info "info kvm" in hmp-commands.hx. Signed-off-by: Zhi Yong Wu Signed-off-by: Stefan Hajnoczi --- hmp-commands.hx | 2 -- 1 file changed, 2 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index c857827618..0ccfb2867f 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1311,8 +1311,6 @@ show virtual to physical memory mappings (i386, SH4 and SPARC only) show the active virtual memory mappings (i386 only) @item info jit show dynamic compiler info -@item info kvm -show KVM information @item info numa show NUMA information @item info kvm From 793553acb3d70ae64e459fa067486c6c741133e7 Mon Sep 17 00:00:00 2001 From: Alexandre Raymond Date: Mon, 25 Jul 2011 23:56:02 -0400 Subject: [PATCH 3/3] Makefile: delete config.log in distclean Distclean should remove anything created by the configure script. Signed-off-by: Alexandre Raymond Signed-off-by: Stefan Hajnoczi --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 48552512d6..a0218a309b 100644 --- a/Makefile +++ b/Makefile @@ -226,6 +226,7 @@ distclean: clean rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys rm -f qemu-doc.log qemu-doc.pdf qemu-doc.pg qemu-doc.toc qemu-doc.tp rm -f qemu-doc.vr + rm -f config.log rm -f qemu-tech.info qemu-tech.aux qemu-tech.cp qemu-tech.dvi qemu-tech.fn qemu-tech.info qemu-tech.ky qemu-tech.log qemu-tech.pdf qemu-tech.pg qemu-tech.toc qemu-tech.tp qemu-tech.vr for d in $(TARGET_DIRS) $(QEMULIBS); do \ rm -rf $$d || exit 1 ; \