From: Jack Lange <jacklange@cs.pitt.edu>
Date: Fri, 16 Sep 2011 23:30:23 +0000 (-0400)
Subject: fixed merge error
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=7b65dde682be91eaf30932302dcd998e9681c2c3

fixed merge error
---

diff --git a/linux_module/iface-console.c b/linux_module/iface-console.c
index 9eedbe5..ab66d5a 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++, 1)) {
+	if (copy_from_user(&(event.scan_code), buf + i, 1)) {
 	    printk("Console Write fault\n");
 	    return -EFAULT;
 	}
@@ -228,7 +228,7 @@ static int console_connect(struct v3_guest * guest, unsigned int cmd,
 	return -1;
     }
 
-    cons_fd = anon_inode_getfd("v3-cons", &cons_fops, cons, 0);
+    cons_fd = anon_inode_getfd("v3-cons", &cons_fops, cons, O_RDWR);
 
     if (cons_fd < 0) {
 	printk("Error creating console inode\n");