diff options
author | 2009-08-24 18:28:49 +0300 | |
---|---|---|
committer | 2009-08-24 18:28:49 +0300 | |
commit | 193cd7fc43b3f5e1c3eb07e512fe65fc0bfcfded (patch) | |
tree | 8b3ce0860a3485c07aa25dd20dc97835138728bb /qemu-monitor.hx | |
parent | Merge commit '1632dc6a8f6e8662f4a203b6fb8c0371ca216946' into upstream-merge (diff) | |
parent | Unbreak large mem support by removing kqemu (diff) | |
download | qemu-kvm-193cd7fc43b3f5e1c3eb07e512fe65fc0bfcfded.tar.gz qemu-kvm-193cd7fc43b3f5e1c3eb07e512fe65fc0bfcfded.tar.bz2 qemu-kvm-193cd7fc43b3f5e1c3eb07e512fe65fc0bfcfded.zip |
Merge commit '4a1418e07bdcfaa3177739e04707ecaec75d89e1' into upstream-merge
* commit '4a1418e07bdcfaa3177739e04707ecaec75d89e1':
Unbreak large mem support by removing kqemu
Add a configure switch to enable / disable all user targets. I felt compelled to do it for symmetry, mostly it is useful to disable user targets when you don't want to build them.
Migration via unix sockets.
Conflicts:
Makefile.target
exec.c
osdep.c
vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-monitor.hx')
-rw-r--r-- | qemu-monitor.hx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 0dc2ad7d2..c193a1e08 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -57,8 +57,6 @@ show virtual to physical memory mappings (i386 only) show the active virtual memory mappings (i386 only) @item info hpet show state of HPET (i386 only) -@item info kqemu -show KQEMU information @item info kvm show KVM information @item info usb |