X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fvnet_nic.c;h=7a7dac01c91c7a4bc6083e7ac2388c362202a426;hb=d25220596e7ceb6b06a4b715f722a47afd8b48bb;hp=86f5ba7c98969c4f55098216557061d9f7ee17e6;hpb=edd0131b7b8672c9c3a7ef8682d17a48d682a53f;p=palacios.git

diff --git a/palacios/src/devices/vnet_nic.c b/palacios/src/devices/vnet_nic.c
index 86f5ba7..7a7dac0 100644
--- a/palacios/src/devices/vnet_nic.c
+++ b/palacios/src/devices/vnet_nic.c
@@ -42,24 +42,32 @@ struct vnet_nic_state {
 
 
 static int vnet_send(uint8_t * buf, uint32_t len, void * private_data, struct vm_device *dest_dev){
-    struct v3_vnet_pkt pkt;
     struct vnet_nic_state *vnetnic = (struct vnet_nic_state *)private_data;
 
-
+    struct v3_vnet_pkt pkt;
     pkt.size = len;
     pkt.src_type = LINK_INTERFACE;
     pkt.src_id = vnetnic->vnet_dev_id;
-    memcpy(pkt.data, buf, pkt.size);
+    memcpy(pkt.header, buf, ETHERNET_HEADER_LEN);
+    pkt.data = buf;
 
 #ifdef CONFIG_DEBUG_VNET_NIC
     {
-    	PrintDebug("Virtio VNET-NIC: send pkt size: %d, pkt src_id: %d, src_type: %d\n", 
-			len, pkt.src_id, pkt.src_type);
+    	PrintDebug("Virtio VNET-NIC: send pkt size: %d, pkt src_id: %d\n", 
+			len,  vnetnic->vnet_dev_id);
     	v3_hexdump(buf, len, NULL, 0);
     }
 #endif
-
-
+/*
+    v3_vnet_rx(buf, len, vnetnic->vnet_dev_id, LINK_INTERFACE);
+	
+    //if on the dom0 core, interrupt the domU core to poll pkts
+    //otherwise, call the polling directly
+    int cpu = V3_Get_CPU();
+    cpu = (cpu == 0)?1:0;
+    v3_interrupt_cpu(vnetnic->vm, cpu, V3_VNET_POLLING_VECTOR);
+ */
+ 
     v3_vnet_send_pkt(&pkt, NULL);
 
     return 0;
@@ -191,6 +199,48 @@ static int vnet_nic_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     }
 #endif
 
+//for temporary hack for Linux bridge (w/o encapuslation) test
+#if 0
+    {
+ 	static int vnet_nic_guestid = -1;
+	static int vnet_nic_dom0 = -1;
+    	uchar_t zeromac[6] = {0,0,0,0,0,0};
+		
+	if(!strcmp(name, "vnet_nic")){ //domu
+	    vnet_nic_guestid = vnet_dev_id;
+	}
+	if (!strcmp(name, "vnet_nic_dom0")){
+	    vnet_nic_dom0 = vnet_dev_id;
+	}
+
+	if(vnet_nic_guestid != -1 && vnet_nic_dom0 !=-1){
+	    struct v3_vnet_route route;
+		
+	    route.src_id = vnet_nic_guestid;
+	    route.src_type = LINK_INTERFACE;
+	    route.dst_id = vnet_nic_dom0;
+	    route.dst_type = LINK_INTERFACE;
+	    memcpy(route.dst_mac, zeromac, 6);
+	    route.dst_mac_qual = MAC_ANY;
+	    memcpy(route.src_mac, zeromac, 6);
+	    route.src_mac_qual = MAC_ANY;  
+	    v3_vnet_add_route(route);
+
+
+	    route.src_id = vnet_nic_dom0;
+	    route.src_type = LINK_INTERFACE;
+	    route.dst_id = vnet_nic_guestid;
+	    route.dst_type = LINK_INTERFACE;
+	    memcpy(route.dst_mac, zeromac, 6);
+	    route.dst_mac_qual = MAC_ANY;
+	    memcpy(route.src_mac, zeromac, 6);
+	    route.src_mac_qual = MAC_ANY;
+
+	    v3_vnet_add_route(route);
+	}
+    }
+#endif
+
     return 0;
 }