fixed a number of bugs due to the update

[palacios.git] / palacios / include / palacios / vmm.h

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index c209185..d5f8fea 100644 (file)
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -24,7 +24,7 @@
 #include <palacios/vm_guest.h>
 #include <palacios/vmm_mem.h>
 #include <palacios/vmm_types.h>
-#include <devices/vnic.h>
+
 
 
 #ifdef __V3VEE__
@@ -194,23 +194,6 @@
     } while(0)                                                         \
        
 
-#define V3_REGISTER_PKT_DELIVERY(x) ({                                 \
-           int ret = 0;                                                \
-           extern struct v3_os_hooks * os_hooks;                       \
-           if ((os_hooks) && (os_hooks)->register_pkt_delivery) {      \
-               ret = (os_hooks)->register_pkt_delivery(x);             \
-           }                                                           \
-           ret;                                                        \
-       })
-
-#define V3_SEND_PKT(x, y) ({                                   \
-           int ret = 0;                                        \
-           extern struct v3_os_hooks * os_hooks;               \
-           if ((os_hooks) && (os_hooks)->ne2k_send_packet) {   \
-               ret = (os_hooks)->ne2k_send_packet(x, y);       \
-           }                                                   \
-           ret;                                                \
-       })
 
 
 #define VMM_INVALID_CPU 0
@@ -260,9 +243,7 @@ struct v3_os_hooks {
 
     void (*yield_cpu)(void);
 
-    //function by network card driver
-    int (*register_pkt_delivery)(int (*rcvd_fn)(uchar_t *packet, uint_t size));
-    int (*ne2k_send_packet)(uchar_t *packet, uint_t size);
+
  
 };