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=52bbcafedee7c6e69a24f5c98e3d93c4d8d58450;hpb=a0d3be5212e7a5053ba213ce7bd26c7124cf01e3;p=palacios.git diff --git a/palacios/include/palacios/vmm_dev_mgr.h b/palacios/include/palacios/vmm_dev_mgr.h index 52bbcaf..156b560 100644 --- a/palacios/include/palacios/vmm_dev_mgr.h +++ b/palacios/include/palacios/vmm_dev_mgr.h @@ -26,13 +26,21 @@ #include #include #include +#include #include +#include +#ifdef V3_CONFIG_CHECKPOINT +#include +#endif struct v3_vm_info; struct v3_device_ops; +typedef void * v3_dev_data_t; + +struct vm_device; struct vm_device { char name[32]; @@ -45,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; }; @@ -65,17 +72,13 @@ struct vmm_dev_mgr { struct list_head char_list; struct hashtable * char_table; - struct list_head console_list; - struct hashtable * console_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); @@ -89,47 +92,62 @@ 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); +#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 -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); +#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 +}; - int (*reset)(struct vm_device *dev); - int (*start)(struct vm_device *dev); - int (*stop)(struct vm_device *dev); - //int (*save)(struct vm_device *dev, struct *iostream); - //int (*restore)(struct vm_device *dev, struct *iostream); -}; +int v3_dev_hook_io(struct vm_device * dev, + 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, + 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); + -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)); -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); @@ -160,33 +178,44 @@ 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, struct vm_device *dest_dev); - 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; + struct v3_dev_net_ops_cfg config; }; 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); + 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); }; @@ -221,6 +250,25 @@ 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,