vde network backend

diff -Naurp linux_ORIG/arch/um/Kconfig.net linux/arch/um/Kconfig.net
@@ -108,6 +108,28 @@ config UML_NET_DAEMON
         more than one without conflict.  If you don't need UML networking,
         say N.
 
+config UML_NET_VDE
+	bool "VDE transport"
+	depends on UML_NET
+	help
+	This User-Mode Linux network transport allows one or more running
+	UMLs on a single host to communicate with each other and also
+	with the rest of the world using Virtual Distributed Ethernet,
+	an improved fork of uml_switch.
+
+	You must have libvdeplug installed in order to build the vde
+	transport into UML.
+
+	To use this form of networking, you will need to run vde_switch
+	on the host.
+
+	For more information, see <http://wiki.virtualsquare.org/>
+	That site has a good overview of what VDE is and also examples
+	of the UML command line to use to enable VDE networking.
+
+	If you need UML networking with VDE,
+	say Y.
+
 config UML_NET_MCAST
 	bool "Multicast transport"
 	depends on UML_NET

diff -Naurp linux_ORIG/arch/um/drivers/Makefile linux/arch/um/drivers/Makefile
@@ -18,11 +18,16 @@ port-objs := port_kern.o port_user.o
 harddog-objs := harddog_kern.o harddog_user.o
 
 LDFLAGS_pcap.o := -r $(shell $(CC) $(CFLAGS) -print-file-name=libpcap.a)
+LDFLAGS_vde.o := -r $(shell $(CC) $(CFLAGS) -print-file-name=libvdeplug.a)
 
-targets := pcap_kern.o pcap_user.o
+targets := pcap_kern.o pcap_user.o vde_kern.o vde_user.o
 
 $(obj)/pcap.o: $(obj)/pcap_kern.o $(obj)/pcap_user.o
 	$(LD) -r -dp -o $@ $^ $(LDFLAGS) $(LDFLAGS_pcap.o)
+
+$(obj)/vde.o: $(obj)/vde_kern.o $(obj)/vde_user.o
+	$(LD) -r -dp -o $@ $^ $(LDFLAGS) $(LDFLAGS_vde.o)
+
 #XXX: The call below does not work because the flags are added before the
 # object name, so nothing from the library gets linked.
 #$(call if_changed,ld)

@@ -37,6 +42,7 @@ obj-$(CONFIG_STDERR_CONSOLE) += stderr_c
 obj-$(CONFIG_UML_NET_SLIP) += slip.o slip_common.o
 obj-$(CONFIG_UML_NET_SLIRP) += slirp.o slip_common.o
 obj-$(CONFIG_UML_NET_DAEMON) += daemon.o 
+obj-$(CONFIG_UML_NET_VDE) += vde.o 
 obj-$(CONFIG_UML_NET_MCAST) += mcast.o 
 obj-$(CONFIG_UML_NET_PCAP) += pcap.o
 obj-$(CONFIG_UML_NET) += net.o 

@@ -54,6 +60,6 @@ obj-$(CONFIG_BLK_DEV_COW_COMMON) += cow_
 obj-$(CONFIG_UML_RANDOM) += random.o
 
 # pcap_user.o must be added explicitly.
-USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o pcap_user.o
+USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o pcap_user.o vde_user.o
 
 include arch/um/scripts/Makefile.rules

@@ -108,6 +108,28 @@ config UML_NET_DAEMON
         more than one without conflict.  If you don't need UML networking,
         say N.
 
+config UML_NET_VDE
+	bool "VDE transport"
+	depends on UML_NET
+	help
+	This User-Mode Linux network transport allows one or more running
+	UMLs on a single host to communicate with each other and also
+	with the rest of the world using Virtual Distributed Ethernet,
+	an improved fork of uml_switch.
+
+	You must have libvdeplug installed in order to build the vde
+	transport into UML.
+
+	To use this form of networking, you will need to run vde_switch
+	on the host.
+
+	For more information, see <http://wiki.virtualsquare.org/>
+	That site has a good overview of what VDE is and also examples
+	of the UML command line to use to enable VDE networking.
+
+	If you need UML networking with VDE,
+	say Y.
+
 config UML_NET_MCAST
 	bool "Multicast transport"
 	depends on UML_NET

@@ -18,11 +18,16 @@ port-objs := port_kern.o port_user.o
 harddog-objs := harddog_kern.o harddog_user.o
 
 LDFLAGS_pcap.o := -r $(shell $(CC) $(CFLAGS) -print-file-name=libpcap.a)
+LDFLAGS_vde.o := -r $(shell $(CC) $(CFLAGS) -print-file-name=libvdeplug.a)
 
-targets := pcap_kern.o pcap_user.o
+targets := pcap_kern.o pcap_user.o vde_kern.o vde_user.o
 
 $(obj)/pcap.o: $(obj)/pcap_kern.o $(obj)/pcap_user.o
 	$(LD) -r -dp -o $@ $^ $(LDFLAGS) $(LDFLAGS_pcap.o)
+
+$(obj)/vde.o: $(obj)/vde_kern.o $(obj)/vde_user.o
+	$(LD) -r -dp -o $@ $^ $(LDFLAGS) $(LDFLAGS_vde.o)
+
 #XXX: The call below does not work because the flags are added before the
 # object name, so nothing from the library gets linked.
 #$(call if_changed,ld)

@@ -37,6 +42,7 @@ obj-$(CONFIG_STDERR_CONSOLE) += stderr_c
 obj-$(CONFIG_UML_NET_SLIP) += slip.o slip_common.o
 obj-$(CONFIG_UML_NET_SLIRP) += slirp.o slip_common.o
 obj-$(CONFIG_UML_NET_DAEMON) += daemon.o 
+obj-$(CONFIG_UML_NET_VDE) += vde.o 
 obj-$(CONFIG_UML_NET_MCAST) += mcast.o 
 obj-$(CONFIG_UML_NET_PCAP) += pcap.o
 obj-$(CONFIG_UML_NET) += net.o 

@@ -54,6 +60,6 @@ obj-$(CONFIG_BLK_DEV_COW_COMMON) += cow_
 obj-$(CONFIG_UML_RANDOM) += random.o
 
 # pcap_user.o must be added explicitly.
-USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o pcap_user.o
+USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o pcap_user.o vde_user.o
 
 include arch/um/scripts/Makefile.rules

@@ -108,6 +108,28 @@ config UML_NET_DAEMON
         more than one without conflict.  If you don't need UML networking,
         say N.
 
+config UML_NET_VDE
+	bool "VDE transport"
+	depends on UML_NET
+	help
+	This User-Mode Linux network transport allows one or more running
+	UMLs on a single host to communicate with each other and also
+	with the rest of the world using Virtual Distributed Ethernet,
+	an improved fork of uml_switch.
+
+	You must have libvdeplug installed in order to build the vde
+	transport into UML.
+
+	To use this form of networking, you will need to run vde_switch
+	on the host.
+
+	For more information, see <http://wiki.virtualsquare.org/>
+	That site has a good overview of what VDE is and also examples
+	of the UML command line to use to enable VDE networking.
+
+	If you need UML networking with VDE,
+	say Y.
+
 config UML_NET_MCAST
 	bool "Multicast transport"
 	depends on UML_NET

@@ -18,11 +18,16 @@ port-objs := port_kern.o port_user.o
 harddog-objs := harddog_kern.o harddog_user.o
 
 LDFLAGS_pcap.o := -r $(shell $(CC) $(CFLAGS) -print-file-name=libpcap.a)
+LDFLAGS_vde.o := -r $(shell $(CC) $(CFLAGS) -print-file-name=libvdeplug.a)
 
-targets := pcap_kern.o pcap_user.o
+targets := pcap_kern.o pcap_user.o vde_kern.o vde_user.o
 
 $(obj)/pcap.o: $(obj)/pcap_kern.o $(obj)/pcap_user.o
 	$(LD) -r -dp -o $@ $^ $(LDFLAGS) $(LDFLAGS_pcap.o)
+
+$(obj)/vde.o: $(obj)/vde_kern.o $(obj)/vde_user.o
+	$(LD) -r -dp -o $@ $^ $(LDFLAGS) $(LDFLAGS_vde.o)
+
 #XXX: The call below does not work because the flags are added before the
 # object name, so nothing from the library gets linked.
 #$(call if_changed,ld)

@@ -37,6 +42,7 @@ obj-$(CONFIG_STDERR_CONSOLE) += stderr_c
 obj-$(CONFIG_UML_NET_SLIP) += slip.o slip_common.o
 obj-$(CONFIG_UML_NET_SLIRP) += slirp.o slip_common.o
 obj-$(CONFIG_UML_NET_DAEMON) += daemon.o 
+obj-$(CONFIG_UML_NET_VDE) += vde.o 
 obj-$(CONFIG_UML_NET_MCAST) += mcast.o 
 obj-$(CONFIG_UML_NET_PCAP) += pcap.o
 obj-$(CONFIG_UML_NET) += net.o 

@@ -54,6 +60,6 @@ obj-$(CONFIG_BLK_DEV_COW_COMMON) += cow_
 obj-$(CONFIG_UML_RANDOM) += random.o
 
 # pcap_user.o must be added explicitly.
-USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o pcap_user.o
+USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o pcap_user.o vde_user.o
 
 include arch/um/scripts/Makefile.rules

@@ -142,9 +142,9 @@
 +{
 +	struct vde_data *pri = (struct vde_data *) &lp->user;
 +
-+	if(pri->conn != NULL) {
++	if (pri->conn != NULL) {
 +		*skb = ether_adjust_skb(*skb, ETH_HEADER_OTHER);
-+		if(*skb == NULL)
++		if (*skb == NULL)
 +			return -ENOMEM;
 +
 +		return vde_user_read(pri->conn, skb_mac_header(*skb),

@@ -159,7 +159,7 @@
 +{
 +	struct vde_data *pri = (struct vde_data *) &lp->user;
 +
-+	if(pri->conn != NULL)
++	if (pri->conn != NULL)
 +		return vde_user_write((void *)pri->conn, (*skb)->data,
 +					(*skb)->len);
 +

@@ -189,22 +189,22 @@
 +	remain = split_if_spec(str, &init->vde_switch, mac_out, &port_str,
 +				&init->group, &mode_str, &init->descr, NULL);
 +
-+	if(remain != NULL)
++	if (remain != NULL)
 +		printk(KERN_WARNING "vde_setup - Ignoring extra data :"
 +					"'%s'\n", remain);
 +
-+	if(port_str != NULL) {
++	if (port_str != NULL) {
 +		init->port = simple_strtoul(port_str, &last, 10);
-+		if((*last != '\0') || (last == port_str)) {
++		if ((*last != '\0') || (last == port_str)) {
 +			printk(KERN_ERR "vde_setup - Bad port : '%s'\n",
 +						port_str);
 +			return 0;
 +		}
 +	}
 +	
-+	if(mode_str != NULL) {
++	if (mode_str != NULL) {
 +		init->mode = simple_strtoul(mode_str, &last, 8);
-+		if((*last != '\0') || (last == mode_str)) {
++		if ((*last != '\0') || (last == mode_str)) {
 +			printk(KERN_ERR "vde_setup - Bad mode : '%s'\n",
 +						mode_str);
 +			return 0;

@@ -265,7 +265,7 @@
 +
 +	conn = vde_open(pri->vde_switch, pri->descr, pri->args);
 +	
-+	if(conn == NULL) {
++	if (conn == NULL) {
 +		err = -errno;
 +		printk(UM_KERN_ERR "vde_user_init: vde_open failed, "
 +					"errno = %d\n", errno);

@@ -283,7 +283,7 @@
 +{
 +	struct vde_data *pri = data;
 +
-+	if(pri->conn != NULL)
++	if (pri->conn != NULL)
 +		return vde_datafd(pri->conn);
 +	
 +	printk(UM_KERN_WARNING "vde_open - we have no VDECONN to open");

@@ -294,7 +294,7 @@
 +{
 +	struct vde_data *pri = data;
 +
-+	if(pri->conn != NULL) {
++	if (pri->conn != NULL) {
 +		printk(UM_KERN_INFO "vde backend - closing connection\n");
 +		vde_close(pri->conn);
 +		pri->conn = NULL;

@@ -327,7 +327,7 @@
 +	struct vde_open_args *args;
 +
 +	vpri->args = kmalloc(sizeof(struct vde_open_args), UM_GFP_KERNEL);
-+	if(vpri->args == NULL) {
++	if (vpri->args == NULL) {
 +		printk(UM_KERN_ERR "\nvde_init_libstuff - vde_open_args"
 +					"allocation failed");
 +		return;

@@ -348,16 +348,16 @@
 +	VDECONN *vconn = (VDECONN *) conn;
 +	int rv;
 +
-+	if(vconn == NULL)
++	if (vconn == NULL)
 +		return 0;
 +
 +	rv = vde_recv(vconn, buf, len, 0);
-+	if(rv < 0) {
-+		if(errno == EAGAIN)
++	if (rv < 0) {
++		if (errno == EAGAIN)
 +			return 0;
 +		return -errno;
 +	}
-+	else if(rv == 0)
++	else if (rv == 0)
 +		return -ENOTCONN;
 +
 +	return rv;

@@ -367,7 +367,7 @@
 +{
 +	VDECONN *vconn = (VDECONN *) conn;
 +
-+	if(vconn == NULL)
++	if (vconn == NULL)
 +		return 0;
 +
 +	return vde_send(vconn, buf, len, 0);