X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_dev_mgr.h;h=383aebd6607b05f8ad7c4054d56eaad4331c2120;hb=4156ab67859b157da5d78ea6984f3af067bb7edd;hp=2e732cdef87e71b84bfc8022172c4835c25e5fdc;hpb=e49df33562b190c348b3a117044136c704442c6b;p=palacios-OLD.git

diff --git a/palacios/include/palacios/vmm_dev_mgr.h b/palacios/include/palacios/vmm_dev_mgr.h
index 2e732cd..383aebd 100644
--- a/palacios/include/palacios/vmm_dev_mgr.h
+++ b/palacios/include/palacios/vmm_dev_mgr.h
@@ -26,9 +26,10 @@
 #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>
-
+#include <palacios/vmm_keyed_stream.h>
 
 struct v3_vm_info;
 
@@ -49,9 +50,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;
 };
 
 
@@ -106,8 +106,8 @@ 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);
+    int (*checkpoint)(struct vm_device *dev, v3_keyed_stream_t stream);
+    int (*restore)(struct vm_device *dev, v3_keyed_stream_t stream);
 };
 
 
@@ -116,12 +116,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);
+