X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_dev_mgr.c;h=df66d27cf9c0fcf185ca338cc2be6c49f9d8cb34;hb=1c46db5ec8d086d76f7120a638199564947694d3;hp=7f536bf24b803ea226bfe96e3840ed1843f58e93;hpb=d8fc6aa4bc2a5d9cec50923e9d2bd30f867dd50a;p=palacios.git

diff --git a/palacios/src/palacios/vmm_dev_mgr.c b/palacios/src/palacios/vmm_dev_mgr.c
index 7f536bf..df66d27 100644
--- a/palacios/src/palacios/vmm_dev_mgr.c
+++ b/palacios/src/palacios/vmm_dev_mgr.c
@@ -1,31 +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_dev_mgr.h>
 #include <palacios/vm_guest.h>
 #include <palacios/vmm.h>
+#include <palacios/vmm_decoder.h>
 
 
-extern struct vmm_os_hooks *os_hooks;
-
-#ifndef NULL
-#define NULL 0
+#ifndef DEBUG_DEV_MGR
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
 #endif
 
-int dev_mgr_init(struct vmm_dev_mgr * mgr) {
 
+
+int dev_mgr_init(struct guest_info * info) {
+  struct vmm_dev_mgr * mgr = &(info->dev_mgr);
   INIT_LIST_HEAD(&(mgr->dev_list));
   mgr->num_devs = 0;
 
   INIT_LIST_HEAD(&(mgr->io_hooks));
   mgr->num_io_hooks = 0;
+
   return 0;
 }
 
 
-int dev_mgr_deinit(struct vmm_dev_mgr * mgr) {
+int dev_mgr_deinit(struct guest_info * info) {
   struct vm_device * dev;
+  struct vmm_dev_mgr * mgr = &(info->dev_mgr);
+  struct vm_device * tmp;
 
-  list_for_each_entry(dev, &(mgr->dev_list), dev_link) {
-    unattach_device(dev);
+  list_for_each_entry_safe(dev, tmp, &(mgr->dev_list), dev_link) {
+    v3_unattach_device(dev);
     free_device(dev);
   }
 
@@ -35,14 +59,14 @@ int dev_mgr_deinit(struct vmm_dev_mgr * mgr) {
 
 
 
-int dev_mgr_add_device(struct vmm_dev_mgr * mgr, struct vm_device * dev) {
+static int dev_mgr_add_device(struct vmm_dev_mgr * mgr, struct vm_device * dev) {
   list_add(&(dev->dev_link), &(mgr->dev_list));
   mgr->num_devs++;
 
   return 0;
 }
 
-int dev_mgr_remove_device(struct vmm_dev_mgr * mgr, struct vm_device * dev) {
+static int dev_mgr_remove_device(struct vmm_dev_mgr * mgr, struct vm_device * dev) {
   list_del(&(dev->dev_link));
   mgr->num_devs--;
 
@@ -86,7 +110,7 @@ int dev_remove_io_hook(struct vm_device * dev, struct dev_io_hook * hook) {
 
 
 struct dev_io_hook * dev_mgr_find_io_hook(struct vmm_dev_mgr * mgr, ushort_t port) {
-  struct dev_io_hook * tmp;
+  struct dev_io_hook * tmp = NULL;
 
   list_for_each_entry(tmp, &(mgr->io_hooks), mgr_list) {
     if (tmp->port == port) {
@@ -97,7 +121,7 @@ struct dev_io_hook * dev_mgr_find_io_hook(struct vmm_dev_mgr * mgr, ushort_t por
 }
 
 struct dev_io_hook * dev_find_io_hook(struct vm_device * dev, ushort_t port) {
-  struct dev_io_hook * tmp;
+  struct dev_io_hook * tmp = NULL;
 
   list_for_each_entry(tmp, &(dev->io_hooks), dev_list) {
     if (tmp->port == port) {
@@ -115,17 +139,17 @@ int dev_hook_io(struct vm_device   *dev,
 		int (*read)(ushort_t port, void * dst, uint_t length, struct vm_device * dev),
 		int (*write)(ushort_t port, void * src, uint_t length, struct vm_device * dev)) {
 
-  struct dev_io_hook *hook = os_hooks->malloc(sizeof(struct dev_io_hook));
+  struct dev_io_hook *hook = (struct dev_io_hook *)V3_Malloc(sizeof(struct dev_io_hook));
   
   if (!hook) { 
     return -1;
   }
 
 
-  if (hook_io_port(&(dev->vm->io_map), port, 
-		   (int (*)(ushort_t, void *, uint_t, void *))read, 
-		   (int (*)(ushort_t, void *, uint_t, void *))write, 
-		   (void *)dev) == 0) {
+  if (v3_hook_io_port(dev->vm, port, 
+		      (int (*)(ushort_t, void *, uint_t, void *))read, 
+		      (int (*)(ushort_t, void *, uint_t, void *))write, 
+		      (void *)dev) == 0) {
 
     hook->dev = dev;
     hook->port = port;
@@ -156,11 +180,11 @@ int dev_unhook_io(struct vm_device   *dev,
   dev_mgr_remove_io_hook(mgr, hook);
   dev_remove_io_hook(dev, hook);
 
-  return unhook_io_port(&(dev->vm->io_map), port);
+  return v3_unhook_io_port(dev->vm, port);
 }
 
 
-int attach_device(struct guest_info * vm, struct vm_device * dev) {
+int v3_attach_device(struct guest_info * vm, struct vm_device * dev) {
   struct vmm_dev_mgr *mgr= &(vm->dev_mgr);
   
   dev->vm = vm;
@@ -170,7 +194,7 @@ int attach_device(struct guest_info * vm, struct vm_device * dev) {
   return 0;
 }
 
-int unattach_device(struct vm_device * dev) {
+int v3_unattach_device(struct vm_device * dev) {
   struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr);
 
   dev->ops->deinit(dev);
@@ -242,8 +266,10 @@ int dev_mgr_unhook_mem(struct vm_device   *dev,
 
 
 
+#ifdef DEBUG_DEV_MGR
 
-void PrintDebugDevMgr(struct vmm_dev_mgr * mgr) {
+void PrintDebugDevMgr(struct guest_info * info) {
+  struct vmm_dev_mgr * mgr = &(info->dev_mgr);
   struct vm_device * dev;
   PrintDebug("%d devices registered with manager\n", mgr->num_devs);
 
@@ -277,3 +303,10 @@ void PrintDebugDevIO(struct vm_device * dev) {
 
   return;
 }
+
+#else 
+void PrintDebugDevMgr(struct guest_info * info) {}
+void PrintDebugDev(struct vm_device * dev) {}
+void PrintDebugDevMgrIO(struct vmm_dev_mgr * mgr) {}
+void PrintDebugDevIO(struct vm_device * dev) {}
+#endif