X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_dev_mgr.c;h=02c3c9c18bfa9d2f5f4fd9388fe16f36eca4514f;hb=4f7c3b759e3889870c5b5e7d09b3ffcc168e5632;hp=8f9b3a25f4733ca78ec82295a64eb3577b6aa077;hpb=f7cc83b3bae64c853f5b7b63e2830b1ea92dfed9;p=palacios.git

diff --git a/palacios/src/palacios/vmm_dev_mgr.c b/palacios/src/palacios/vmm_dev_mgr.c
index 8f9b3a2..02c3c9c 100644
--- a/palacios/src/palacios/vmm_dev_mgr.c
+++ b/palacios/src/palacios/vmm_dev_mgr.c
@@ -1,3 +1,6 @@
+/* Northwestern University */
+/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+
 #include <palacios/vm_dev.h>
 #include <palacios/vmm_dev_mgr.h>
 #include <palacios/vm_guest.h>
@@ -5,14 +8,13 @@
 #include <palacios/vmm_decoder.h>
 
 
-extern struct vmm_os_hooks *os_hooks;
 
 #ifndef NULL
 #define NULL 0
 #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;
 
@@ -23,11 +25,12 @@ int dev_mgr_init(struct vmm_dev_mgr * mgr) {
 }
 
 
-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);
 
   list_for_each_entry(dev, &(mgr->dev_list), dev_link) {
-    unattach_device(dev);
+    v3_unattach_device(dev);
     free_device(dev);
   }
 
@@ -37,14 +40,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--;
 
@@ -117,17 +120,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;
@@ -158,11 +161,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;
@@ -172,7 +175,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);
@@ -245,7 +248,8 @@ int dev_mgr_unhook_mem(struct vm_device   *dev,
 
 
 
-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);