From: Peter Dinda <pdinda@northwestern.edu>
Date: Wed, 14 Sep 2011 22:15:03 +0000 (-0500)
Subject: Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=0429591d3bfd490a04e467e97b4490977fb54581;p=palacios.releases.git

Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacios into devel

Conflicts:

	linux_usr/Makefile
---

0429591d3bfd490a04e467e97b4490977fb54581
diff --cc linux_module/iface-console.c
index d5b1767,ab66d5a..9eedbe5
--- a/linux_module/iface-console.c
+++ b/linux_module/iface-console.c
@@@ -216,8 -217,18 +217,18 @@@ static int console_connect(struct v3_gu
      }
  
      spin_lock_irqsave(&(cons->lock), flags);
+     if (cons->connected == 0) {
+ 	cons->connected = 1;
+ 	acquired = 1;
+     }
+     spin_unlock_irqrestore(&(cons->lock), flags);
+ 
+     if (acquired == 0) {
+ 	printk("Console already connected\n");
+ 	return -1;
+     }
  
 -    cons_fd = anon_inode_getfd("v3-cons", &cons_fops, cons, O_RDWR);
 +    cons_fd = anon_inode_getfd("v3-cons", &cons_fops, cons, 0);
  
      if (cons_fd < 0) {
  	printk("Error creating console inode\n");