X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fkeyboard.c;h=375a625b3b5fca5062908a2dcec9b3ea2b379da9;hb=596d3c2aa2f0a5360baf1c921e4543f014809b78;hp=a6ba864002331eea1d115f45f6fc640b6fb171f8;hpb=cfcc5717f659b3ed2954f41cf363d3bceae8dc84;p=palacios.git diff --git a/palacios/src/devices/keyboard.c b/palacios/src/devices/keyboard.c index a6ba864..375a625 100644 --- a/palacios/src/devices/keyboard.c +++ b/palacios/src/devices/keyboard.c @@ -317,9 +317,12 @@ static int pull_from_output_queue(struct vm_device * dev, uint8_t * value) { } +#include +#ifdef CONFIG_SYMMOD +#include +#endif - -static int key_event_handler(struct guest_info * info, +static int key_event_handler(struct v3_vm_info * vm, struct v3_keyboard_event * evt, void * private_data) { struct vm_device * dev = (struct vm_device *)private_data; @@ -328,32 +331,55 @@ static int key_event_handler(struct guest_info * info, PrintDebug("keyboard: injected status 0x%x, and scancode 0x%x\n", evt->status, evt->scan_code); if (evt->scan_code == 0x44) { // F10 debug dump - v3_print_guest_state(info); + int i = 0; + for (i = 0; i < vm->num_cores; i++) { + v3_print_guest_state(&(vm->cores[i])); + } // 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; sym_arg_t a2 = 0x3333; sym_arg_t a3 = 0x4444; sym_arg_t a4 = 0x5555; + uint64_t call_start = 0; + uint64_t call_end = 0; + + V3_Print("Exits before symcall: %d\n", (uint32_t)core->num_exits); - v3_sym_call5(info, SYMCALL_TEST, &a0, &a1, &a2, &a3, &a4); + rdtscll(call_start); + 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)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); } #endif - else if (evt->scan_code == 0x42) { // F8 Sym test2 + else if (evt->scan_code == 0x42) { // F8 debug toggle extern int v3_dbg_enable; PrintDebug("Toggling Debugging\n"); v3_dbg_enable ^= 1; - } + } +#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); @@ -370,7 +396,7 @@ static int key_event_handler(struct guest_info * info, } -static int mouse_event_handler(struct guest_info * info, +static int mouse_event_handler(struct v3_vm_info * vm, struct v3_mouse_event * evt, void * private_data) { struct vm_device * dev = (struct vm_device *)private_data; @@ -589,7 +615,7 @@ static int keyboard_write_delay(ushort_t port, void * src, uint_t length, struc } } -static int keyboard_read_delay(ushort_t port, void * dest, uint_t length, struct vm_device * dev) { +static int keyboard_read_delay(struct guest_info * core, ushort_t port, void * dest, uint_t length, struct vm_device * dev) { if (length == 1) { *(uint8_t *)dest = v3_inb(port); @@ -609,7 +635,7 @@ static int keyboard_read_delay(ushort_t port, void * dest, uint_t length, struct -static int keyboard_write_command(ushort_t port, void * src, uint_t length, struct vm_device * dev) { +static int keyboard_write_command(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev) { struct keyboard_internal * state = (struct keyboard_internal *)(dev->private_data); uint8_t cmd = *(uint8_t *)src; @@ -782,7 +808,7 @@ static int keyboard_write_command(ushort_t port, void * src, uint_t length, stru return length; } -static int keyboard_read_status(ushort_t port, void * dest, uint_t length, struct vm_device * dev) { +static int keyboard_read_status(struct guest_info * core, ushort_t port, void * dest, uint_t length, struct vm_device * dev) { struct keyboard_internal *state = (struct keyboard_internal *)(dev->private_data); if (length != 1) { @@ -803,7 +829,7 @@ static int keyboard_read_status(ushort_t port, void * dest, uint_t length, struc return length; } -static int keyboard_write_output(ushort_t port, void * src, uint_t length, struct vm_device * dev) { +static int keyboard_write_output(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev) { struct keyboard_internal *state = (struct keyboard_internal *)(dev->private_data); int ret = length; @@ -938,7 +964,7 @@ static int keyboard_write_output(ushort_t port, void * src, uint_t length, struc return ret; } -static int keyboard_read_input(ushort_t port, void * dest, uint_t length, struct vm_device * dev) { +static int keyboard_read_input(struct guest_info * core, ushort_t port, void * dest, uint_t length, struct vm_device * dev) { struct keyboard_internal * state = (struct keyboard_internal *)(dev->private_data); if (length != 1) { @@ -987,9 +1013,9 @@ static struct v3_device_ops dev_ops = { -static int keyboard_init(struct guest_info * vm, v3_cfg_tree_t * cfg) { +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"); @@ -1005,10 +1031,10 @@ static int keyboard_init(struct guest_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; }