X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_host_events.c;h=3e6d09b8e4a534e48d6f628e0e76ca9a00da44f9;hb=6cff7c8b0ec58e3b94d9583f709ca9056ae928dd;hp=2f52e3061a1ca0d7130beddc05e6ad9e9820d434;hpb=13d8e5d4035b90bf1ab8b1da115c7d6310c76526;p=palacios.git

diff --git a/palacios/src/palacios/vmm_host_events.c b/palacios/src/palacios/vmm_host_events.c
index 2f52e30..3e6d09b 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);
@@ -35,6 +34,48 @@ int v3_init_host_events(struct v3_vm_info * vm) {
     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->packet_events), link) {
+	list_del(&(hook->link));
+	V3_Free(hook);
+    }
+
+    return 0;
+}
+
 
 int v3_hook_host_event(struct v3_vm_info * vm, 
 		       v3_host_evt_type_t event_type, 
@@ -83,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);
 
@@ -108,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);
 
@@ -133,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);
 
@@ -157,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);
 
@@ -183,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);
 
@@ -208,9 +234,6 @@ int v3_deliver_packet_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);