From: Peter Dinda <pdinda@northwestern.edu>
Date: Thu, 8 Sep 2011 21:11:33 +0000 (-0500)
Subject: Merge fix
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=ec435fcd55e507e8542e6b0f17af4aaba9a22d9b

Merge fix
---

diff --git a/linux_module/iface-console.c b/linux_module/iface-console.c
index 9e13546..d5b1767 100644
--- a/linux_module/iface-console.c
+++ b/linux_module/iface-console.c
@@ -140,7 +140,7 @@ console_write(struct file * filp, const char __user * buf, size_t size, loff_t *
 
 
     for (i = 0; i < size; i++) {
-	if (copy_from_user(&(event.scan_code), buf + i, 1)) {
+	if (copy_from_user(&(event.scan_code), buf++, 1)) {
 	    printk("Console Write fault\n");
 	    return -EFAULT;
 	}
@@ -217,7 +217,7 @@ static int console_connect(struct v3_guest * guest, unsigned int cmd,
 
     spin_lock_irqsave(&(cons->lock), flags);
 
-    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");
diff --git a/linux_usr/Makefile b/linux_usr/Makefile
index a1e9bb4..ed1c7e9 100644
--- a/linux_usr/Makefile
+++ b/linux_usr/Makefile
@@ -1,5 +1,4 @@
-all: v3_ctrl v3_stop v3_cons v3_mem v3_monitor v3_stream v3_user_host_dev_example v3_os_debug v3_user_keyed_stream_example v3_user_keyed_stream_file
-
+all: v3_ctrl v3_stop v3_cons v3_cons_sc v3_mem v3_monitor v3_stream v3_user_host_dev_example v3_os_debug v3_user_keyed_stream_example v3_user_keyed_stream_file
 
 
 v3_ctrl : v3_ctrl.c v3_ctrl.h
@@ -18,6 +17,10 @@ v3_cons : v3_cons.c v3_ctrl.h
 v3_stream : v3_stream.c v3_ctrl.h
 	gcc -static v3_stream.c -o v3_stream 
 
+v3_cons_sc : v3_cons_sc.c v3_ctrl.h
+	gcc -static v3_cons_sc.c -o v3_cons_sc -lcurses
+
+
 v3_monitor : v3_cons.c v3_ctrl.h
 	gcc -static v3_monitor.c -o v3_monitor