---

yaml --- r: 252260 b: refs/heads/master c: 2f3e4af h: refs/heads/master v: v3
git-mirror · May 20, 2011 · 8eb1061 · 8eb1061
1 parent 0f259b2
commit 8eb1061
Show file tree

Hide file tree

Showing 22 changed files with 23 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d410fa4ef99112386de5f218dd7df7b4fca910b4
+refs/heads/master: 2f3e4af471e38e0658e701973238ae4b5e50fcd6
diff --git a/trunk/Documentation/00-INDEX b/trunk/Documentation/00-INDEX
@@ -326,8 +326,6 @@ sysrq.txt
 	- info on the magic SysRq key.
 telephony/
 	- directory with info on telephony (e.g. voice over IP) support.
-uml/
-	- directory with information about User Mode Linux.
 unicode.txt
 	- info on the Unicode character/font mapping used in Linux.
 unshare.txt

diff --git a/trunk/Documentation/virtual/00-INDEX b/trunk/Documentation/virtual/00-INDEX
@@ -0,0 +1,10 @@
+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.
diff --git a/trunk/Documentation/kvm/api.txt → trunk/Documentation/virtual/kvm/api.txt b/trunk/Documentation/kvm/api.txt → trunk/Documentation/virtual/kvm/api.txt
diff --git a/trunk/Documentation/kvm/cpuid.txt → trunk/Documentation/virtual/kvm/cpuid.txt b/trunk/Documentation/kvm/cpuid.txt → trunk/Documentation/virtual/kvm/cpuid.txt
diff --git a/trunk/Documentation/kvm/locking.txt → trunk/Documentation/virtual/kvm/locking.txt b/trunk/Documentation/kvm/locking.txt → trunk/Documentation/virtual/kvm/locking.txt
diff --git a/trunk/Documentation/kvm/mmu.txt → trunk/Documentation/virtual/kvm/mmu.txt b/trunk/Documentation/kvm/mmu.txt → trunk/Documentation/virtual/kvm/mmu.txt
diff --git a/trunk/Documentation/kvm/msr.txt → trunk/Documentation/virtual/kvm/msr.txt b/trunk/Documentation/kvm/msr.txt → trunk/Documentation/virtual/kvm/msr.txt
diff --git a/trunk/Documentation/kvm/ppc-pv.txt → trunk/Documentation/virtual/kvm/ppc-pv.txt b/trunk/Documentation/kvm/ppc-pv.txt → trunk/Documentation/virtual/kvm/ppc-pv.txt
diff --git a/trunk/Documentation/kvm/review-checklist.txt → ...entation/virtual/kvm/review-checklist.txt b/trunk/Documentation/kvm/review-checklist.txt → ...entation/virtual/kvm/review-checklist.txt
@@ -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.

diff --git a/trunk/Documentation/kvm/timekeeping.txt → ...Documentation/virtual/kvm/timekeeping.txt b/trunk/Documentation/kvm/timekeeping.txt → ...Documentation/virtual/kvm/timekeeping.txt
diff --git a/trunk/Documentation/lguest/.gitignore → ...k/Documentation/virtual/lguest/.gitignore b/trunk/Documentation/lguest/.gitignore → ...k/Documentation/virtual/lguest/.gitignore
diff --git a/trunk/Documentation/lguest/Makefile → trunk/Documentation/virtual/lguest/Makefile b/trunk/Documentation/lguest/Makefile → trunk/Documentation/virtual/lguest/Makefile
diff --git a/trunk/Documentation/lguest/extract → trunk/Documentation/virtual/lguest/extract b/trunk/Documentation/lguest/extract → trunk/Documentation/virtual/lguest/extract
diff --git a/trunk/Documentation/lguest/lguest.c → trunk/Documentation/virtual/lguest/lguest.c b/trunk/Documentation/lguest/lguest.c → trunk/Documentation/virtual/lguest/lguest.c
diff --git a/trunk/Documentation/lguest/lguest.txt → ...k/Documentation/virtual/lguest/lguest.txt b/trunk/Documentation/lguest/lguest.txt → ...k/Documentation/virtual/lguest/lguest.txt
@@ -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.

diff --git a/...Documentation/uml/UserModeLinux-HOWTO.txt → ...ation/virtual/uml/UserModeLinux-HOWTO.txt b/...Documentation/uml/UserModeLinux-HOWTO.txt → ...ation/virtual/uml/UserModeLinux-HOWTO.txt
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -3814,7 +3814,7 @@ M:	Rusty Russell <rusty@rustcorp.com.au>
 L:	lguest@lists.ozlabs.org
 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
@@ -6632,7 +6632,7 @@ L:	user-mode-linux-devel@lists.sourceforge.net
 L:	user-mode-linux-user@lists.sourceforge.net
 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/

diff --git a/trunk/arch/x86/lguest/boot.c b/trunk/arch/x86/lguest/boot.c
@@ -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

diff --git a/trunk/drivers/lguest/Kconfig b/trunk/drivers/lguest/Kconfig
@@ -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.
diff --git a/trunk/drivers/lguest/Makefile b/trunk/drivers/lguest/Makefile
@@ -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"

diff --git a/trunk/drivers/vhost/vhost.c b/trunk/drivers/vhost/vhost.c
@@ -4,7 +4,7 @@
  * Author: Michael S. Tsirkin <mst@redhat.com>
  *
  * 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.
  *