X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_dev_mgr.c;h=c21295846b26801e536a4321430a1d7dd84d6a79;hb=82b8b87c344fcd1eab22e3f3be5ad54cbb3f8f68;hp=f4c8d6231f8e6c503cb749602596de0e27ad72d2;hpb=1bafb4aec89c2c611117ec6ccc17d0f22f392254;p=palacios.git diff --git a/palacios/src/palacios/vmm_dev_mgr.c b/palacios/src/palacios/vmm_dev_mgr.c index f4c8d62..c212958 100644 --- a/palacios/src/palacios/vmm_dev_mgr.c +++ b/palacios/src/palacios/vmm_dev_mgr.c @@ -17,22 +17,74 @@ * redistribute, and modify it as specified in the file "V3VEE_LICENSE". */ -#include #include #include #include #include -#ifndef DEBUG_DEV_MGR +#ifndef CONFIG_DEBUG_DEV_MGR #undef PrintDebug #define PrintDebug(fmt, args...) #endif -//DEFINE_HASHTABLE_INSERT(insert_dev, const char *, struct vm_device *); -//DEFINE_HASHTABLE_SEARCH(find_dev, const char *, struct vm_device *); -//DEFINE_HASHTABLE_REMOVE(remove_dev, const char *, struct vm_device *, 0); +static struct hashtable * master_dev_table = NULL; + +static uint_t dev_hash_fn(addr_t key) { + char * name = (char *)key; + return v3_hash_buffer((uchar_t *)name, strlen(name)); +} + +static int dev_eq_fn(addr_t key1, addr_t key2) { + char * name1 = (char *)key1; + char * name2 = (char *)key2; + + return (strcmp(name1, name2) == 0); +} + + +int v3_init_devices() { + extern struct v3_device_info __start__v3_devices[]; + extern struct v3_device_info __stop__v3_devices[]; + struct v3_device_info * tmp_dev = __start__v3_devices; + int i = 0; + +#ifdef CONFIG_DEBUG_DEV_MGR + { + int num_devices = (__stop__v3_devices - __start__v3_devices) / sizeof(struct v3_device_info); + PrintDebug("%d Virtual devices registered with Palacios\n", num_devices); + } +#endif + + PrintDebug("Start addres=%p, Stop address=%p\n", __start__v3_devices, __stop__v3_devices); + + master_dev_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn); + + + + while (tmp_dev != __stop__v3_devices) { + PrintDebug("Device: %s\n", tmp_dev->name); + + if (v3_htable_search(master_dev_table, (addr_t)(tmp_dev->name))) { + PrintError("Multiple instance of device (%s)\n", tmp_dev->name); + return -1; + } + + if (v3_htable_insert(master_dev_table, + (addr_t)(tmp_dev->name), + (addr_t)(tmp_dev->init)) == 0) { + PrintError("Could not add device %s to master list\n", tmp_dev->name); + return -1; + } + + tmp_dev = &(__start__v3_devices[++i]); + } + + + return 0; +} + int v3_init_dev_mgr(struct guest_info * info) { struct vmm_dev_mgr * mgr = &(info->dev_mgr); @@ -40,7 +92,7 @@ int v3_init_dev_mgr(struct guest_info * info) { INIT_LIST_HEAD(&(mgr->dev_list)); mgr->num_devs = 0; - // mgr->dev_table = v3_create_htable(0, , ); + mgr->dev_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn); return 0; } @@ -61,35 +113,42 @@ int v3_dev_mgr_deinit(struct guest_info * info) { -int v3_attach_device(struct guest_info * vm, struct vm_device * dev) { - struct vmm_dev_mgr *mgr= &(vm->dev_mgr); - - dev->vm = vm; +int v3_create_device(struct guest_info * info, const char * dev_name, void * cfg_data) { + int (*dev_init)(struct guest_info * info, void * cfg_data); + + dev_init = (void *)v3_htable_search(master_dev_table, (addr_t)dev_name); + + if (dev_init == NULL) { + PrintError("Could not find device %s in master device table\n", dev_name); + return -1; + } - list_add(&(dev->dev_link), &(mgr->dev_list)); - mgr->num_devs++; - dev->ops->init(dev); + if (dev_init(info, cfg_data) == -1) { + PrintError("Could not initialize Device %s\n", dev_name); + return -1; + } return 0; } -int v3_detach_device(struct vm_device * dev) { - struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr); - dev->ops->deinit(dev); +void v3_free_device(struct vm_device * dev) { + V3_Free(dev); +} - list_del(&(dev->dev_link)); - mgr->num_devs--; - dev->vm = NULL; - - return 0; -} +struct vm_device * v3_find_dev(struct guest_info * info, const char * dev_name) { + struct vmm_dev_mgr * mgr = &(info->dev_mgr); + return (struct vm_device *)v3_htable_search(mgr->dev_table, (addr_t)dev_name); +} +/****************************************************************/ +/* The remaining functions are called by the devices themselves */ +/****************************************************************/ /* IO HOOKS */ int v3_dev_hook_io(struct vm_device * dev, uint16_t port, @@ -108,9 +167,53 @@ int v3_dev_unhook_io(struct vm_device * dev, uint16_t port) { +int v3_detach_device(struct vm_device * dev) { + struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr); + + dev->ops->free(dev); + + list_del(&(dev->dev_link)); + mgr->num_devs--; + + dev->vm = NULL; + + return -1; +} + + +struct vm_device * v3_allocate_device(char * name, + struct v3_device_ops * ops, + void * private_data) { + struct vm_device * dev = NULL; + + dev = (struct vm_device*)V3_Malloc(sizeof(struct vm_device)); + + strncpy(dev->name, name, 32); + dev->ops = ops; + dev->private_data = private_data; + + dev->vm = NULL; + + return dev; +} + + +int v3_attach_device(struct guest_info * vm, struct vm_device * dev ) { + struct vmm_dev_mgr * mgr = &(vm->dev_mgr); + + dev->vm = vm; + + list_add(&(dev->dev_link), &(mgr->dev_list)); + mgr->num_devs++; + + + v3_htable_insert(mgr->dev_table, (addr_t)(dev->name), (addr_t)dev); + + return 0; +} -#ifdef DEBUG_DEV_MGR +#ifdef CONFIG_DEBUG_DEV_MGR void PrintDebugDevMgr(struct guest_info * info) { struct vmm_dev_mgr * mgr = &(info->dev_mgr);