X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_dev_mgr.c;h=a49e25da1ae6d4af7335ce7fb891552c5f758b55;hb=3cd1d3771e3f8e30b09f6c4995851979aaafc5ff;hp=615c8ecbc12c44d34a866a5ec111d1c807064980;hpb=570ad6257ed18fbbc840c17a600f12f2dc44b010;p=palacios.git diff --git a/palacios/src/palacios/vmm_dev_mgr.c b/palacios/src/palacios/vmm_dev_mgr.c index 615c8ec..a49e25d 100644 --- a/palacios/src/palacios/vmm_dev_mgr.c +++ b/palacios/src/palacios/vmm_dev_mgr.c @@ -1,195 +1,157 @@ +/* + * 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 -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) { - mgr->dev_list.head = NULL; - mgr->dev_list.num_devs = 0; + + +int v3_init_dev_mgr(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) -{ - struct vm_device * dev = mgr->dev_list.head; +int v3_dev_mgr_deinit(struct guest_info * info) { + struct vm_device * dev; + struct vmm_dev_mgr * mgr = &(info->dev_mgr); + struct vm_device * tmp; - while (dev) { - unattach_device(dev); - free_device(dev); - dev = dev->next; + list_for_each_entry_safe(dev, tmp, &(mgr->dev_list), dev_link) { + v3_unattach_device(dev); + v3_free_device(dev); } + return 0; } -int dev_mgr_add_device(struct vmm_dev_mgr * mgr, struct vm_device * dev) { - dev->next = mgr->dev_list.head; - dev->prev = 0; - if (dev->next) { - dev->next->prev = dev; - } - mgr->dev_list.head = dev; - - mgr->dev_list.num_devs++; +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) { - if (mgr->dev_list.head == dev) { - mgr->dev_list.head = dev->next; - } else { - dev->prev->next = dev->next; - } - if (dev->next) { - dev->next->prev = dev->prev; - } - - mgr->dev_list.num_devs--; +static int dev_mgr_remove_device(struct vmm_dev_mgr * mgr, struct vm_device * dev) { + list_del(&(dev->dev_link)); + mgr->num_devs--; return 0; } -int dev_mgr_add_io_hook(struct vmm_dev_mgr * mgr, struct dev_io_hook * hook) { - hook->mgr_next = mgr->io_hooks.head; - hook->mgr_prev = NULL; - if (hook->mgr_next) { - hook->mgr_next->mgr_prev = hook; - } - mgr->io_hooks.head = hook; - - mgr->io_hooks.num_hooks++; +/* IO HOOKS */ +static int dev_mgr_add_io_hook(struct vmm_dev_mgr * mgr, struct dev_io_hook * hook) { + list_add(&(hook->mgr_list), &(mgr->io_hooks)); + mgr->num_io_hooks++; return 0; } -int dev_mgr_remove_io_hook(struct vmm_dev_mgr * mgr, struct dev_io_hook * hook) { - if (mgr->io_hooks.head == hook) { - mgr->io_hooks.head = hook->mgr_next; - } else { - hook->mgr_prev->mgr_next = hook->mgr_next; - } - - if (hook->mgr_next) { - hook->mgr_next->mgr_prev = hook->mgr_prev; - } - - mgr->io_hooks.num_hooks--; +static int dev_mgr_remove_io_hook(struct vmm_dev_mgr * mgr, struct dev_io_hook * hook) { + list_del(&(hook->mgr_list)); + mgr->num_io_hooks--; return 0; } -int dev_add_io_hook(struct vm_device * dev, struct dev_io_hook * hook) { - hook->dev_next = dev->io_hooks.head; - hook->dev_prev = NULL; - if (hook->dev_next) { - hook->dev_next->dev_prev = hook; - } - dev->io_hooks.head = hook; - - dev->io_hooks.num_hooks++; - +static int dev_add_io_hook(struct vm_device * dev, struct dev_io_hook * hook) { + list_add(&(hook->dev_list), &(dev->io_hooks)); + dev->num_io_hooks++; return 0; } -int dev_remove_io_hook(struct vm_device * dev, struct dev_io_hook * hook) { - if (dev->io_hooks.head == hook) { - dev->io_hooks.head = hook->dev_next; - } else { - hook->dev_prev->dev_next = hook->dev_next; - } - - if (hook->dev_next) { - hook->dev_next->dev_prev = hook->dev_prev; - } - - dev->io_hooks.num_hooks--; +static int dev_remove_io_hook(struct vm_device * dev, struct dev_io_hook * hook) { + list_del(&(hook->dev_list)); + dev->num_io_hooks--; return 0; } -struct dev_io_hook * dev_mgr_find_io_hook(struct vmm_dev_mgr * mgr, ushort_t port) { - struct dev_io_hook * tmp = mgr->io_hooks.head; - while (tmp) { - if (tmp->port == port) { - break; - } - tmp = tmp->mgr_next; - } - return tmp; -} -struct dev_io_hook * dev_find_io_hook(struct vm_device * dev, ushort_t port) { - struct dev_io_hook * tmp = dev->io_hooks.head; +static struct dev_io_hook * dev_mgr_find_io_hook(struct vmm_dev_mgr * mgr, ushort_t port) { + struct dev_io_hook * tmp = NULL; - while (tmp) { + list_for_each_entry(tmp, &(mgr->io_hooks), mgr_list) { if (tmp->port == port) { - break; + return tmp; } - tmp = tmp->dev_next; } - - return tmp; + return NULL; } +/* +static struct dev_io_hook * dev_find_io_hook(struct vm_device * dev, ushort_t port) { + struct dev_io_hook * tmp = NULL; - -int attach_device(struct guest_info * vm, struct vm_device * dev) { - struct vmm_dev_mgr *mgr= &(vm->dev_mgr); - - dev->vm = vm; - dev_mgr_add_device(mgr, dev); - dev->ops->init(dev); - - return 0; -} - -int unattach_device(struct vm_device * dev) { - struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr); - - dev->ops->deinit(dev); - dev_mgr_remove_device(mgr, dev); - dev->vm = NULL; - - return 0; + list_for_each_entry(tmp, &(dev->io_hooks), dev_list) { + if (tmp->port == port) { + return tmp; + } + } + return NULL; } +*/ -int dev_hook_io(struct vm_device *dev, - ushort_t port, - 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)); +int v3_dev_hook_io(struct vm_device *dev, + ushort_t port, + 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 = (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; @@ -199,6 +161,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; } @@ -206,7 +169,7 @@ int dev_hook_io(struct vm_device *dev, } -int dev_unhook_io(struct vm_device *dev, +int v3_dev_unhook_io(struct vm_device *dev, ushort_t port) { struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr); @@ -219,26 +182,47 @@ 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 v3_attach_device(struct guest_info * vm, struct vm_device * dev) { + struct vmm_dev_mgr *mgr= &(vm->dev_mgr); + + dev->vm = vm; + dev_mgr_add_device(mgr, dev); + dev->ops->init(dev); + + return 0; +} + +int v3_unattach_device(struct vm_device * dev) { + struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr); + + dev->ops->deinit(dev); + dev_mgr_remove_device(mgr, dev); + dev->vm = NULL; + + return 0; +} + -int dev_mgr_hook_mem(struct guest_info *vm, - struct vm_device *device, - void *start, - void *end) + + +#if 0 +static int dev_mgr_hook_mem(struct guest_info *vm, + struct vm_device *device, + void *start, + void *end) { - struct dev_mem_hook *hook = os_hooks->malloc(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, @@ -260,24 +244,18 @@ int dev_mgr_hook_mem(struct guest_info *vm, } -int dev_mgr_unhook_mem(struct guest_info *vm, - struct vm_device *device, - void *start, - void *end) -{ - struct dev_mem_hook *hook = device->mem_hooks.head; - - while (hook) { - if (((hook->addr_start) == start) && (hook->addr_end == end)) { - break; - } - } - +static int dev_mgr_unhook_mem(struct vm_device *dev, + addr_t start, + addr_t end) { + /* + struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr); + struct dev_mem_hook *hook = dev_mgr_find_mem_hook(mgr, start, end); + if (!hook) { // Very bad - unhooking something that doesn't exist! return -1; } - + */ /* not implemented yet return unhook_mem_port(vm->mem_map, @@ -287,16 +265,19 @@ int dev_mgr_unhook_mem(struct guest_info *vm, */ return -1; } +#endif +#ifdef DEBUG_DEV_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); -void PrintDebugDevMgr(struct vmm_dev_mgr * mgr) { - struct vm_device * dev = mgr->dev_list.head; - - while (dev) { + list_for_each_entry(dev, &(mgr->dev_list), dev_link) { PrintDebugDev(dev); - dev = dev->next; + PrintDebug("next..\n"); } return; @@ -314,14 +295,20 @@ void PrintDebugDevMgrIO(struct vmm_dev_mgr * mgr) { } void PrintDebugDevIO(struct vm_device * dev) { - struct dev_io_hook * hook = dev->io_hooks.head; - - PrintDebug("IO Hooks (%d) for Device: %s\n", dev->io_hooks.num_hooks, dev->name); - - while (hook) { + struct dev_io_hook * hook; + + PrintDebug("IO Hooks(%d) for Device: %s\n", dev->num_io_hooks, dev->name); + + list_for_each_entry(hook, &(dev->io_hooks), dev_list) { PrintDebug("\tPort: 0x%x (read=0x%x), (write=0x%x)\n", hook->port, hook->read, hook->write); - hook = hook->dev_next; } 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