deallocation of devices

[palacios.git] / palacios / src / devices / 8254.c

diff --git a/palacios/src/devices/8254.c b/palacios/src/devices/8254.c
index 028357f..e5498b9 100644 (file)
--- a/palacios/src/devices/8254.c
+++ b/palacios/src/devices/8254.c
@@ -89,6 +89,8 @@ struct pit {
 
     struct v3_timer * timer;
 
+    struct v3_vm_info * vm;
+
     struct channel ch_0;
     struct channel ch_1;
     struct channel ch_2;
@@ -642,9 +644,9 @@ 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]);
+static int pit_free(void * private_data) {
+    struct pit * state = (struct pit *)private_data;
+    struct guest_info * info = &(state->vm->cores[0]);
 
 
     if (state->timer) {
@@ -657,7 +659,7 @@ static int pit_free(struct vm_device * dev) {
 
 
 static struct v3_device_ops dev_ops = {
-    .free = pit_free,
+    .free = (int (*)(void *))pit_free,
 
 
 };
@@ -681,9 +683,9 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     V3_ASSERT(pit_state != NULL);
     pit_state->speaker = 0;
 
-    dev = v3_allocate_device(dev_id, &dev_ops, pit_state);
+    dev = v3_add_device(vm, dev_id, &dev_ops, pit_state);
 
-    if (v3_attach_device(vm, dev) == -1) {
+    if (dev == NULL) {
        PrintError("Could not attach device %s\n", dev_id);
        V3_Free(pit_state);
        return -1;
@@ -697,7 +699,7 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     if (ret != 0) {
        PrintError("8254 PIT: Failed to hook IO ports\n");
-       v3_detach_device(dev);
+       v3_remove_device(dev);
        return -1;
     }
 
@@ -712,7 +714,7 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     pit_state->timer = v3_add_timer(info, &timer_ops, pit_state);
 
     if (pit_state->timer == NULL) {
-       v3_detach_device(dev);
+       v3_remove_device(dev);
        return -1;
     }