X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_dev_mgr.c;h=183e906e5e03a3fbe30d7c545d7008e2ca6b77ee;hb=54be7fbb6b41d1241ad563a7135cdb28be73ff82;hp=6cd685a1317160e8e67f0d8945731725bd49a550;hpb=dd60e1fd40cdf258bd988239c5dcda8861a5bbb5;p=palacios.releases.git diff --git a/palacios/src/palacios/vmm_dev_mgr.c b/palacios/src/palacios/vmm_dev_mgr.c index 6cd685a..183e906 100644 --- a/palacios/src/palacios/vmm_dev_mgr.c +++ b/palacios/src/palacios/vmm_dev_mgr.c @@ -24,6 +24,9 @@ #ifdef V3_CONFIG_CHECKPOINT #include + +#define V3_MAX_DEVICE_NAME 32 + #endif @@ -138,51 +141,91 @@ int v3_save_vm_devices(struct v3_vm_info * vm, struct v3_chkpt * chkpt) { struct v3_chkpt_ctx * dev_mgr_ctx = NULL; uint32_t num_saved_devs = 0; - uint32_t table_len = mgr->num_devs * 32; + uint32_t table_len = mgr->num_devs * V3_MAX_DEVICE_NAME; 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, "devices"); - 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; + strncpy(name_table + tbl_offset, dev->name, V3_MAX_DEVICE_NAME); + tbl_offset += V3_MAX_DEVICE_NAME; num_saved_devs++; - } + } else { + PrintDebug("Skipping device %s\n"); + } } - v3_chkpt_save(dev_mgr_ctx, "num_devs", 4, &num_saved_devs); - v3_chkpt_save(dev_mgr_ctx, "names", table_len, name_table); + 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; + } - 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, dev_mgr_ctx, dev->name); + if (v3_chkpt_save(dev_mgr_ctx, "names", num_saved_devs*V3_MAX_DEVICE_NAME, 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) { - dev->ops->save(dev_ctx, dev->private_data); + if (dev->ops->save_extended) { - v3_chkpt_close_ctx(dev_ctx); + V3_Print("Saving state for device (%s) using extended interface\n",dev->name); - // Error checking?? - } else { - PrintError("Error: %s save() not implemented\n", dev->name); + if (dev->ops->save_extended(chkpt,dev->name,dev->private_data)) { + PrintError("Unable to save device %s\n",dev->name); + return -1; } - } - - // Specify which devices were saved - V3_Free(name_table); + } else if (dev->ops->save) { - v3_chkpt_close_ctx(dev_mgr_ctx); + struct v3_chkpt_ctx * dev_ctx = NULL; + + V3_Print("Saving state for device (%s)\n", dev->name); + + dev_ctx = v3_chkpt_open_ctx(chkpt, 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); + + } else { + PrintError("Error: %s save() not implemented\n", dev->name); + } + } return 0; } @@ -195,42 +238,82 @@ int v3_load_vm_devices(struct v3_vm_info * vm, struct v3_chkpt * chkpt) { char * name_table = NULL; int i = 0; - dev_mgr_ctx = v3_chkpt_open_ctx(chkpt, NULL, "devices"); + dev_mgr_ctx = v3_chkpt_open_ctx(chkpt, "devices"); - v3_chkpt_load(dev_mgr_ctx, "num_devs", 4, &num_devs); + 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); + name_table = V3_Malloc(V3_MAX_DEVICE_NAME * 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", V3_MAX_DEVICE_NAME * 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_load(dev_mgr_ctx, "names", 32 * num_devs, name_table); + v3_chkpt_close_ctx(dev_mgr_ctx); for (i = 0; i < num_devs; i++) { - char * name = &(name_table[i * 32]); + char * name = &(name_table[i * V3_MAX_DEVICE_NAME]); 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; + return -1; } - if (!dev->ops->load) { - PrintError("Error Device (%s) does not support load operation\n", name); - continue; - } + if (dev->ops->load_extended) { - dev_ctx = v3_chkpt_open_ctx(chkpt, dev_mgr_ctx, name); + V3_Print("Loading state for device (%s) using extended interface\n",name); - if (!dev_ctx) { + if (dev->ops->load_extended(chkpt,name,dev->private_data)) { + PrintError("Load of device %s failed\n",name); + return -1; + } + + } else if (dev->ops->load) { + + dev_ctx = v3_chkpt_open_ctx(chkpt, name); + + if (!dev_ctx) { PrintError("Error missing device context (%s)\n", name); - continue; - } + return -1; + } + if (dev->ops->load(dev_ctx, dev->private_data)) { + PrintError("Load of device %s failed\n",name); + v3_chkpt_close_ctx(dev_ctx); + return -1; + } - dev->ops->load(dev_ctx, dev->private_data); + // should close context regardless of whether load was successful + v3_chkpt_close_ctx(dev_ctx); + + } else { + PrintError("Error Device (%s) does not support load operation\n", name); + // this is OK + } } + V3_Free(name_table); + return 0; } @@ -246,8 +329,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; @@ -451,6 +532,7 @@ struct vm_device * v3_add_device(struct v3_vm_info * vm, dev = (struct vm_device *)V3_Malloc(sizeof(struct vm_device)); if (dev == NULL) { + PrintError("Cannot allocate in adding a device\n"); return NULL; } @@ -514,6 +596,12 @@ int v3_dev_add_blk_frontend(struct v3_vm_info * vm, struct blk_frontend * frontend = NULL; frontend = (struct blk_frontend *)V3_Malloc(sizeof(struct blk_frontend)); + + if (!frontend) { + PrintError("Cannot allocate in adding a block front end\n"); + return -1; + } + memset(frontend, 0, sizeof(struct blk_frontend)); frontend->connect = connect; @@ -577,6 +665,12 @@ int v3_dev_add_net_frontend(struct v3_vm_info * vm, struct net_frontend * frontend = NULL; frontend = (struct net_frontend *)V3_Malloc(sizeof(struct net_frontend)); + + if (!frontend) { + PrintError("Cannot allocate in adding a net front end\n"); + return -1; + } + memset(frontend, 0, sizeof(struct net_frontend)); frontend->connect = connect; @@ -639,6 +733,12 @@ int v3_dev_add_console_frontend(struct v3_vm_info * vm, struct cons_frontend * frontend = NULL; frontend = (struct cons_frontend *)V3_Malloc(sizeof(struct cons_frontend)); + + if (!frontend) { + PrintError("Cannot allocate in adding a console front end\n"); + return -1; + } + memset(frontend, 0, sizeof(struct cons_frontend)); frontend->connect = connect; @@ -702,6 +802,12 @@ int v3_dev_add_char_frontend(struct v3_vm_info * vm, struct char_frontend * frontend = NULL; frontend = (struct char_frontend *)V3_Malloc(sizeof(struct char_frontend)); + + if (!frontend) { + PrintError("Cannot allocate in adding a char front end\n"); + return -1; + } + memset(frontend, 0, sizeof(struct char_frontend)); frontend->connect = connect;