X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_dev_mgr.h;h=792aa0c799b2242bebf0122d62edb64d7cdf7b69;hb=ef34565873989f5b0240f7f9911c3666a69587c9;hp=c9999bd856cd18084658849f6e1d03655ac4c77e;hpb=fdb16aa5e99a19a91264ae84beaf77d3036548d5;p=palacios.releases.git diff --git a/palacios/include/palacios/vmm_dev_mgr.h b/palacios/include/palacios/vmm_dev_mgr.h index c9999bd..792aa0c 100644 --- a/palacios/include/palacios/vmm_dev_mgr.h +++ b/palacios/include/palacios/vmm_dev_mgr.h @@ -102,14 +102,14 @@ int V3_init_devices(); int V3_deinit_devices(); -#ifdef CONFIG_KEYED_STREAMS +#ifdef V3_CONFIG_KEYED_STREAMS #include #endif struct v3_device_ops { int (*free)(void * private_data); -#ifdef CONFIG_KEYED_STREAMS +#ifdef V3_CONFIG_KEYED_STREAMS int (*checkpoint)(struct vm_device *dev, v3_keyed_stream_t stream); int (*restore)(struct vm_device *dev, v3_keyed_stream_t stream); #endif @@ -202,11 +202,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); + 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); };