X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fvnet_nic.c;h=d66384dd61c11a8eade37c79bdaea070d88196f1;hb=4a87564dd627efc2fa0b15044ebd16b98cc0009a;hp=6a6406c7c7ab6550e944b55b11a258f8ad1c08a9;hpb=e49df33562b190c348b3a117044136c704442c6b;p=palacios.git

diff --git a/palacios/src/devices/vnet_nic.c b/palacios/src/devices/vnet_nic.c
index 6a6406c..d66384d 100644
--- a/palacios/src/devices/vnet_nic.c
+++ b/palacios/src/devices/vnet_nic.c
@@ -19,7 +19,7 @@
  */
 //backend device for Virtio NIC
 
-#include <palacios/vmm_vnet.h>
+#include <vnet/vnet.h>
 #include <palacios/vmm.h>
 #include <palacios/vmm_dev_mgr.h>
 #include <devices/lnx_virtio_pci.h>
@@ -28,33 +28,17 @@
 #include <palacios/vmm_sprintf.h>
 #include <palacios/vmm_ethernet.h>
 
-#ifndef CONFIG_DEBUG_VNET_NIC
+#ifndef V3_CONFIG_DEBUG_VNET_NIC
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
 
-
 struct vnet_nic_state {
     struct v3_vm_info * vm;
     struct v3_dev_net_ops net_ops;
     int vnet_dev_id;
 };
 
-/* called by frontend device, 
-  * tell the VNET can start sending pkt to it */
-static void start_rx(void * private_data){
-    //struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data;
-
-    //v3_vnet_enable_device(vnetnic->vnet_dev_id);
-}
-
-/* called by frontend device, 
-  * tell the VNET stop sending pkt to it */
-static void stop_rx(void * private_data){
-    //struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data;
-
-    //v3_vnet_disable_device(vnetnic->vnet_dev_id);
-}
 
 /* called by frontend, send pkt to VNET */
 static int vnet_nic_send(uint8_t * buf, uint32_t len, 
@@ -68,52 +52,36 @@ static int vnet_nic_send(uint8_t * buf, uint32_t len,
     memcpy(pkt.header, buf, ETHERNET_HEADER_LEN);
     pkt.data = buf;
 
-#ifdef CONFIG_DEBUG_VNET_NIC
-    {
-    	PrintDebug("VNET-NIC: send pkt (size: %d, src_id: %d, src_type: %d)\n", 
+    V3_Net_Print(2, "VNET-NIC: send pkt (size: %d, src_id: %d, src_type: %d)\n", 
 		   pkt.size, pkt.src_id, pkt.src_type);
-    	v3_hexdump(buf, len, NULL, 0);
+    if(net_debug >= 4){
+	v3_hexdump(buf, len, NULL, 0);
     }
-#endif
 
-    return v3_vnet_send_pkt(&pkt, NULL);;
+    return v3_vnet_send_pkt(&pkt, NULL);
 }
 
 
 /* send pkt to frontend device */
-static int virtio_input(struct v3_vm_info * info, 
+static int fnt_input(struct v3_vm_info * info, 
 			struct v3_vnet_pkt * pkt, 
 			void * private_data){
     struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data;
 
-    PrintDebug("VNET-NIC: receive pkt (size %d, src_id:%d, src_type: %d, dst_id: %d, dst_type: %d)\n", 
+    V3_Net_Print(2, "VNET-NIC: receive pkt (size %d, src_id:%d, src_type: %d, dst_id: %d, dst_type: %d)\n", 
 		pkt->size, pkt->src_id, pkt->src_type, pkt->dst_id, pkt->dst_type);
 	
     return vnetnic->net_ops.recv(pkt->data, pkt->size,
-				 vnetnic->net_ops.frontend_data);
-}
-
-/* tell frontend device to poll data from guest */
-static void virtio_poll(struct v3_vm_info * info, 
-			void * private_data){
-    struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data;
-
-    vnetnic->net_ops.poll(info, vnetnic->net_ops.frontend_data);
+				 vnetnic->net_ops.config.frontend_data);
 }
 
 
-/* notify the frontend to start sending pkt to VNET*/
-static void start_tx(void * private_data){
+/* poll pkt from frontend device */
+static int fnt_poll(struct v3_vm_info * info,
+			int quote, void * private_data){
     struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data;
 
-    vnetnic->net_ops.start_tx(vnetnic->net_ops.frontend_data);
-}
-
-/* notify the frontend device to stop sending pkt to VNET*/
-static void stop_tx(void * private_data){
-    struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data;
-
-    vnetnic->net_ops.stop_tx(vnetnic->net_ops.frontend_data);
+    return vnetnic->net_ops.poll(quote, vnetnic->net_ops.config.frontend_data);
 }
 
 
@@ -131,10 +99,8 @@ static struct v3_device_ops dev_ops = {
 };
 
 static struct v3_vnet_dev_ops vnet_dev_ops = {
-    .input = virtio_input,
-    .poll = virtio_poll,
-    .start_tx = start_tx,
-    .stop_tx = stop_tx,
+    .input = fnt_input,
+    .poll = fnt_poll,
 };
 
 
@@ -156,8 +122,6 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     }
 
     vnetnic->net_ops.send = vnet_nic_send;
-    vnetnic->net_ops.start_rx = start_rx;
-    vnetnic->net_ops.stop_rx = stop_rx;
     vnetnic->vm = vm;
 	
     if (v3_dev_connect_net(vm, v3_cfg_val(frontend_cfg, "tag"), 
@@ -169,17 +133,18 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     }
 
     PrintDebug("Vnet-nic: Connect %s to frontend %s\n", 
-	      dev_id, v3_cfg_val(frontend_cfg, "tag"));
+	       dev_id, v3_cfg_val(frontend_cfg, "tag"));
 
-    if ((vnet_dev_id = v3_vnet_add_dev(vm, vnetnic->net_ops.fnt_mac, &vnet_dev_ops, (void *)vnetnic)) == -1) {
+    if ((vnet_dev_id = v3_vnet_add_dev(vm, vnetnic->net_ops.config.fnt_mac, 
+				       &vnet_dev_ops, vnetnic->net_ops.config.quote, 
+				       vnetnic->net_ops.config.poll, (void *)vnetnic)) == -1) {
 	PrintError("Vnet-nic device %s fails to registered to VNET\n", dev_id);
+	
 	v3_remove_device(dev);
 	return 0;
     }
     vnetnic->vnet_dev_id = vnet_dev_id;
 
-    PrintDebug("Vnet-nic device %s registered to VNET\n", dev_id);
-
     return 0;
 }