X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_dev_mgr.h;h=1f10874efb000e6f289c5f656e46b29baf7e025f;hb=ed58e44a111e3bb28e1b2fefd93fe7955962d682;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..1f10874 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 <interfaces/vmm_keyed_stream.h>
 #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
@@ -177,16 +177,24 @@ 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 len, int synchronize, void * private_data);
+    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... */
-    void * frontend_data; 
-    char fnt_mac[ETH_ALEN];
+    struct v3_dev_net_ops_cfg config;
 };
 
 struct v3_dev_console_ops {
@@ -202,11 +210,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);
 };