X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_dev_mgr.h;h=1e3f68b5dc70b3d64a6b7ec2899f0baa74e7bec3;hb=5e81abea907908ab9bdc0cb57a3537f05db77b5e;hp=3e52d9ae5fd754bb04d3afd063e3d694e42e1f81;hpb=6d6988cc9c8bac21d96afd800076afe0915cf2cd;p=palacios.git

diff --git a/palacios/include/palacios/vmm_dev_mgr.h b/palacios/include/palacios/vmm_dev_mgr.h
index 3e52d9a..1e3f68b 100644
--- a/palacios/include/palacios/vmm_dev_mgr.h
+++ b/palacios/include/palacios/vmm_dev_mgr.h
@@ -26,7 +26,9 @@
 #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>
 
 
 struct v3_vm_info;
@@ -48,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;
 };
 
 
@@ -88,14 +89,18 @@ 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 {
@@ -111,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);
+	    
 
 
 
@@ -171,12 +186,14 @@ struct v3_dev_net_ops {
 
     /* This is ugly... */
     void * frontend_data; 
+    char fnt_mac[ETH_ALEN];
 };
 
 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);