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);
dev_mgr_ctx = v3_chkpt_open_ctx(chkpt, NULL, "devices");
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++;
+ }
+ }
+
+ v3_chkpt_save(dev_mgr_ctx, "num_devs", 4, &num_saved_devs);
+ v3_chkpt_save(dev_mgr_ctx, "names", num_saved_devs*32, name_table);
+
+ 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);
dev->ops->save(dev_ctx, dev->private_data);
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;
}
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]);
struct v3_chkpt_ctx * dev_ctx = NULL;
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);
+
+ v3_chkpt_close_ctx(dev_ctx);
}
+ V3_Free(name_table);
+
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) {