From: Lei Xia <lxia@northwestern.edu>
Date: Thu, 18 Aug 2011 03:40:01 +0000 (-0500)
Subject: Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=cf780b903a02efc700d51dbadcc90115f016256c;hp=-c;p=palacios.git

Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacios into devel
---

cf780b903a02efc700d51dbadcc90115f016256c
diff --combined palacios/include/palacios/vmm_dev_mgr.h
index eeb0e56,792aa0c..1f10874
--- a/palacios/include/palacios/vmm_dev_mgr.h
+++ b/palacios/include/palacios/vmm_dev_mgr.h
@@@ -177,24 -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 {
@@@ -210,11 -202,11 +210,11 @@@
  
  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);
  };