X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_dev_mgr.c;h=bc9a940031400d7d752779ffddcf275d4a768723;hb=e70e95962c26832628d586e07f9cd1a2e1852d72;hp=2a458d0f8c9b3ce12c5c1dbb4b9262f9de91d670;hpb=28b1d0ae6db40cb3e1f5a9b3596b625d2f2af0e4;p=palacios.git diff --git a/palacios/src/palacios/vmm_dev_mgr.c b/palacios/src/palacios/vmm_dev_mgr.c index 2a458d0..bc9a940 100644 --- a/palacios/src/palacios/vmm_dev_mgr.c +++ b/palacios/src/palacios/vmm_dev_mgr.c @@ -1,31 +1,53 @@ +/* + * 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 + * Copyright (c) 2008, The V3VEE Project + * All rights reserved. + * + * Author: Jack Lange + * + * This is free software. You are permitted to use, + * redistribute, and modify it as specified in the file "V3VEE_LICENSE". + */ + #include #include #include #include -#include +#include + -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; 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 +57,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--; @@ -115,17 +137,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; @@ -135,6 +157,7 @@ int dev_hook_io(struct vm_device *dev, dev_mgr_add_io_hook(&(dev->vm->dev_mgr), hook); dev_add_io_hook(dev, hook); } else { + return -1; } @@ -155,125 +178,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); -} - - - - -/* IRQ HOOKS */ -/* -int dev_mgr_add_irq_hook(struct vmm_dev_mgr * mgr, struct dev_irq_hook * hook) { - list_add(&(hook->mgr_list), &(mgr->irq_hooks)); - mgr->num_irq_hooks++; - return 0; -} - - -int dev_mgr_remove_irq_hook(struct vmm_dev_mgr * mgr, struct dev_irq_hook * hook) { - list_del(&(hook->mgr_list)); - mgr->num_irq_hooks--; - - return 0; -} - - -int dev_add_irq_hook(struct vm_device * dev, struct dev_irq_hook * hook) { - list_add(&(hook->dev_list), &(dev->irq_hooks)); - dev->num_irq_hooks++; - return 0; -} - - -int dev_remove_irq_hook(struct vm_device * dev, struct dev_irq_hook * hook) { - list_del(&(hook->dev_list)); - dev->num_irq_hooks--; - - return 0; -} - - - - - -struct dev_irq_hook * dev_mgr_find_irq_hook(struct vmm_dev_mgr * mgr, uint_t irq) { - struct dev_irq_hook * tmp; - - list_for_each_entry(tmp, &(mgr->irq_hooks), mgr_list) { - if (tmp->irq == irq) { - return tmp; - } - } - return NULL; + return v3_unhook_io_port(dev->vm, port); } -struct dev_irq_hook * dev_find_irq_hook(struct vm_device * dev, uint_t irq) { - struct dev_irq_hook * tmp; - list_for_each_entry(tmp, &(dev->irq_hooks), dev_list) { - if (tmp->irq == irq) { - return tmp; - } - } - return NULL; -} - - - - -int dev_hook_irq(struct vm_device *dev, - uint_t irq, - int (*handler)(uint_t irq, struct vm_device * dev)) { - - struct dev_irq_hook *hook = os_hooks->malloc(sizeof(struct dev_irq_hook)); - - if (!hook) { - return -1; - } - - - if (hook_irq(&(dev->vm->irq_map), irq, - (int (*)(uint_t, void *))handler, - (void *)dev) == 0) { - - hook->dev = dev; - hook->irq = irq; - hook->handler = handler; - - dev_mgr_add_irq_hook(&(dev->vm->dev_mgr), hook); - dev_add_irq_hook(dev, hook); - } else { - return -1; - } - - return 0; -} - - -int dev_unhook_irq(struct vm_device * dev, - uint_t irq) { - - struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr); - struct dev_irq_hook * hook = dev_mgr_find_irq_hook(mgr, irq); - - if (!hook) { - return -1; - } - - dev_mgr_remove_irq_hook(mgr, hook); - dev_remove_irq_hook(dev, hook); - - return unhook_irq(&(dev->vm->irq_map), irq); -} - - -*/ - - - - - -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; @@ -283,7 +192,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); @@ -303,16 +212,13 @@ int dev_mgr_hook_mem(struct guest_info *vm, void *end) { - struct dev_mem_hook *hook; - VMMMalloc(struct dev_mem_hook *, hook,sizeof(struct dev_mem_hook)); - + struct dev_mem_hook * hook = (struct dev_mem_hook*)V3_Malloc(sizeof(struct dev_mem_hook)); + // V3_Malloc(struct dev_mem_hook *, hook,sizeof(struct dev_mem_hook)); + if (!hook) { return -1; } - - - /* not implemented yet hook_memory(vm->mem_map, guest_physical_address_start, @@ -359,7 +265,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);