Context-based output infrastructure (V3_Print, etc) and modifications to use it

[palacios.git] / palacios / include / palacios / vmm_dev_mgr.h

diff --git a/palacios/include/palacios/vmm_dev_mgr.h b/palacios/include/palacios/vmm_dev_mgr.h
index eeb0e56..e5e13d9 100644 (file)
--- a/palacios/include/palacios/vmm_dev_mgr.h
+++ b/palacios/include/palacios/vmm_dev_mgr.h
@@ -28,7 +28,10 @@
 #include <palacios/vmm_hashtable.h>
 #include <palacios/vmm_msr.h>
 #include <palacios/vmm_config.h>
-#include <palacios/vmm_ethernet.h>
+
+#ifdef V3_CONFIG_CHECKPOINT
+#include <palacios/vmm_checkpoint.h>
+#endif
 
 struct v3_vm_info;
 
@@ -92,9 +95,10 @@ int v3_deinit_dev_mgr(struct v3_vm_info * vm);
 
 int v3_free_vm_devices(struct v3_vm_info * vm);
 
-
-
-
+#ifdef V3_CONFIG_CHECKPOINT
+int v3_save_vm_devices(struct v3_vm_info * vm, struct v3_chkpt * chkpt);
+int v3_load_vm_devices(struct v3_vm_info * vm, struct v3_chkpt * chkpt);
+#endif
 
 
 
@@ -102,16 +106,26 @@ int V3_init_devices();
 int V3_deinit_devices();
 
 
-#ifdef V3_CONFIG_KEYED_STREAMS
-#include <interfaces/vmm_keyed_stream.h>
-#endif 
-
 struct v3_device_ops {
     int (*free)(void * private_data);
 
-#ifdef V3_CONFIG_KEYED_STREAMS
-    int (*checkpoint)(struct vm_device *dev, v3_keyed_stream_t stream);
-    int (*restore)(struct vm_device *dev, v3_keyed_stream_t stream);
+#ifdef V3_CONFIG_CHECKPOINT
+  /*
+    Both the base and extended save/load functions are optional.
+    If save_extended is defined, then it will be called in
+    preference to save.  The idea is that with "save", the caller
+    opens the context using the name of the device, and expects
+    the callee to write it and then return.  With "save_extended"
+    the caller passes the checkpoint store and the device name
+    to the callee.  The callee is then expected to open 
+    contexts as desired, write to them, and then close them 
+    before returning.  Load and load/extended are symmetric. 
+  */
+    
+  int (*save)(struct v3_chkpt_ctx * ctx, void * private_data);
+  int (*load)(struct v3_chkpt_ctx * ctx, void * privata_data);
+  int (*save_extended)(struct v3_chkpt * chkpt, char * id, void * private_data);
+  int (*load_extended)(struct v3_chkpt * chkpt, char * id, void * privata_data);
 #endif
 };
 
@@ -210,11 +224,11 @@ struct v3_dev_console_ops {
 
 struct v3_dev_char_ops {
     /* Backend implemented functions */
-    int (*write)(uint8_t * buf, uint64_t len, void * private_data);
+    uint64_t (*output)(uint8_t * buf, uint64_t len, void * private_data);
     //  int (*read)(uint8_t * buf, uint64_t len, void * private_data);
 
     /* Frontend Implemented functions */
-    int (*push)(struct v3_vm_info * vm, uint8_t * buf, uint64_t len, void * private_data);
+    uint64_t (*input)(struct v3_vm_info * vm, uint8_t * buf, uint64_t len, void * private_data);
 };