X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fkeyboard.c;h=2935c43c41b24b0efa2029ff962b40bb4d0fee5c;hb=05d8adefac27becd94fcf7d0406d64f516f22cdc;hp=c7f0b3551bd35982bbd283f0bd8bb2a2de8ebdb4;hpb=3e5e5a12e64630d7a37ed32b8d7e2d993c79f7e0;p=palacios.git

diff --git a/palacios/src/devices/keyboard.c b/palacios/src/devices/keyboard.c
index c7f0b35..2935c43 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,8 +337,9 @@ 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");
 	sym_arg_t a0 = 0x1111;
 	sym_arg_t a1 = 0x2222;
@@ -346,13 +349,13 @@ static int key_event_handler(struct v3_vm_info * vm,
 	uint64_t call_start = 0;
 	uint64_t call_end = 0;
 	
-	V3_Print("Exits before symcall: %d\n", (uint32_t)info->num_exits);
+	V3_Print("Exits before symcall: %d\n", (uint32_t)core->num_exits);
 
 	rdtscll(call_start);
-	v3_sym_call5(info, SYMCALL_TEST, &a0, &a1, &a2, &a3, &a4);
+	v3_sym_call5(core, SYMCALL_TEST, &a0, &a1, &a2, &a3, &a4);
 	rdtscll(call_end);
 	
-	V3_Print("Symcall latency = %d cycles (%d exits)\n", (uint32_t)(call_end - call_start), (uint32_t)info->num_exits);
+	V3_Print("Symcall latency = %d cycles (%d exits)\n", (uint32_t)(call_end - call_start), (uint32_t)core->num_exits);
 
 	V3_Print("Symcall  Test Returned arg0=%x, arg1=%x, arg2=%x, arg3=%x, arg4=%x\n",
 		 (uint32_t)a0, (uint32_t)a1, (uint32_t)a2, (uint32_t)a3, (uint32_t)a4);
@@ -364,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
-	v3_print_telemetry(info);
+
+    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);