Restructure of direct host network bridge.

[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 078fb08..28543f7 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);
@@ -28,11 +27,48 @@ int v3_init_host_events(struct v3_vm_info * vm) {
     INIT_LIST_HEAD(&(host_evts->keyboard_events));
     INIT_LIST_HEAD(&(host_evts->mouse_events));
     INIT_LIST_HEAD(&(host_evts->timer_events));
+    INIT_LIST_HEAD(&(host_evts->serial_events));
     INIT_LIST_HEAD(&(host_evts->console_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);
+    }
+
+    return 0;
+}
+
 
 int v3_hook_host_event(struct v3_vm_info * vm, 
                       v3_host_evt_type_t event_type, 
@@ -61,6 +97,9 @@ int v3_hook_host_event(struct v3_vm_info * vm,
        case HOST_TIMER_EVT:
            list_add(&(hook->link), &(host_evts->timer_events));
            break;
+       case HOST_SERIAL_EVT:
+           list_add(&(hook->link), &(host_evts->serial_events));
+           break;
        case HOST_CONSOLE_EVT:
            list_add(&(hook->link), &(host_evts->console_events));
            break;
@@ -75,9 +114,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);
 
@@ -100,9 +136,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);
 
@@ -125,9 +158,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);
 
@@ -144,15 +174,35 @@ int v3_deliver_timer_event(struct v3_vm_info * vm,
     return 0;
 }
 
-int v3_deliver_console_event(struct v3_vm_info * vm, 
-                          struct v3_console_event * evt) {
+int v3_deliver_serial_event(struct v3_vm_info * vm, 
+                           struct v3_serial_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);
+
+    if (vm->run_state != VM_RUNNING) {
+       return -1;
+    }
+
+    list_for_each_entry(hook, &(host_evts->serial_events), link) {
+       if (hook->cb.serial_handler(vm, evt, hook->private_data) == -1) {
+           return -1;
+       }
     }
 
+    return 0;
+}
+
+
+
+int v3_deliver_console_event(struct v3_vm_info * vm, 
+                            struct v3_console_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) {