X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_dev_mgr.h;h=156b560645b81188fa1582d30fc512b37da2281e;hb=5d1bbcc86de011e3f0d115b6f10fd8645cdf855e;hp=2e732cdef87e71b84bfc8022172c4835c25e5fdc;hpb=e49df33562b190c348b3a117044136c704442c6b;p=palacios.git

diff --git a/palacios/include/palacios/vmm_dev_mgr.h b/palacios/include/palacios/vmm_dev_mgr.h
index 2e732cd..156b560 100644
--- a/palacios/include/palacios/vmm_dev_mgr.h
+++ b/palacios/include/palacios/vmm_dev_mgr.h
@@ -26,9 +26,13 @@
 #include <palacios/vmm_list.h>
 #include <palacios/vmm_string.h>
 #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;
 
@@ -49,9 +53,8 @@ struct vm_device {
 
     struct list_head dev_link;
 
-
-    uint_t num_io_hooks;
-    struct list_head io_hooks;
+    uint_t num_res_hooks;
+    struct list_head res_hooks;
 };
 
 
@@ -93,9 +96,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
 
 
 
@@ -106,8 +110,10 @@ int V3_deinit_devices();
 struct v3_device_ops {
     int (*free)(void * private_data);
 
-    //int (*save)(struct vm_device *dev, struct *iostream);
-    //int (*restore)(struct vm_device *dev, struct *iostream);
+#ifdef V3_CONFIG_CHECKPOINT
+    int (*save)(struct v3_chkpt_ctx * ctx, void * private_data);
+    int (*load)(struct v3_chkpt_ctx * ctx, void * privata_data);
+#endif
 };
 
 
@@ -116,12 +122,22 @@ struct v3_device_ops {
 
 
 int v3_dev_hook_io(struct vm_device   * dev,
-		   ushort_t            port,
-		   int (*read)(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data),
-		   int (*write)(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data));
+		   uint16_t            port,
+		   int (*read)(struct guest_info * core, uint16_t port, void * dst, uint_t length, void * priv_data),
+		   int (*write)(struct guest_info * core, uint16_t port, void * src, uint_t length, void * priv_data));
 
 int v3_dev_unhook_io(struct vm_device   * dev,
-		     ushort_t            port);
+		     uint16_t            port);
+
+
+int v3_dev_hook_msr(struct vm_device * dev, 
+		    uint32_t           msr,
+		    int (*read)(struct guest_info * core, uint32_t msr, struct v3_msr * dst, void * priv_data), 
+		    int (*write)(struct guest_info * core, uint32_t msr, struct v3_msr src, void * priv_data));
+
+int v3_dev_unhook_msr(struct vm_device * dev, 
+		      uint32_t msr);
+	    
 
 
 
@@ -162,21 +178,24 @@ struct v3_dev_blk_ops {
     int (*write)(uint8_t * buf, uint64_t lba, uint64_t num_bytes, void * private_data);
 };
 
+
+struct v3_dev_net_ops_cfg{
+    void * frontend_data; 
+    char * fnt_mac;
+    int quote;
+    int poll;  /* need poll? */
+};
+
 struct v3_dev_net_ops {
     /* Backend implemented functions */
-    int (*send)(uint8_t * buf, uint32_t count, void * private_data);
-    void (*start_rx)(void * back_data);
-    void (*stop_rx)(void * back_data);
+    int (*send)(uint8_t * buf, uint32_t len, void * private_data);
 
     /* Frontend implemented functions */
-    int (*recv)(uint8_t * buf, uint32_t count, void * frnt_data);
-    void (*poll)(struct v3_vm_info * vm, void * frnt_data);
-    void (*start_tx)(void * frnt_data);
-    void (*stop_tx)(void * frnt_data);
+    int (*recv)(uint8_t * buf, uint32_t len, void * frnt_data);
+    int (*poll)(int quote, void * frnt_data);
 
     /* This is ugly... */
-    void * frontend_data; 
-    char fnt_mac[ETH_ALEN];
+    struct v3_dev_net_ops_cfg config;
 };
 
 struct v3_dev_console_ops {
@@ -192,11 +211,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);
 };