Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51bbd47d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents a5a82834 72e91863

Documentation/lguest/Makefile

+2 −1
Original line number Original line Diff line number Diff line 
# This creates the demonstration utility "lguest" which runs a Linux guest.

# This creates the demonstration utility "lguest" which runs a Linux guest.

CFLAGS:=-m32 -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include -I../../arch/x86/include -U_FORTIFY_SOURCE

# Missing headers?  Add "-I../../include -I../../arch/x86/include"

CFLAGS:=-m32 -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -U_FORTIFY_SOURCE





all: lguest

all: lguest

Documentation/lguest/lguest.c

+12 −11
Original line number Original line Diff line number Diff line
@@ -39,14 +39,14 @@ 
#include <limits.h>

#include <limits.h>

#include <stddef.h>

#include <stddef.h>

#include <signal.h>

#include <signal.h>

#include "linux/lguest_launcher.h"

#include <linux/virtio_config.h>

#include "linux/virtio_config.h"

#include <linux/virtio_net.h>

#include "linux/virtio_net.h"

#include <linux/virtio_blk.h>

#include "linux/virtio_blk.h"

#include <linux/virtio_console.h>

#include "linux/virtio_console.h"

#include <linux/virtio_rng.h>

#include "linux/virtio_rng.h"

#include <linux/virtio_ring.h>

#include "linux/virtio_ring.h"

#include <asm/bootparam.h>

#include "asm/bootparam.h"

#include "../../include/linux/lguest_launcher.h"

/*L:110

/*L:110

 * We can ignore the 42 include files we need for this program, but I do want

 * We can ignore the 42 include files we need for this program, but I do want

 * to draw attention to the use of kernel-style types.

 * 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) 
static void configure_device(int fd, const char *tapif, u32 ipaddr)

static void configure_device(int fd, const char *tapif, u32 ipaddr)

{

{

	struct ifreq ifr;

	struct ifreq ifr;

	struct sockaddr_in *sin = (struct sockaddr_in *)&ifr.ifr_addr;

	struct sockaddr_in sin;





	memset(&ifr, 0, sizeof(ifr));

	memset(&ifr, 0, sizeof(ifr));

	strcpy(ifr.ifr_name, tapif);

	strcpy(ifr.ifr_name, tapif);





	/* Don't read these incantations.  Just cut & paste them like I did! */

	/* Don't read these incantations.  Just cut & paste them like I did! */

	sin->sin_family = AF_INET;

	sin.sin_family = AF_INET;

	sin->sin_addr.s_addr = htonl(ipaddr);

	sin.sin_addr.s_addr = htonl(ipaddr);

	memcpy(&ifr.ifr_addr, &sin, sizeof(sin));

	if (ioctl(fd, SIOCSIFADDR, &ifr) != 0)

	if (ioctl(fd, SIOCSIFADDR, &ifr) != 0)

		err(1, "Setting %s interface address", tapif);

		err(1, "Setting %s interface address", tapif);

	ifr.ifr_flags = IFF_UP;

	ifr.ifr_flags = IFF_UP;

MAINTAINERS

+1 −1
Original line number Original line Diff line number Diff line
@@ -3488,7 +3488,7 @@ LGUEST 
M:	Rusty Russell <rusty@rustcorp.com.au>

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:	Maintained

S:	Odd Fixes

F:	Documentation/lguest/

F:	Documentation/lguest/

F:	arch/x86/lguest/

F:	arch/x86/lguest/

F:	drivers/lguest/

F:	drivers/lguest/