X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_dev_mgr.h;h=f09c11011aaa46bc1b3e1c5c5b391396faeb095f;hb=906a0bf4003eb267398462dbc834b0ab85bca13a;hp=84fd53cc124e55dc9cb283ed6306ca225aeb5e07;hpb=2774b84f1350366477eb820c7b7a2a0f56a0e074;p=palacios.git diff --git a/palacios/include/palacios/vmm_dev_mgr.h b/palacios/include/palacios/vmm_dev_mgr.h index 84fd53c..f09c110 100644 --- a/palacios/include/palacios/vmm_dev_mgr.h +++ b/palacios/include/palacios/vmm_dev_mgr.h @@ -33,6 +33,9 @@ struct v3_vm_info; struct v3_device_ops; +typedef void * v3_dev_data_t; + +struct vm_device; struct vm_device { char name[32]; @@ -62,17 +65,16 @@ struct vmm_dev_mgr { struct list_head net_list; struct hashtable * net_table; - struct list_head console_list; - struct hashtable * console_table; + struct list_head char_list; + struct hashtable * char_table; + + struct list_head cons_list; + struct hashtable * cons_table; }; int v3_create_device(struct v3_vm_info * vm, const char * dev_name, v3_cfg_tree_t * cfg); - -void v3_free_device(struct vm_device * dev); - - struct vm_device * v3_find_dev(struct v3_vm_info * info, const char * dev_name); @@ -86,25 +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(); -struct v3_device_ops { - int (*free)(struct vm_device *dev); - int (*reset)(struct vm_device *dev); +int V3_init_devices(); +int V3_deinit_devices(); - int (*start)(struct vm_device *dev); - int (*stop)(struct vm_device *dev); +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); @@ -115,18 +114,23 @@ struct v3_device_ops { -int v3_dev_hook_io(struct vm_device *dev, +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, struct vm_device * dev), - int (*write)(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev)); + 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)); -int v3_dev_unhook_io(struct vm_device *dev, +int v3_dev_unhook_io(struct vm_device * dev, ushort_t port); + +struct vm_device * v3_add_device(struct v3_vm_info * vm, char * name, + struct v3_device_ops * ops, void * private_data); +int v3_remove_device(struct vm_device * dev); + + int v3_attach_device(struct v3_vm_info * vm, struct vm_device * dev); int v3_detach_device(struct vm_device * dev); - struct vm_device * v3_allocate_device(char * name, struct v3_device_ops * ops, void * private_data); @@ -158,19 +162,42 @@ struct v3_dev_blk_ops { }; struct v3_dev_net_ops { - int (*send)(uint8_t * buf, uint32_t count, void * private_data, struct vm_device *dest_dev); - int (*register_input)(void *backend_data, - int (*frontend_input)(struct v3_vm_info *info, - uchar_t * buf, - uint32_t size, - void *private_data), - void *front_data); + /* 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); + + /* 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); + + /* This is ugly... */ + void * frontend_data; }; 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); + void * push_fn_arg; +}; +struct v3_dev_char_ops { + /* Backend implemented functions */ + int (*write)(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); }; + int v3_dev_add_blk_frontend(struct v3_vm_info * vm, char * name, int (*connect)(struct v3_vm_info * vm, @@ -179,6 +206,7 @@ int v3_dev_add_blk_frontend(struct v3_vm_info * vm, v3_cfg_tree_t * cfg, void * private_data), void * priv_data); + int v3_dev_connect_blk(struct v3_vm_info * vm, char * frontend_name, struct v3_dev_blk_ops * ops, @@ -201,6 +229,43 @@ int v3_dev_connect_net(struct v3_vm_info * vm, void * private_data); + + +int v3_dev_add_console_frontend(struct v3_vm_info * vm, + char * name, + int (*connect)(struct v3_vm_info * vm, + void * frontend_data, + struct v3_dev_console_ops * ops, + v3_cfg_tree_t * cfg, + void * private_data), + void * priv_data); + +int v3_dev_connect_console(struct v3_vm_info * vm, + char * frontend_name, + struct v3_dev_console_ops * ops, + v3_cfg_tree_t * cfg, + void * private_data); + + + +int v3_dev_add_char_frontend(struct v3_vm_info * vm, + char * name, + int (*connect)(struct v3_vm_info * vm, + void * frontend_data, + struct v3_dev_char_ops * ops, + v3_cfg_tree_t * cfg, + void * private_data, + void ** push_fn_arg), + void * priv_data); + +int v3_dev_connect_char(struct v3_vm_info * vm, + char * frontend_name, + struct v3_dev_char_ops * ops, + v3_cfg_tree_t * cfg, + void * private_data, + void ** push_fn_arg); + + #endif // ! __V3VEE__ #endif