X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_dev_mgr.c;h=a49e25da1ae6d4af7335ce7fb891552c5f758b55;hb=773e6e7d212b3ece194cd0e75a383db7d2b9a2b1;hp=8f9b3a25f4733ca78ec82295a64eb3577b6aa077;hpb=f7cc83b3bae64c853f5b7b63e2830b1ea92dfed9;p=palacios-OLD.git diff --git a/palacios/src/palacios/vmm_dev_mgr.c b/palacios/src/palacios/vmm_dev_mgr.c index 8f9b3a2..a49e25d 100644 --- a/palacios/src/palacios/vmm_dev_mgr.c +++ b/palacios/src/palacios/vmm_dev_mgr.c @@ -1,3 +1,22 @@ +/* + * 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 @@ -5,14 +24,15 @@ #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) { + +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; @@ -23,12 +43,14 @@ int dev_mgr_init(struct vmm_dev_mgr * mgr) { } -int dev_mgr_deinit(struct vmm_dev_mgr * mgr) { +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) { - unattach_device(dev); - free_device(dev); + list_for_each_entry_safe(dev, tmp, &(mgr->dev_list), dev_link) { + v3_unattach_device(dev); + v3_free_device(dev); } return 0; @@ -37,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--; @@ -54,14 +76,14 @@ int dev_mgr_remove_device(struct vmm_dev_mgr * mgr, struct vm_device * dev) { /* 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--; @@ -69,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--; @@ -87,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) { @@ -98,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) { @@ -108,26 +132,26 @@ 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)) { - - 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; @@ -145,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); @@ -158,11 +182,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 +196,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); @@ -185,11 +209,11 @@ int 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)); @@ -220,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); @@ -241,11 +265,13 @@ int dev_mgr_unhook_mem(struct vm_device *dev, */ return -1; } +#endif +#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); @@ -279,3 +305,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