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

diff --git a/bios/vgabios/VGABIOS-lgpl-latest.bin b/bios/vgabios/VGABIOS-lgpl-latest.bin
index dc6785d..60f9f6e 100644 (file)
Binary files a/bios/vgabios/VGABIOS-lgpl-latest.bin and b/bios/vgabios/VGABIOS-lgpl-latest.bin differ

diff --git a/linux_module/iface-console.c b/linux_module/iface-console.c
index ab66d5a..9eedbe5 100644 (file)
--- 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;
        }
@@ -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, 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/palacios/src/devices/keyboard.c b/palacios/src/devices/keyboard.c
index 6d39878..5943fd3 100644 (file)
--- a/palacios/src/devices/keyboard.c
+++ b/palacios/src/devices/keyboard.c
@@ -573,7 +573,7 @@ static int mouse_write_output(struct keyboard_internal * kbd, uint8_t data) {
 
 
 #if KEYBOARD_DEBUG_80H
-static int keyboard_write_delay(ushort_t port, void * src,  uint_t length, void * priv_data) {
+static int keyboard_write_delay(struct guest_info *core, ushort_t port, void * src,  uint_t length, void * priv_data) {
 
     if (length == 1) { 
        PrintDebug("keyboard: write of 0x%x to 80h\n", *((uint8_t*)src));