X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_dev_mgr.c;h=7d44131511580c80d39305bac232aa1553af4280;hb=c30d1b88a60c3a8df426ce81553675bbe4afef52;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..7d44131 100644
--- a/palacios/src/palacios/vmm_dev_mgr.c
+++ b/palacios/src/palacios/vmm_dev_mgr.c
@@ -22,8 +22,12 @@
 #include <palacios/vmm.h>
 #include <palacios/vmm_decoder.h>
 
+#ifdef V3_CONFIG_CHECKPOINT
+#include <palacios/vmm_checkpoint.h>
+#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);
@@ -126,6 +130,109 @@ 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);
+
+    memset(name_table, 0, table_len);
+    
+
+    dev_mgr_ctx = v3_chkpt_open_ctx(chkpt, NULL, "devices");
+
+    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->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;
+}
+
+
+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");
+
+    v3_chkpt_load(dev_mgr_ctx, "num_devs", 4, &num_devs);
+
+    V3_Print("Loading State for %d devices\n", num_devs);
+    
+    name_table = V3_Malloc(32 * num_devs);
+
+    v3_chkpt_load(dev_mgr_ctx, "names", 32 * num_devs, name_table);
+
+    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, dev_mgr_ctx, name);
+
+	if (!dev_ctx) {
+	    PrintError("Error missing device context (%s)\n", name);
+	    continue;
+	}
+
+
+	dev->ops->load(dev_ctx, dev->private_data);
+    }
+
+    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) {