X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_dev_mgr.h;h=f90232ab2eef4816191f3c55580c54b8d55d9171;hb=7c0124e75c04de3d51a457f8788cbee61d51fd36;hp=556725e517db31acb203484f8e109f66e6520662;hpb=54be7fbb6b41d1241ad563a7135cdb28be73ff82;p=palacios.git diff --git a/palacios/include/palacios/vmm_dev_mgr.h b/palacios/include/palacios/vmm_dev_mgr.h index 556725e..f90232a 100644 --- a/palacios/include/palacios/vmm_dev_mgr.h +++ b/palacios/include/palacios/vmm_dev_mgr.h @@ -28,7 +28,6 @@ #include #include #include -#include #ifdef V3_CONFIG_CHECKPOINT #include @@ -188,6 +187,9 @@ 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); }; @@ -225,11 +227,11 @@ struct v3_dev_console_ops { struct v3_dev_char_ops { /* Backend implemented functions */ - uint64_t (*output)(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 */ - uint64_t (*input)(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); };