Context-based output infrastructure (V3_Print, etc) and modifications to use it

[palacios.git] / palacios / src / palacios / vmm_host_events.c

diff --git a/palacios/src/palacios/vmm_host_events.c b/palacios/src/palacios/vmm_host_events.c
index 2f52e30..4b9dcbe 100644 (file)
--- 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,7 +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->packet_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;
 }
@@ -46,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;
     }
 
@@ -69,8 +110,8 @@ 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_PACKET_EVT:
-           list_add(&(hook->link), &(host_evts->packet_events));
+       case HOST_DEBUG_EVT:
+           list_add(&(hook->link), &(host_evts->debug_events));
            break;
     }
 
@@ -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);
 
@@ -203,14 +229,12 @@ int v3_deliver_console_event(struct v3_vm_info * vm,
 }
 
 
-int v3_deliver_packet_event(struct v3_vm_info * vm, 
-                            struct v3_packet_event * evt) {
+
+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;
 
-    if (vm == NULL) {
-       vm = v3_get_foreground_vm();
-    }
 
     host_evts = &(vm->host_event_hooks);
 
@@ -218,8 +242,8 @@ int v3_deliver_packet_event(struct v3_vm_info * vm,
        return -1;
     }
 
-    list_for_each_entry(hook, &(host_evts->packet_events), link) {
-       if (hook->cb.packet_handler(vm, evt, hook->private_data) == -1) {
+    list_for_each_entry(hook, &(host_evts->debug_events), link) {
+       if (hook->cb.debug_handler(vm, evt, hook->private_data) == -1) {
            return -1;
        }
     }
@@ -227,5 +251,3 @@ int v3_deliver_packet_event(struct v3_vm_info * vm,
     return 0;
 }
 
-
-