X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_dev.c;h=6257a985e09a3981c5acc1d89bdcee61095d722f;hb=7cdedeb7a01b51c5242cce94924f2ea246008e7d;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..6257a98 100644
--- a/palacios/src/palacios/vm_dev.c
+++ b/palacios/src/palacios/vm_dev.c
@@ -1,29 +1,55 @@
+/* 
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
+
+
 #include <palacios/vm_dev.h>
 #include <palacios/vmm.h>
 
 
 
-struct vm_device * allocate_device() {
+static struct vm_device * v3_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;
 }
 
-struct vm_device * create_device(char * name, struct vm_device_ops * ops, void * private_data) {
-  struct vm_device * dev = allocate_device();
+struct vm_device * v3_create_device(char * name, struct vm_device_ops * ops, void * private_data) {
+  struct vm_device * dev = v3_allocate_device();
 
   strncpy(dev->name, name, 32);
   dev->ops = ops;
@@ -32,6 +58,7 @@ struct vm_device * create_device(char * name, struct vm_device_ops * ops, void *
   return dev;
 }
 
-void free_device(struct vm_device * dev) {
-  VMMFree(dev);
+void v3_free_device(struct vm_device * dev) {
+  V3_Free(dev);
 }
+