X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_dev_mgr.h;h=84bbc5827e557a1ff2bad5e1fd32b0f51180396c;hb=e47ed16a96f6d7faa282bf757e9d2cc065d2657e;hp=f18664b5445a20c7edd457bdf4a3715fc5374a6d;hpb=72420d58d18ec71d4777d029daaf0c6a1c820b32;p=palacios.git

diff --git a/palacios/include/palacios/vmm_dev_mgr.h b/palacios/include/palacios/vmm_dev_mgr.h
index f18664b..84bbc58 100644
--- a/palacios/include/palacios/vmm_dev_mgr.h
+++ b/palacios/include/palacios/vmm_dev_mgr.h
@@ -26,6 +26,7 @@
 #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>
 
 
@@ -48,9 +49,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;
 };
 
 
@@ -88,18 +88,22 @@ struct vm_device * v3_find_dev(struct v3_vm_info * info, const char * dev_name);
 
 
 int v3_init_dev_mgr(struct v3_vm_info * vm);
-int v3_dev_mgr_deinit(struct v3_vm_info * vm);
+int v3_deinit_dev_mgr(struct v3_vm_info * vm);
+
+int v3_free_vm_devices(struct v3_vm_info * vm);
+
 
 
 
 
 
 
-int v3_init_devices();
+int V3_init_devices();
+int V3_deinit_devices();
 
 
 struct v3_device_ops {
-    int (*free)(struct vm_device * dev);
+    int (*free)(void * private_data);
 
     //int (*save)(struct vm_device *dev, struct *iostream);
     //int (*restore)(struct vm_device *dev, struct *iostream);
@@ -111,12 +115,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);
+	    
 
 
 
@@ -177,6 +191,7 @@ struct v3_dev_console_ops {
     int (*update_screen)(uint_t x, uint_t y, uint_t length, uint8_t * fb_data, void * private_data);
     int (*update_cursor)(uint_t x, uint_t y, void * private_data);
     int (*scroll)(int rows, void * private_data);
+    int (*set_text_resolution)(int cols, int rows, void * private_data);
 
     /* frontend implemented functions */
     int (*get_screen)(uint_t x, uint_t y, uint_t length, void * frontend_data);