X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_dev.c;h=26d973e00ce89de5d54407e30b3bd29937193f9b;hb=0e3fe455f4c490dc4c5d9412decf2420b905b3e9;hp=1f2a72557cb7bf521ebfb7e8385bf491ea02bebd;hpb=570ad6257ed18fbbc840c17a600f12f2dc44b010;p=palacios.git

diff --git a/palacios/src/palacios/vm_dev.c b/palacios/src/palacios/vm_dev.c
index 1f2a725..26d973e 100644
--- a/palacios/src/palacios/vm_dev.c
+++ b/palacios/src/palacios/vm_dev.c
@@ -6,19 +6,25 @@
 struct vm_device * allocate_device() {
 
   struct vm_device * dev = NULL;
-  VMMMalloc(struct vm_device *, dev, sizeof(struct vm_device));
+  dev = (struct vm_device*)V3_Malloc(sizeof(struct vm_device));
+
+  V3_ASSERT(dev != NULL);
 
   dev->ops = NULL;
   memset(dev->name, 0, 32);
   dev->vm = NULL;
   dev->private_data = NULL;
 
-  dev->next = NULL;
-  dev->prev = NULL;
-  dev->io_hooks.head = NULL;
-  dev->mem_hooks.head = NULL;
-  dev->io_hooks.num_hooks = 0;
-  dev->mem_hooks.num_hooks = 0;
+
+  INIT_LIST_HEAD(&(dev->io_hooks));
+  dev->num_io_hooks = 0;
+
+  INIT_LIST_HEAD(&(dev->mem_hooks));
+  dev->num_mem_hooks = 0;
+  
+  INIT_LIST_HEAD(&(dev->irq_hooks));
+  dev->num_irq_hooks = 0;
+
   return dev;
 }
 
@@ -33,5 +39,6 @@ struct vm_device * create_device(char * name, struct vm_device_ops * ops, void *
 }
 
 void free_device(struct vm_device * dev) {
-  VMMFree(dev);
+  V3_Free(dev);
 }
+