X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_dev_mgr.c;h=c79e1626fb7e82993328b70082821f063372b346;hb=91a4db3c4b06db6a44aa0daeaab750df666d5d79;hp=a9e2af998579bf046ac91adc66eb6e0d9b16d1ed;hpb=ac34ca9ba11d16963fe8d642a0d4e7dbfccd6c36;p=palacios.git

diff --git a/palacios/src/palacios/vmm_dev_mgr.c b/palacios/src/palacios/vmm_dev_mgr.c
index a9e2af9..c79e162 100644
--- a/palacios/src/palacios/vmm_dev_mgr.c
+++ b/palacios/src/palacios/vmm_dev_mgr.c
@@ -150,36 +150,38 @@ int v3_save_vm_devices(struct v3_vm_info * vm, struct v3_chkpt * chkpt) {
     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;
 	    
 	    V3_Print("Saving state for device (%s)\n", dev->name);
 	    
-	    dev_ctx = v3_chkpt_open_ctx(chkpt, dev_mgr_ctx, 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;
 }
 
@@ -201,6 +203,8 @@ int v3_load_vm_devices(struct v3_vm_info * vm, struct v3_chkpt * chkpt) {
 
     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;
@@ -216,7 +220,7 @@ int v3_load_vm_devices(struct v3_vm_info * vm, struct v3_chkpt * chkpt) {
 	    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);
@@ -225,8 +229,12 @@ int v3_load_vm_devices(struct v3_vm_info * vm, struct v3_chkpt * chkpt) {
 
 
 	dev->ops->load(dev_ctx, dev->private_data);
+
+        v3_chkpt_close_ctx(dev_ctx);
     }
 
+    V3_Free(name_table);
+
     return 0;
 }