X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_host_events.c;h=4b9dcbec94263d10c12a976e861d0f8b194e6f41;hb=16db015d4bcec7b3f9e25eb8dbb6796c4d85550a;hp=bbacce5113d8f1e5cb18921bf243383af14e4d0f;hpb=7ee094e43dab15b0139847bca24cef904f8a42f6;p=palacios.git

diff --git a/palacios/src/palacios/vmm_host_events.c b/palacios/src/palacios/vmm_host_events.c
index bbacce5..4b9dcbe 100644
--- a/palacios/src/palacios/vmm_host_events.c
+++ b/palacios/src/palacios/vmm_host_events.c
@@ -20,7 +20,6 @@
 #include <palacios/vmm.h>
 #include <palacios/vmm_host_events.h>
 #include <palacios/vm_guest.h>
-#include <palacios/vmm_muxer.h>
 
 int v3_init_host_events(struct v3_vm_info * vm) {
     struct v3_host_events * host_evts = &(vm->host_event_hooks);
@@ -30,6 +29,49 @@ int v3_init_host_events(struct v3_vm_info * vm) {
     INIT_LIST_HEAD(&(host_evts->timer_events));
     INIT_LIST_HEAD(&(host_evts->serial_events));
     INIT_LIST_HEAD(&(host_evts->console_events));
+    INIT_LIST_HEAD(&(host_evts->debug_events));
+
+    return 0;
+}
+
+int v3_deinit_host_events(struct v3_vm_info * vm) {
+    struct v3_host_events * host_evts = &(vm->host_event_hooks);
+    struct v3_host_event_hook * hook = NULL;
+    struct v3_host_event_hook * tmp = NULL;
+
+    list_for_each_entry_safe(hook, tmp, &(host_evts->keyboard_events), link) {
+	list_del(&(hook->link));
+	V3_Free(hook);
+    }
+
+    list_for_each_entry_safe(hook, tmp, &(host_evts->mouse_events), link) {
+	list_del(&(hook->link));
+	V3_Free(hook);
+    }
+
+
+    list_for_each_entry_safe(hook, tmp, &(host_evts->timer_events), link) {
+	list_del(&(hook->link));
+	V3_Free(hook);
+    }
+
+
+    list_for_each_entry_safe(hook, tmp, &(host_evts->serial_events), link) {
+	list_del(&(hook->link));
+	V3_Free(hook);
+    }
+
+
+    list_for_each_entry_safe(hook, tmp, &(host_evts->console_events), link) {
+	list_del(&(hook->link));
+	V3_Free(hook);
+    }
+
+
+    list_for_each_entry_safe(hook, tmp, &(host_evts->debug_events), link) {
+	list_del(&(hook->link));
+	V3_Free(hook);
+    }
 
     return 0;
 }
@@ -45,7 +87,7 @@ int v3_hook_host_event(struct v3_vm_info * vm,
 
     hook = (struct v3_host_event_hook *)V3_Malloc(sizeof(struct v3_host_event_hook));
     if (hook == NULL) {
-	PrintError("Could not allocate event hook\n");
+        PrintError(vm, VCORE_NONE,"Could not allocate event hook\n");
 	return -1;
     }
 
@@ -68,6 +110,9 @@ int v3_hook_host_event(struct v3_vm_info * vm,
 	case HOST_CONSOLE_EVT:
 	    list_add(&(hook->link), &(host_evts->console_events));
 	    break;
+	case HOST_DEBUG_EVT:
+	    list_add(&(hook->link), &(host_evts->debug_events));
+	    break;
     }
 
     return 0;
@@ -79,9 +124,6 @@ int v3_deliver_keyboard_event(struct v3_vm_info * vm,
     struct v3_host_events * host_evts = NULL;
     struct v3_host_event_hook * hook = NULL;
 
-    if (vm == NULL) {
-	vm = v3_get_foreground_vm();
-    }
 
     host_evts = &(vm->host_event_hooks);
 
@@ -104,9 +146,6 @@ int v3_deliver_mouse_event(struct v3_vm_info * vm,
     struct v3_host_events * host_evts = NULL;
     struct v3_host_event_hook * hook = NULL;
 
-    if (vm == NULL) {
-	vm = v3_get_foreground_vm();
-    }
 
     host_evts = &(vm->host_event_hooks);
 
@@ -129,9 +168,6 @@ int v3_deliver_timer_event(struct v3_vm_info * vm,
     struct v3_host_events * host_evts = NULL;
     struct v3_host_event_hook * hook = NULL;
 
-    if (vm == NULL) {
-	vm = v3_get_foreground_vm();
-    }
 
     host_evts = &(vm->host_event_hooks);
 
@@ -153,9 +189,6 @@ int v3_deliver_serial_event(struct v3_vm_info * vm,
     struct v3_host_events * host_evts = NULL;
     struct v3_host_event_hook * hook = NULL;
 
-    if (vm == NULL) {
-	vm = v3_get_foreground_vm();
-    }
 
     host_evts = &(vm->host_event_hooks);
 
@@ -179,9 +212,6 @@ int v3_deliver_console_event(struct v3_vm_info * vm,
     struct v3_host_events * host_evts = NULL;
     struct v3_host_event_hook * hook = NULL;
 
-    if (vm == NULL) {
-	vm = v3_get_foreground_vm();
-    }
 
     host_evts = &(vm->host_event_hooks);
 
@@ -198,3 +228,26 @@ int v3_deliver_console_event(struct v3_vm_info * vm,
     return 0;
 }
 
+
+
+int v3_deliver_debug_event(struct v3_vm_info * vm, 
+			   struct v3_debug_event * evt) {
+    struct v3_host_events * host_evts = NULL;
+    struct v3_host_event_hook * hook = NULL;
+
+
+    host_evts = &(vm->host_event_hooks);
+
+    if (vm->run_state != VM_RUNNING) {
+	return -1;
+    }
+
+    list_for_each_entry(hook, &(host_evts->debug_events), link) {
+	if (hook->cb.debug_handler(vm, evt, hook->private_data) == -1) {
+	    return -1;
+	}
+    }
+
+    return 0;
+}
+