Commit 7663164f authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs

* 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs:
  Correct occurrences of - Documentation/kvm/ to Documentation/virtual/kvm - Documentation/uml/ to Documentation/virtual/uml - Documentation/lguest/ to Documentation/virtual/lguest throughout the kernel source tree.
  Add a 00-INDEX file to Documentation/virtual Remove uml from the top level 00-INDEX file.
  Move kvm, uml, and lguest subdirectories under a common "virtual" directory, I.E:
parents e66eed65 61516587
...@@ -328,8 +328,6 @@ sysrq.txt ...@@ -328,8 +328,6 @@ sysrq.txt
- info on the magic SysRq key. - info on the magic SysRq key.
telephony/ telephony/
- directory with info on telephony (e.g. voice over IP) support. - directory with info on telephony (e.g. voice over IP) support.
uml/
- directory with information about User Mode Linux.
unicode.txt unicode.txt
- info on the Unicode character/font mapping used in Linux. - info on the Unicode character/font mapping used in Linux.
unshare.txt unshare.txt
......
Virtualization support in the Linux kernel.
00-INDEX
- this file.
kvm/
- Kernel Virtual Machine. See also http://linux-kvm.org
lguest/
- Extremely simple hypervisor for experimental/educational use.
uml/
- User Mode Linux, builds/runs Linux kernel as a userspace program.
...@@ -7,7 +7,7 @@ Review checklist for kvm patches ...@@ -7,7 +7,7 @@ Review checklist for kvm patches
2. Patches should be against kvm.git master branch. 2. Patches should be against kvm.git master branch.
3. If the patch introduces or modifies a new userspace API: 3. If the patch introduces or modifies a new userspace API:
- the API must be documented in Documentation/kvm/api.txt - the API must be documented in Documentation/virtual/kvm/api.txt
- the API must be discoverable using KVM_CHECK_EXTENSION - the API must be discoverable using KVM_CHECK_EXTENSION
4. New state must include support for save/restore. 4. New state must include support for save/restore.
......
...@@ -74,7 +74,8 @@ Running Lguest: ...@@ -74,7 +74,8 @@ Running Lguest:
- Run an lguest as root: - Run an lguest as root:
Documentation/lguest/lguest 64 vmlinux --tunnet=192.168.19.1 --block=rootfile root=/dev/vda Documentation/virtual/lguest/lguest 64 vmlinux --tunnet=192.168.19.1 \
--block=rootfile root=/dev/vda
Explanation: Explanation:
64: the amount of memory to use, in MB. 64: the amount of memory to use, in MB.
......
...@@ -3814,7 +3814,7 @@ M: Rusty Russell <rusty@rustcorp.com.au> ...@@ -3814,7 +3814,7 @@ M: Rusty Russell <rusty@rustcorp.com.au>
L: lguest@lists.ozlabs.org L: lguest@lists.ozlabs.org
W: http://lguest.ozlabs.org/ W: http://lguest.ozlabs.org/
S: Odd Fixes S: Odd Fixes
F: Documentation/lguest/ F: Documentation/virtual/lguest/
F: arch/x86/lguest/ F: arch/x86/lguest/
F: drivers/lguest/ F: drivers/lguest/
F: include/linux/lguest*.h F: include/linux/lguest*.h
...@@ -6632,7 +6632,7 @@ L: user-mode-linux-devel@lists.sourceforge.net ...@@ -6632,7 +6632,7 @@ L: user-mode-linux-devel@lists.sourceforge.net
L: user-mode-linux-user@lists.sourceforge.net L: user-mode-linux-user@lists.sourceforge.net
W: http://user-mode-linux.sourceforge.net W: http://user-mode-linux.sourceforge.net
S: Maintained S: Maintained
F: Documentation/uml/ F: Documentation/virtual/uml/
F: arch/um/ F: arch/um/
F: fs/hostfs/ F: fs/hostfs/
F: fs/hppfs/ F: fs/hppfs/
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* kernel and insert a module (lg.ko) which allows us to run other Linux * kernel and insert a module (lg.ko) which allows us to run other Linux
* kernels the same way we'd run processes. We call the first kernel the Host, * kernels the same way we'd run processes. We call the first kernel the Host,
* and the others the Guests. The program which sets up and configures Guests * and the others the Guests. The program which sets up and configures Guests
* (such as the example in Documentation/lguest/lguest.c) is called the * (such as the example in Documentation/virtual/lguest/lguest.c) is called the
* Launcher. * Launcher.
* *
* Secondly, we only run specially modified Guests, not normal kernels: setting * Secondly, we only run specially modified Guests, not normal kernels: setting
......
...@@ -5,8 +5,10 @@ config LGUEST ...@@ -5,8 +5,10 @@ config LGUEST
---help--- ---help---
This is a very simple module which allows you to run This is a very simple module which allows you to run
multiple instances of the same Linux kernel, using the multiple instances of the same Linux kernel, using the
"lguest" command found in the Documentation/lguest directory. "lguest" command found in the Documentation/virtual/lguest
directory.
Note that "lguest" is pronounced to rhyme with "fell quest", Note that "lguest" is pronounced to rhyme with "fell quest",
not "rustyvisor". See Documentation/lguest/lguest.txt. not "rustyvisor". See Documentation/virtual/lguest/lguest.txt.
If unsure, say N. If curious, say M. If masochistic, say Y. If unsure, say N. If curious, say M. If masochistic, say Y.
...@@ -18,7 +18,7 @@ Mastery: PREFIX=M ...@@ -18,7 +18,7 @@ Mastery: PREFIX=M
Beer: Beer:
@for f in Preparation Guest Drivers Launcher Host Switcher Mastery; do echo "{==- $$f -==}"; make -s $$f; done; echo "{==-==}" @for f in Preparation Guest Drivers Launcher Host Switcher Mastery; do echo "{==- $$f -==}"; make -s $$f; done; echo "{==-==}"
Preparation Preparation! Guest Drivers Launcher Host Switcher Mastery: Preparation Preparation! Guest Drivers Launcher Host Switcher Mastery:
@sh ../../Documentation/lguest/extract $(PREFIX) `find ../../* -name '*.[chS]' -wholename '*lguest*'` @sh ../../Documentation/virtual/lguest/extract $(PREFIX) `find ../../* -name '*.[chS]' -wholename '*lguest*'`
Puppy: Puppy:
@clear @clear
@printf " __ \n (___()'\`;\n /, /\`\n \\\\\\\"--\\\\\\ \n" @printf " __ \n (___()'\`;\n /, /\`\n \\\\\\\"--\\\\\\ \n"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Author: Michael S. Tsirkin <mst@redhat.com> * Author: Michael S. Tsirkin <mst@redhat.com>
* *
* Inspiration, some code, and most witty comments come from * Inspiration, some code, and most witty comments come from
* Documentation/lguest/lguest.c, by Rusty Russell * Documentation/virtual/lguest/lguest.c, by Rusty Russell
* *
* This work is licensed under the terms of the GNU GPL, version 2. * This work is licensed under the terms of the GNU GPL, version 2.
* *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment