X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_dev_mgr.h;h=0f6031358a4320c68afda9aba59c3c959604096d;hb=5257fd647c7873d682ccaece28b64fc0fb26d28a;hp=7e4708f6975f0438262b9fd1849fd1f687fb8356;hpb=3e5e5a12e64630d7a37ed32b8d7e2d993c79f7e0;p=palacios.git diff --git a/palacios/include/palacios/vmm_dev_mgr.h b/palacios/include/palacios/vmm_dev_mgr.h index 7e4708f..0f60313 100644 --- a/palacios/include/palacios/vmm_dev_mgr.h +++ b/palacios/include/palacios/vmm_dev_mgr.h @@ -26,13 +26,20 @@ #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,13 +52,13 @@ 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; }; struct vmm_dev_mgr { + int inited; uint_t num_devs; struct list_head dev_list; struct hashtable * dev_table; @@ -62,17 +69,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,47 +92,76 @@ 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 + /* + Both the base and extended save/load functions are optional. + If save_extended is defined, then it will be called in + preference to save. The idea is that with "save", the caller + opens the context using the name of the device, and expects + the callee to write it and then return. With "save_extended" + the caller passes the checkpoint store and the device name + to the callee. The callee is then expected to open + contexts as desired, write to them, and then close them + before returning. Load and load/extended are symmetric. + */ + + int (*save)(struct v3_chkpt_ctx * ctx, void * private_data); + int (*load)(struct v3_chkpt_ctx * ctx, void * privata_data); + int (*save_extended)(struct v3_chkpt * chkpt, char * id, void * private_data); + int (*load_extended)(struct v3_chkpt * chkpt, char * id, 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, struct vm_device * dev), - int (*write)(struct guest_info * core, ushort_t port, void * src, uint_t length, 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); @@ -153,20 +188,54 @@ void v3_print_dev_mgr(struct v3_vm_info * vm); struct v3_dev_blk_ops { uint64_t (*get_capacity)(void * private_data); // Reads always operate on 2048 byte blocks + + // how does this signal bytes_read < requested but not error? + int (*read)(uint8_t * buf, uint64_t lba, uint64_t num_bytes, void * private_data); 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 { - int (*send)(uint8_t * buf, uint32_t count, void * private_data, struct vm_device *dest_dev); - int (*receive)(uint8_t * buf, uint32_t count, void * private_data, struct vm_device *src_dev); + /* Backend implemented functions */ + int (*send)(uint8_t * buf, uint32_t len, void * private_data); + + /* Frontend implemented functions */ + int (*recv)(uint8_t * buf, uint32_t len, void * frnt_data); + int (*poll)(int quote, void * frnt_data); + /* This is ugly... */ + 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 */ + sint64_t (*output)(uint8_t * buf, sint64_t len, void * private_data); + // int (*read)(uint8_t * buf, uint64_t len, void * private_data); + /* Frontend Implemented functions */ + sint64_t (*input)(struct v3_vm_info * vm, uint8_t * buf, sint64_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, @@ -175,6 +244,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, @@ -197,6 +267,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