Merge remote-tracking branch 'stefanha/trivial-patches' into staging

This commit is contained in:
Anthony Liguori 2011-08-04 17:14:01 -05:00
commit 6e855de900
3 changed files with 3 additions and 4 deletions

View File

@ -227,6 +227,7 @@ distclean: clean
rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys 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.log qemu-doc.pdf qemu-doc.pg qemu-doc.toc qemu-doc.tp
rm -f qemu-doc.vr 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 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 \ for d in $(TARGET_DIRS) $(QEMULIBS); do \
rm -rf $$d || exit 1 ; \ rm -rf $$d || exit 1 ; \

4
configure vendored
View File

@ -113,7 +113,6 @@ curl=""
curses="" curses=""
docs="" docs=""
fdt="" fdt=""
kvm=""
nptl="" nptl=""
sdl="" sdl=""
vnc="yes" vnc="yes"
@ -129,9 +128,10 @@ xen=""
xen_ctrl_version="" xen_ctrl_version=""
linux_aio="" linux_aio=""
attr="" attr=""
vhost_net=""
xfs="" xfs=""
vhost_net="no"
kvm="no"
gprof="no" gprof="no"
debug_tcg="no" debug_tcg="no"
debug_mon="no" debug_mon="no"

View File

@ -1311,8 +1311,6 @@ show virtual to physical memory mappings (i386, SH4 and SPARC only)
show the active virtual memory mappings (i386 only) show the active virtual memory mappings (i386 only)
@item info jit @item info jit
show dynamic compiler info show dynamic compiler info
@item info kvm
show KVM information
@item info numa @item info numa
show NUMA information show NUMA information
@item info kvm @item info kvm