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=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..0f60313 100644 --- a/palacios/include/palacios/vmm_dev_mgr.h +++ b/palacios/include/palacios/vmm_dev_mgr.h @@ -26,8 +26,12 @@ #include #include #include +#include #include +#ifdef V3_CONFIG_CHECKPOINT +#include +#endif struct v3_vm_info; @@ -48,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; @@ -88,21 +92,42 @@ 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)(void * private_data); - //int (*save)(struct vm_device *dev, struct *iostream); - //int (*restore)(struct vm_device *dev, struct *iostream); +#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 }; @@ -111,12 +136,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); + @@ -153,30 +188,38 @@ 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 { /* 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); + 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); @@ -185,11 +228,11 @@ struct v3_dev_console_ops { struct v3_dev_char_ops { /* Backend implemented functions */ - int (*write)(uint8_t * buf, uint64_t len, void * private_data); + 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 */ - int (*push)(struct v3_vm_info * vm, uint8_t * buf, uint64_t len, void * private_data); + sint64_t (*input)(struct v3_vm_info * vm, uint8_t * buf, sint64_t len, void * private_data); };