diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2011-07-22 01:09:50 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-07-22 01:09:50 -0400 |
commit | 9f54288def3f92b7805eb6d4b1ddcd73ecf6e889 (patch) | |
tree | bb46242a92e47112c2967354b3be0c6daecae7a7 /Documentation | |
parent | 3c3ed482dc077a67903a58c9e1aedba1bb18c18a (diff) |
lguest: update comments
Also removes a long-unused #define and an extraneous semicolon.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/virtual/lguest/lguest.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Documentation/virtual/lguest/lguest.c b/Documentation/virtual/lguest/lguest.c index 80261d34da3d..043bd7df3139 100644 --- a/Documentation/virtual/lguest/lguest.c +++ b/Documentation/virtual/lguest/lguest.c | |||
@@ -51,7 +51,7 @@ | |||
51 | #include <asm/bootparam.h> | 51 | #include <asm/bootparam.h> |
52 | #include "../../../include/linux/lguest_launcher.h" | 52 | #include "../../../include/linux/lguest_launcher.h" |
53 | /*L:110 | 53 | /*L:110 |
54 | * We can ignore the 42 include files we need for this program, but I do want | 54 | * We can ignore the 43 include files we need for this program, but I do want |
55 | * to draw attention to the use of kernel-style types. | 55 | * to draw attention to the use of kernel-style types. |
56 | * | 56 | * |
57 | * As Linus said, "C is a Spartan language, and so should your naming be." I | 57 | * As Linus said, "C is a Spartan language, and so should your naming be." I |
@@ -65,7 +65,6 @@ typedef uint16_t u16; | |||
65 | typedef uint8_t u8; | 65 | typedef uint8_t u8; |
66 | /*:*/ | 66 | /*:*/ |
67 | 67 | ||
68 | #define PAGE_PRESENT 0x7 /* Present, RW, Execute */ | ||
69 | #define BRIDGE_PFX "bridge:" | 68 | #define BRIDGE_PFX "bridge:" |
70 | #ifndef SIOCBRADDIF | 69 | #ifndef SIOCBRADDIF |
71 | #define SIOCBRADDIF 0x89a2 /* add interface to bridge */ | 70 | #define SIOCBRADDIF 0x89a2 /* add interface to bridge */ |
@@ -1359,7 +1358,7 @@ static void setup_console(void) | |||
1359 | * --sharenet=<name> option which opens or creates a named pipe. This can be | 1358 | * --sharenet=<name> option which opens or creates a named pipe. This can be |
1360 | * used to send packets to another guest in a 1:1 manner. | 1359 | * used to send packets to another guest in a 1:1 manner. |
1361 | * | 1360 | * |
1362 | * More sopisticated is to use one of the tools developed for project like UML | 1361 | * More sophisticated is to use one of the tools developed for project like UML |
1363 | * to do networking. | 1362 | * to do networking. |
1364 | * | 1363 | * |
1365 | * Faster is to do virtio bonding in kernel. Doing this 1:1 would be | 1364 | * Faster is to do virtio bonding in kernel. Doing this 1:1 would be |
@@ -1369,7 +1368,7 @@ static void setup_console(void) | |||
1369 | * multiple inter-guest channels behind one interface, although it would | 1368 | * multiple inter-guest channels behind one interface, although it would |
1370 | * require some manner of hotplugging new virtio channels. | 1369 | * require some manner of hotplugging new virtio channels. |
1371 | * | 1370 | * |
1372 | * Finally, we could implement a virtio network switch in the kernel. | 1371 | * Finally, we could use a virtio network switch in the kernel, ie. vhost. |
1373 | :*/ | 1372 | :*/ |
1374 | 1373 | ||
1375 | static u32 str2ip(const char *ipaddr) | 1374 | static u32 str2ip(const char *ipaddr) |
@@ -2006,10 +2005,7 @@ int main(int argc, char *argv[]) | |||
2006 | /* Tell the entry path not to try to reload segment registers. */ | 2005 | /* Tell the entry path not to try to reload segment registers. */ |
2007 | boot->hdr.loadflags |= KEEP_SEGMENTS; | 2006 | boot->hdr.loadflags |= KEEP_SEGMENTS; |
2008 | 2007 | ||
2009 | /* | 2008 | /* We tell the kernel to initialize the Guest. */ |
2010 | * We tell the kernel to initialize the Guest: this returns the open | ||
2011 | * /dev/lguest file descriptor. | ||
2012 | */ | ||
2013 | tell_kernel(start); | 2009 | tell_kernel(start); |
2014 | 2010 | ||
2015 | /* Ensure that we terminate if a device-servicing child dies. */ | 2011 | /* Ensure that we terminate if a device-servicing child dies. */ |