diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-28 17:08:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-28 17:08:10 -0400 |
commit | 51bbd47d3641beb4a8c2a35d55488c859b60c82d (patch) | |
tree | c12dfc40600cda1304cee7018d6c4582f31b466f | |
parent | a5a8283495f55efcfbd83540468f801219a960f2 (diff) | |
parent | 72e91863cb30076a93901b84ec34286536ef6893 (diff) |
Merge branch 'lguest' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* 'lguest' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
lguest: Odd Fixes
lguest: clean up warnings in demonstration launcher.
-rw-r--r-- | Documentation/lguest/Makefile | 3 | ||||
-rw-r--r-- | Documentation/lguest/lguest.c | 23 | ||||
-rw-r--r-- | MAINTAINERS | 2 |
3 files changed, 15 insertions, 13 deletions
diff --git a/Documentation/lguest/Makefile b/Documentation/lguest/Makefile index 28c8cdfcafd8..bebac6b4f332 100644 --- a/Documentation/lguest/Makefile +++ b/Documentation/lguest/Makefile | |||
@@ -1,5 +1,6 @@ | |||
1 | # This creates the demonstration utility "lguest" which runs a Linux guest. | 1 | # This creates the demonstration utility "lguest" which runs a Linux guest. |
2 | CFLAGS:=-m32 -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include -I../../arch/x86/include -U_FORTIFY_SOURCE | 2 | # Missing headers? Add "-I../../include -I../../arch/x86/include" |
3 | CFLAGS:=-m32 -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -U_FORTIFY_SOURCE | ||
3 | 4 | ||
4 | all: lguest | 5 | all: lguest |
5 | 6 | ||
diff --git a/Documentation/lguest/lguest.c b/Documentation/lguest/lguest.c index e9ce3c554514..8a6a8c6d4980 100644 --- a/Documentation/lguest/lguest.c +++ b/Documentation/lguest/lguest.c | |||
@@ -39,14 +39,14 @@ | |||
39 | #include <limits.h> | 39 | #include <limits.h> |
40 | #include <stddef.h> | 40 | #include <stddef.h> |
41 | #include <signal.h> | 41 | #include <signal.h> |
42 | #include "linux/lguest_launcher.h" | 42 | #include <linux/virtio_config.h> |
43 | #include "linux/virtio_config.h" | 43 | #include <linux/virtio_net.h> |
44 | #include "linux/virtio_net.h" | 44 | #include <linux/virtio_blk.h> |
45 | #include "linux/virtio_blk.h" | 45 | #include <linux/virtio_console.h> |
46 | #include "linux/virtio_console.h" | 46 | #include <linux/virtio_rng.h> |
47 | #include "linux/virtio_rng.h" | 47 | #include <linux/virtio_ring.h> |
48 | #include "linux/virtio_ring.h" | 48 | #include <asm/bootparam.h> |
49 | #include "asm/bootparam.h" | 49 | #include "../../include/linux/lguest_launcher.h" |
50 | /*L:110 | 50 | /*L:110 |
51 | * We can ignore the 42 include files we need for this program, but I do want | 51 | * We can ignore the 42 include files we need for this program, but I do want |
52 | * to draw attention to the use of kernel-style types. | 52 | * to draw attention to the use of kernel-style types. |
@@ -1447,14 +1447,15 @@ static void add_to_bridge(int fd, const char *if_name, const char *br_name) | |||
1447 | static void configure_device(int fd, const char *tapif, u32 ipaddr) | 1447 | static void configure_device(int fd, const char *tapif, u32 ipaddr) |
1448 | { | 1448 | { |
1449 | struct ifreq ifr; | 1449 | struct ifreq ifr; |
1450 | struct sockaddr_in *sin = (struct sockaddr_in *)&ifr.ifr_addr; | 1450 | struct sockaddr_in sin; |
1451 | 1451 | ||
1452 | memset(&ifr, 0, sizeof(ifr)); | 1452 | memset(&ifr, 0, sizeof(ifr)); |
1453 | strcpy(ifr.ifr_name, tapif); | 1453 | strcpy(ifr.ifr_name, tapif); |
1454 | 1454 | ||
1455 | /* Don't read these incantations. Just cut & paste them like I did! */ | 1455 | /* Don't read these incantations. Just cut & paste them like I did! */ |
1456 | sin->sin_family = AF_INET; | 1456 | sin.sin_family = AF_INET; |
1457 | sin->sin_addr.s_addr = htonl(ipaddr); | 1457 | sin.sin_addr.s_addr = htonl(ipaddr); |
1458 | memcpy(&ifr.ifr_addr, &sin, sizeof(sin)); | ||
1458 | if (ioctl(fd, SIOCSIFADDR, &ifr) != 0) | 1459 | if (ioctl(fd, SIOCSIFADDR, &ifr) != 0) |
1459 | err(1, "Setting %s interface address", tapif); | 1460 | err(1, "Setting %s interface address", tapif); |
1460 | ifr.ifr_flags = IFF_UP; | 1461 | ifr.ifr_flags = IFF_UP; |
diff --git a/MAINTAINERS b/MAINTAINERS index 5fa8451ec80c..4523d6cb4c4e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -3488,7 +3488,7 @@ LGUEST | |||
3488 | M: Rusty Russell <rusty@rustcorp.com.au> | 3488 | M: Rusty Russell <rusty@rustcorp.com.au> |
3489 | L: lguest@lists.ozlabs.org | 3489 | L: lguest@lists.ozlabs.org |
3490 | W: http://lguest.ozlabs.org/ | 3490 | W: http://lguest.ozlabs.org/ |
3491 | S: Maintained | 3491 | S: Odd Fixes |
3492 | F: Documentation/lguest/ | 3492 | F: Documentation/lguest/ |
3493 | F: arch/x86/lguest/ | 3493 | F: arch/x86/lguest/ |
3494 | F: drivers/lguest/ | 3494 | F: drivers/lguest/ |