Skip to content

Commit

Permalink
Correct occurrences of
Browse files Browse the repository at this point in the history
- Documentation/kvm/ to Documentation/virtual/kvm
- Documentation/uml/ to Documentation/virtual/uml
- Documentation/lguest/ to Documentation/virtual/lguest
throughout the kernel source tree.

Signed-off-by: Rob Landley <[email protected]>
Signed-off-by: Randy Dunlap <[email protected]>
  • Loading branch information
landley authored and rddunlap committed May 6, 2011
1 parent 570aa13 commit 6151658
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Documentation/virtual/kvm/review-checklist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Review checklist for kvm patches
2. Patches should be against kvm.git master branch.

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

4. New state must include support for save/restore.
Expand Down
3 changes: 2 additions & 1 deletion Documentation/virtual/lguest/lguest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ Running Lguest:

- 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:
64: the amount of memory to use, in MB.
Expand Down
4 changes: 2 additions & 2 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -3807,7 +3807,7 @@ M: Rusty Russell <[email protected]>
L: [email protected]
W: http://lguest.ozlabs.org/
S: Odd Fixes
F: Documentation/lguest/
F: Documentation/virtual/lguest/
F: arch/x86/lguest/
F: drivers/lguest/
F: include/linux/lguest*.h
Expand Down Expand Up @@ -6618,7 +6618,7 @@ L: [email protected]
L: [email protected]
W: http://user-mode-linux.sourceforge.net
S: Maintained
F: Documentation/uml/
F: Documentation/virtual/uml/
F: arch/um/
F: fs/hostfs/
F: fs/hppfs/
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/lguest/boot.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* 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,
* 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.
*
* Secondly, we only run specially modified Guests, not normal kernels: setting
Expand Down
6 changes: 4 additions & 2 deletions drivers/lguest/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ config LGUEST
---help---
This is a very simple module which allows you to run
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",
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.
2 changes: 1 addition & 1 deletion drivers/lguest/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Mastery: PREFIX=M
Beer:
@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:
@sh ../../Documentation/lguest/extract $(PREFIX) `find ../../* -name '*.[chS]' -wholename '*lguest*'`
@sh ../../Documentation/virtual/lguest/extract $(PREFIX) `find ../../* -name '*.[chS]' -wholename '*lguest*'`
Puppy:
@clear
@printf " __ \n (___()'\`;\n /, /\`\n \\\\\\\"--\\\\\\ \n"
Expand Down
2 changes: 1 addition & 1 deletion drivers/vhost/vhost.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Author: Michael S. Tsirkin <[email protected]>
*
* 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.
*
Expand Down

0 comments on commit 6151658

Please sign in to comment.