X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_dev_mgr.h;h=e789207e7a48000f1212988815913b88cb037d01;hb=16047acf61f82cb4ae33bcb84b221c2098215172;hp=383aebd6607b05f8ad7c4054d56eaad4331c2120;hpb=1e9ba89f90e30c3221006251fc75918071868ce3;p=palacios-OLD.git

diff --git a/palacios/include/palacios/vmm_dev_mgr.h b/palacios/include/palacios/vmm_dev_mgr.h
index 383aebd..e789207 100644
--- a/palacios/include/palacios/vmm_dev_mgr.h
+++ b/palacios/include/palacios/vmm_dev_mgr.h
@@ -29,7 +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 @@ 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,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);
-    void (*start_rx)(void * back_data);
-    void (*stop_rx)(void * back_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;