X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_dev_mgr.c;h=b045de9e2cac797d02888909019dc74af3778101;hb=1c000bda0560742ad6be011722fa226771b656ff;hp=5abb57b3a070aba22ec4a5d31bbc92bde3d8e2af;hpb=e47ed16a96f6d7faa282bf757e9d2cc065d2657e;p=palacios.git diff --git a/palacios/src/palacios/vmm_dev_mgr.c b/palacios/src/palacios/vmm_dev_mgr.c index 5abb57b..b045de9 100644 --- a/palacios/src/palacios/vmm_dev_mgr.c +++ b/palacios/src/palacios/vmm_dev_mgr.c @@ -22,8 +22,12 @@ #include #include +#ifdef V3_CONFIG_CHECKPOINT +#include +#endif + -#ifndef CONFIG_DEBUG_DEV_MGR +#ifndef V3_CONFIG_DEBUG_DEV_MGR #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -50,7 +54,7 @@ int V3_init_devices() { struct v3_device_info * tmp_dev = __start__v3_devices; int i = 0; -#ifdef CONFIG_DEBUG_DEV_MGR +#ifdef V3_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); @@ -64,7 +68,7 @@ int V3_init_devices() { while (tmp_dev != __stop__v3_devices) { - PrintDebug("Device: %s\n", tmp_dev->name); + V3_Print("Registering 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); @@ -126,6 +130,170 @@ int v3_free_vm_devices(struct v3_vm_info * vm) { return 0; } +#ifdef V3_CONFIG_CHECKPOINT + +int v3_save_vm_devices(struct v3_vm_info * vm, struct v3_chkpt * chkpt) { + struct vmm_dev_mgr * mgr = &(vm->dev_mgr); + struct vm_device * dev; + struct v3_chkpt_ctx * dev_mgr_ctx = NULL; + + uint32_t num_saved_devs = 0; + uint32_t table_len = mgr->num_devs * 32; + char * name_table = NULL; + uint32_t tbl_offset = 0; + + name_table = V3_Malloc(table_len); + + if (!name_table) { + PrintError("Unable to allocate space in device manager save\n"); + return -1; + } + + memset(name_table, 0, table_len); + + dev_mgr_ctx = v3_chkpt_open_ctx(chkpt, NULL, "devices"); + + if (!dev_mgr_ctx) { + PrintError("Unable to open device manager context\n"); + V3_Free(name_table); + return -1; + } + + list_for_each_entry(dev, &(mgr->dev_list), dev_link) { + if (dev->ops->save) { + strncpy(name_table + tbl_offset, dev->name, 32); + tbl_offset += 32; + num_saved_devs++; + } else { + PrintDebug("Skipping device %s\n"); + } + } + + if (v3_chkpt_save(dev_mgr_ctx, "num_devs", 4, &num_saved_devs) == -1) { + PrintError("Unable to store num_devs\n"); + v3_chkpt_close_ctx(dev_mgr_ctx); + V3_Free(name_table); + return -1; + } + + if (v3_chkpt_save(dev_mgr_ctx, "names", num_saved_devs*32, name_table) == -1) { + PrintError("Unable to store names of devices\n"); + v3_chkpt_close_ctx(dev_mgr_ctx); + V3_Free(name_table); + return -1; + } + + v3_chkpt_close_ctx(dev_mgr_ctx); + + V3_Free(name_table); + + list_for_each_entry(dev, &(mgr->dev_list), dev_link) { + if (dev->ops->save) { + struct v3_chkpt_ctx * dev_ctx = NULL; + + V3_Print("Saving state for device (%s)\n", dev->name); + + dev_ctx = v3_chkpt_open_ctx(chkpt, NULL, dev->name); + + if (!dev_ctx) { + PrintError("Unable to open context for device %s\n",dev->name); + return -1; + } + + if (dev->ops->save(dev_ctx, dev->private_data)) { + PrintError("Unable t save device %s\n",dev->name); + v3_chkpt_close_ctx(dev_ctx); + return -1; + } + + v3_chkpt_close_ctx(dev_ctx); + + // Error checking?? + } else { + PrintError("Error: %s save() not implemented\n", dev->name); + } + } + + return 0; +} + + +int v3_load_vm_devices(struct v3_vm_info * vm, struct v3_chkpt * chkpt) { + struct vm_device * dev; + struct v3_chkpt_ctx * dev_mgr_ctx = NULL; + uint32_t num_devs = 0; + char * name_table = NULL; + int i = 0; + + dev_mgr_ctx = v3_chkpt_open_ctx(chkpt, NULL, "devices"); + + if (!dev_mgr_ctx) { + PrintError("Unable to open devices for load\n"); + return -1; + } + + if (v3_chkpt_load(dev_mgr_ctx, "num_devs", 4, &num_devs) == -1) { + PrintError("Unable to load num_devs\n"); + v3_chkpt_close_ctx(dev_mgr_ctx); + return -1; + } + + V3_Print("Loading State for %d devices\n", num_devs); + + name_table = V3_Malloc(32 * num_devs); + + if (!name_table) { + PrintError("Unable to allocate space for device table\n"); + v3_chkpt_close_ctx(dev_mgr_ctx); + return -1; + } + + if (v3_chkpt_load(dev_mgr_ctx, "names", 32 * num_devs, name_table) == -1) { + PrintError("Unable to load device name table\n"); + v3_chkpt_close_ctx(dev_mgr_ctx); + V3_Free(name_table); + } + + v3_chkpt_close_ctx(dev_mgr_ctx); + + for (i = 0; i < num_devs; i++) { + char * name = &(name_table[i * 32]); + struct v3_chkpt_ctx * dev_ctx = NULL; + dev = v3_find_dev(vm, name); + + if (!dev) { + PrintError("Tried to load state into non existant device: %s\n", name); + continue; + } + + if (!dev->ops->load) { + PrintError("Error Device (%s) does not support load operation\n", name); + continue; + } + + dev_ctx = v3_chkpt_open_ctx(chkpt, NULL, name); + + if (!dev_ctx) { + PrintError("Error missing device context (%s)\n", name); + continue; + } + + + if (dev->ops->load(dev_ctx, dev->private_data)) { + PrintError("Load of device %s failed\n",name); + } + + v3_chkpt_close_ctx(dev_ctx); + } + + V3_Free(name_table); + + return 0; +} + + +#endif + static int free_frontends(struct v3_vm_info * vm, struct vmm_dev_mgr * mgr); int v3_deinit_dev_mgr(struct v3_vm_info * vm) { @@ -135,8 +303,6 @@ int v3_deinit_dev_mgr(struct v3_vm_info * vm) { free_frontends(vm, mgr); - - v3_free_htable(mgr->dev_table, 0, 0); return 0; @@ -330,6 +496,13 @@ struct vm_device * v3_add_device(struct v3_vm_info * vm, struct vmm_dev_mgr * mgr = &(vm->dev_mgr); struct vm_device * dev = NULL; + + // Check if we already registered a device of the same name + if (v3_htable_search(mgr->dev_table, (addr_t)name) != (addr_t)NULL) { + PrintError("Device with name (%s) already registered with VM\n", name); + return NULL; + } + dev = (struct vm_device *)V3_Malloc(sizeof(struct vm_device)); if (dev == NULL) {