#ifdef V3_CONFIG_CHECKPOINT
#include <palacios/vmm_checkpoint.h>
+
+#define V3_MAX_DEVICE_NAME 32
+
#endif
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);
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, 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, V3_MAX_DEVICE_NAME);
+ tbl_offset += V3_MAX_DEVICE_NAME;
+ 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*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) {
if (dev->ops->save) {
struct v3_chkpt_ctx * dev_ctx = NULL;
-
- dev_ctx = v3_chkpt_open_ctx(chkpt, dev_mgr_ctx, dev->name);
+ 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;
+ }
- dev->ops->save(dev_ctx, dev->private_data);
+ 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??
-
- strncpy(name_table + tbl_offset, dev->name, 32);
- tbl_offset += 32;
- num_saved_devs++;
} else {
PrintError("Error: %s save() not implemented\n", dev->name);
}
}
-
- // Specify which devices were saved
- v3_chkpt_save(dev_mgr_ctx, "num_devs", 4, &num_saved_devs);
- v3_chkpt_save(dev_mgr_ctx, "names", table_len, name_table);
- V3_Free(name_table);
-
- v3_chkpt_close_ctx(dev_mgr_ctx);
-
return 0;
}
dev_mgr_ctx = v3_chkpt_open_ctx(chkpt, NULL, "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;
+ }
- v3_chkpt_load(dev_mgr_ctx, "names", 32 * num_devs, name_table);
+ 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_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);
continue;
}
- dev_ctx = v3_chkpt_open_ctx(chkpt, dev_mgr_ctx, name);
+ dev_ctx = v3_chkpt_open_ctx(chkpt, NULL, name);
if (!dev_ctx) {
PrintError("Error missing device context (%s)\n", name);
}
- dev->ops->load(dev_ctx, dev->private_data);
+ 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;
}
free_frontends(vm, mgr);
-
-
v3_free_htable(mgr->dev_table, 0, 0);
return 0;
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) {
+ PrintError("Cannot allocate in adding a device\n");
return NULL;
}
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;
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;
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;
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;
