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

diff --combined palacios/include/palacios/vmm_dev_mgr.h
index cd1d2ef,1ec922c..e789207
--- 1/palacios/include/palacios/vmm_dev_mgr.h
--- 2/palacios/include/palacios/vmm_dev_mgr.h
+++ b/palacios/include/palacios/vmm_dev_mgr.h
@@@ -29,7 -29,6 +29,6 @@@
  #include <palacios/vmm_msr.h>
  #include <palacios/vmm_config.h>
  #include <palacios/vmm_ethernet.h>
- #include <palacios/vmm_keyed_stream.h>
  
  struct v3_vm_info;
  
@@@ -103,11 -102,17 +102,17 @@@ int V3_init_devices()
  int V3_deinit_devices();
  
  
+ #ifdef CONFIG_KEYED_STREAMS
+ #include <interfaces/vmm_keyed_stream.h>
+ #endif 
+ 
  struct v3_device_ops {
      int (*free)(void * private_data);
  
+ #ifdef 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
  };
  
  
@@@ -175,10 -180,14 +180,10 @@@ struct v3_dev_blk_ops 
  struct v3_dev_net_ops {
      /* Backend implemented functions */
      int (*send)(uint8_t * buf, uint32_t count, 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);
 +    void (*poll)(struct v3_vm_info * vm, int budget, void * frnt_data);
  
      /* This is ugly... */
      void * frontend_data;