X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fkeyboard.c;h=375a625b3b5fca5062908a2dcec9b3ea2b379da9;hb=0e29a343765b225251f5634fb34aa6a60085a0bd;hp=72b004dad035bc30eec2d85f01562f33f496b9e7;hpb=7f167672713c9d8e23540340ab1111ec748a7775;p=palacios.git

diff --git a/palacios/src/devices/keyboard.c b/palacios/src/devices/keyboard.c
index 72b004d..375a625 100644
--- a/palacios/src/devices/keyboard.c
+++ b/palacios/src/devices/keyboard.c
@@ -318,7 +318,9 @@ static int pull_from_output_queue(struct vm_device * dev, uint8_t * value) {
 
 
 #include <palacios/vmm_telemetry.h>
-
+#ifdef CONFIG_SYMMOD
+#include <palacios/vmm_symmod.h>
+#endif
 
 static int key_event_handler(struct v3_vm_info * vm, 
 			     struct v3_keyboard_event * evt, 
@@ -335,7 +337,7 @@ static int key_event_handler(struct v3_vm_info * vm,
 	}
 	//	PrintGuestPageTables(info, info->shdw_pg_state.guest_cr3);
     } 
-#ifdef CONFIG_SYMBIOTIC
+#ifdef CONFIG_SYMCALL
     else if (evt->scan_code == 0x43) { // F9 Sym test
 	struct guest_info * core = &(vm->cores[0]);
 	PrintDebug("Testing sym call\n");
@@ -365,12 +367,19 @@ static int key_event_handler(struct v3_vm_info * vm,
 	
 	PrintDebug("Toggling Debugging\n");	
 	v3_dbg_enable ^= 1;
-    } else if (evt->scan_code == 0x41) { // F7 telemetry dump
+
+    } 
 #ifdef CONFIG_TELEMETRY
+
+    else if (evt->scan_code == 0x41) { // F7 telemetry dump
 	v3_print_telemetry(vm);
+    } 
 #endif
+#ifdef CONFIG_SYMMOD
+    else if (evt->scan_code == 0x40) { // F6 Test symmod load
+	v3_load_sym_capsule(vm, "lnx_test");
     }
-
+#endif
 
 
     addr_t irq_state = v3_lock_irqsave(state->kb_lock);
@@ -1006,7 +1015,7 @@ static struct v3_device_ops dev_ops = {
 
 static int keyboard_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct keyboard_internal * keyboard_state = NULL;
-    char * name = v3_cfg_val(cfg, "name");
+    char * dev_id = v3_cfg_val(cfg, "ID");
 
     PrintDebug("keyboard: init_device\n");
 
@@ -1022,10 +1031,10 @@ static int keyboard_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     keyboard_state->mouse_enabled = 0;
 
-    struct vm_device * dev = v3_allocate_device(name, &dev_ops, keyboard_state);
+    struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, keyboard_state);
 
     if (v3_attach_device(vm, dev) == -1) {
-	PrintError("Could not attach device %s\n", name);
+	PrintError("Could not attach device %s\n", dev_id);
 	return -1;
     }