timer interface updates to allow state cleanup on exit

diff --git a/palacios/include/palacios/vmm_time.h b/palacios/include/palacios/vmm_time.h
index 74c7584..46d1946 100644 (file)
--- a/palacios/include/palacios/vmm_time.h
+++ b/palacios/include/palacios/vmm_time.h
@@ -48,14 +48,14 @@ struct vm_time {
     struct list_head timers;
 };
 
-struct vm_timer_ops {
+struct v3_timer_ops {
     void (*update_timer)(struct guest_info * info, ullong_t cpu_cycles, ullong_t cpu_freq, void * priv_data);
     void (*advance_timer)(struct guest_info * info, void * private_data);
 };
 
-struct vm_timer {
+struct v3_timer {
     void * private_data;
-    struct vm_timer_ops * ops;
+    struct v3_timer_ops * ops;
 
     struct list_head timer_link;
 };
@@ -66,8 +66,8 @@ int v3_start_time(struct guest_info * info);
 int v3_adjust_time(struct guest_info * info);
 
 // Basic functions for attaching timers to the passage of time
-int v3_add_timer(struct guest_info * info, struct vm_timer_ops * ops, void * private_data);
-int v3_remove_timer(struct guest_info * info, struct vm_timer * timer);
+struct v3_timer * v3_add_timer(struct guest_info * info, struct v3_timer_ops * ops, void * private_data);
+int v3_remove_timer(struct guest_info * info, struct v3_timer * timer);
 void v3_update_timers(struct guest_info * info);
 
 // Functions to return the different notions of time in Palacios.

diff --git a/palacios/src/devices/8254.c b/palacios/src/devices/8254.c
index 8e7dede..31375d3 100644 (file)
--- a/palacios/src/devices/8254.c
+++ b/palacios/src/devices/8254.c
@@ -24,6 +24,7 @@
 #include <palacios/vmm_util.h>
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_config.h>
+#include <palacios/vmm_io.h>
 
 
 #ifndef CONFIG_DEBUG_PIT
@@ -86,6 +87,7 @@ struct pit {
     ullong_t pit_counter;
     ullong_t pit_reload;
 
+    struct v3_timer * timer;
 
     struct channel ch_0;
     struct channel ch_1;
@@ -475,7 +477,8 @@ static int handle_channel_cmd(struct channel * ch, struct pit_cmd_word cmd) {
 
 
 
-static int pit_read_channel(struct guest_info * core, ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
+static int pit_read_channel(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) {
+    struct vm_device * dev = (struct vm_device *)priv_data;
     struct pit * state = (struct pit *)dev->private_data;
     char * val = (char *)dst;
 
@@ -521,7 +524,8 @@ static int pit_read_channel(struct guest_info * core, ushort_t port, void * dst,
 
 
 
-static int pit_write_channel(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev) {
+static int pit_write_channel(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
+    struct vm_device * dev = (struct vm_device *)priv_data;
     struct pit * state = (struct pit *)dev->private_data;
     char val = *(char *)src;
 
@@ -569,7 +573,8 @@ static int pit_write_channel(struct guest_info * core, ushort_t port, void * src
 
 
 
-static int pit_write_command(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev) {
+static int pit_write_command(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
+    struct vm_device * dev = (struct vm_device *)priv_data;
     struct pit * state = (struct pit *)dev->private_data;
     struct pit_cmd_word * cmd = (struct pit_cmd_word *)src;
 
@@ -615,7 +620,7 @@ static int pit_write_command(struct guest_info * core, ushort_t port, void * src
 
 
 
-static struct vm_timer_ops timer_ops = {
+static struct v3_timer_ops timer_ops = {
     .update_timer = pit_update_timer,
 };
 
@@ -642,7 +647,21 @@ static void init_channel(struct channel * ch) {
 
 
 static int pit_free(struct vm_device * dev) {
+    struct pit * state = (struct pit *)dev->private_data;
+    struct guest_info * info = &(dev->vm->cores[0]);
+
 
+    if (state->timer) {
+       v3_remove_timer(info, state->timer);
+    }
+
+    v3_unhook_io_port(dev->vm, CHANNEL0_PORT);
+    v3_unhook_io_port(dev->vm, CHANNEL1_PORT);
+    v3_unhook_io_port(dev->vm, CHANNEL2_PORT);
+    v3_unhook_io_port(dev->vm, COMMAND_PORT);
+    v3_unhook_io_port(dev->vm, SPEAKER_PORT);
+    
+    V3_Free(state);
     return 0;
 }
 
@@ -680,11 +699,11 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
        return -1;
     }
 
-    v3_dev_hook_io(dev, CHANNEL0_PORT, &pit_read_channel, &pit_write_channel);
-    v3_dev_hook_io(dev, CHANNEL1_PORT, &pit_read_channel, &pit_write_channel);
-    v3_dev_hook_io(dev, CHANNEL2_PORT, &pit_read_channel, &pit_write_channel);
-    v3_dev_hook_io(dev, COMMAND_PORT, NULL, &pit_write_command);
-    v3_dev_hook_io(dev, SPEAKER_PORT, &pit_read_channel, &pit_write_channel);
+    v3_hook_io_port(vm, CHANNEL0_PORT, &pit_read_channel, &pit_write_channel, dev);
+    v3_hook_io_port(vm, CHANNEL1_PORT, &pit_read_channel, &pit_write_channel, dev);
+    v3_hook_io_port(vm, CHANNEL2_PORT, &pit_read_channel, &pit_write_channel, dev);
+    v3_hook_io_port(vm, COMMAND_PORT, NULL, &pit_write_command, dev);
+    v3_hook_io_port(vm, SPEAKER_PORT, &pit_read_channel, &pit_write_channel, dev);
 
 #ifdef CONFIG_DEBUG_PIT
     PrintDebug("8254 PIT: OSC_HZ=%d, reload_val=", OSC_HZ);
@@ -693,7 +712,13 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 #endif
 
     
-    v3_add_timer(info, &timer_ops, dev);
+
+    pit_state->timer = v3_add_timer(info, &timer_ops, dev);
+
+    if (pit_state->timer == NULL) {
+       v3_detach_device(dev);
+       return -1;
+    }
 
     // Get cpu frequency and calculate the global pit oscilattor counter/cycle
 

diff --git a/palacios/src/devices/apic.c b/palacios/src/devices/apic.c
index b8e2fef..6eaa35f 100644 (file)
--- a/palacios/src/devices/apic.c
+++ b/palacios/src/devices/apic.c
@@ -1455,7 +1455,7 @@ static struct intr_ctrl_ops intr_ops = {
 };
 
 
-static struct vm_timer_ops timer_ops = {
+static struct v3_timer_ops timer_ops = {
     .update_timer = apic_update_time,
 };
 

diff --git a/palacios/src/palacios/vmm_dev_mgr.c b/palacios/src/palacios/vmm_dev_mgr.c
index b538506..5561cec 100644 (file)
--- a/palacios/src/palacios/vmm_dev_mgr.c
+++ b/palacios/src/palacios/vmm_dev_mgr.c
@@ -118,8 +118,12 @@ int v3_dev_mgr_deinit(struct v3_vm_info * vm) {
        v3_free_device(dev);
     }
 
+    v3_free_htable(mgr->blk_table, 0, 0);
+    v3_free_htable(mgr->net_table, 0, 0);
+    v3_free_htable(mgr->char_table, 0, 0);
+    v3_free_htable(mgr->console_table, 0, 0);
 
-    /* TODO: Clear hash tables */
+    v3_free_htable(mgr->dev_table, 0, 0);
 
     return 0;
 }
@@ -211,7 +215,11 @@ int v3_dev_unhook_io(struct vm_device * dev, uint16_t port) {
 int v3_detach_device(struct vm_device * dev) {
     struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr);
 
-    dev->ops->free(dev);
+    if (dev->ops->free) {
+       dev->ops->free(dev);
+    } else {
+       PrintError("Error: %s free() not implemented\n",  dev->name);
+    }
 
     list_del(&(dev->dev_link));
     mgr->num_devs--;

diff --git a/palacios/src/palacios/vmm_time.c b/palacios/src/palacios/vmm_time.c
index 44affe4..48a1579 100644 (file)
--- a/palacios/src/palacios/vmm_time.c
+++ b/palacios/src/palacios/vmm_time.c
@@ -122,10 +122,11 @@ int v3_adjust_time(struct guest_info * info) {
     return 0;
 }
 
-int v3_add_timer(struct guest_info * info, struct vm_timer_ops * ops, 
-            void * private_data) {
-    struct vm_timer * timer = NULL;
-    timer = (struct vm_timer *)V3_Malloc(sizeof(struct vm_timer));
+struct v3_timer * v3_add_timer(struct guest_info * info, 
+                              struct v3_timer_ops * ops, 
+                              void * private_data) {
+    struct v3_timer * timer = NULL;
+    timer = (struct v3_timer *)V3_Malloc(sizeof(struct v3_timer));
     V3_ASSERT(timer != NULL);
 
     timer->ops = ops;
@@ -134,10 +135,10 @@ int v3_add_timer(struct guest_info * info, struct vm_timer_ops * ops,
     list_add(&(timer->timer_link), &(info->time_state.timers));
     info->time_state.num_timers++;
 
-    return 0;
+    return timer;
 }
 
-int v3_remove_timer(struct guest_info * info, struct vm_timer * timer) {
+int v3_remove_timer(struct guest_info * info, struct v3_timer * timer) {
     list_del(&(timer->timer_link));
     info->time_state.num_timers--;
 
@@ -146,7 +147,7 @@ int v3_remove_timer(struct guest_info * info, struct vm_timer * timer) {
 }
 
 void v3_update_timers(struct guest_info * info) {
-    struct vm_timer * tmp_timer;
+    struct v3_timer * tmp_timer;
     uint64_t old_time = info->time_state.last_update;
     uint64_t cycles;