X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_dev_mgr.c;h=c1e1fdb11b6a752f52f8f1f74b2ece9414d7d16f;hb=976d67e1c6f988ca38ae83347859ccc86d485651;hp=02c3c9c18bfa9d2f5f4fd9388fe16f36eca4514f;hpb=f9bb3db89469169bb5775dc031d89e570c6fed70;p=palacios.git diff --git a/palacios/src/palacios/vmm_dev_mgr.c b/palacios/src/palacios/vmm_dev_mgr.c index 02c3c9c..c1e1fdb 100644 --- a/palacios/src/palacios/vmm_dev_mgr.c +++ b/palacios/src/palacios/vmm_dev_mgr.c @@ -1,5 +1,21 @@ -/* Northwestern University */ -/* (c) 2008, Jack Lange */ +/* + * 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 @@ -8,12 +24,14 @@ #include - -#ifndef NULL -#define NULL 0 +#ifndef DEBUG_DEV_MGR +#undef PrintDebug +#define PrintDebug(fmt, args...) #endif -int dev_mgr_init(struct guest_info * info) { + + +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; @@ -25,13 +43,14 @@ int dev_mgr_init(struct guest_info * info) { } -int dev_mgr_deinit(struct guest_info * info) { +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; - list_for_each_entry(dev, &(mgr->dev_list), dev_link) { + list_for_each_entry_safe(dev, tmp, &(mgr->dev_list), dev_link) { v3_unattach_device(dev); - free_device(dev); + v3_free_device(dev); } return 0; @@ -57,14 +76,14 @@ static int dev_mgr_remove_device(struct vmm_dev_mgr * mgr, struct vm_device * de /* IO HOOKS */ -int dev_mgr_add_io_hook(struct vmm_dev_mgr * mgr, struct dev_io_hook * hook) { +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) { +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--; @@ -72,14 +91,14 @@ int dev_mgr_remove_io_hook(struct vmm_dev_mgr * mgr, struct dev_io_hook * hook) } -int dev_add_io_hook(struct vm_device * dev, struct dev_io_hook * hook) { +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) { +static int dev_remove_io_hook(struct vm_device * dev, struct dev_io_hook * hook) { list_del(&(hook->dev_list)); dev->num_io_hooks--; @@ -90,8 +109,8 @@ 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; +static struct dev_io_hook * dev_mgr_find_io_hook(struct vmm_dev_mgr * mgr, ushort_t port) { + struct dev_io_hook * tmp = NULL; list_for_each_entry(tmp, &(mgr->io_hooks), mgr_list) { if (tmp->port == port) { @@ -101,8 +120,10 @@ struct dev_io_hook * dev_mgr_find_io_hook(struct vmm_dev_mgr * mgr, ushort_t por return NULL; } -struct dev_io_hook * dev_find_io_hook(struct vm_device * dev, ushort_t port) { - struct dev_io_hook * tmp; + +/* +static struct dev_io_hook * dev_find_io_hook(struct vm_device * dev, ushort_t port) { + struct dev_io_hook * tmp = NULL; list_for_each_entry(tmp, &(dev->io_hooks), dev_list) { if (tmp->port == port) { @@ -111,15 +132,15 @@ struct dev_io_hook * dev_find_io_hook(struct vm_device * dev, ushort_t port) { } 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)) { - +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) { @@ -148,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); @@ -188,11 +209,11 @@ int v3_unattach_device(struct vm_device * dev) { - -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 = (struct dev_mem_hook*)V3_Malloc(sizeof(struct dev_mem_hook)); @@ -223,9 +244,9 @@ int dev_mgr_hook_mem(struct guest_info *vm, } -int dev_mgr_unhook_mem(struct vm_device *dev, - addr_t start, - addr_t end) { +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); @@ -244,9 +265,10 @@ int dev_mgr_unhook_mem(struct vm_device *dev, */ return -1; } +#endif - +#ifdef DEBUG_DEV_MGR void PrintDebugDevMgr(struct guest_info * info) { struct vmm_dev_mgr * mgr = &(info->dev_mgr); @@ -278,8 +300,17 @@ void PrintDebugDevIO(struct vm_device * dev) { 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); + PrintDebug("\tPort: 0x%x (read=0x%p), (write=0x%p)\n", hook->port, + (void *)(addr_t)(hook->read), + (void *)(addr_t)(hook->write)); } 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