X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Flnx_virtio_nic.c;h=899909f4bbbc67693d56343e67c5ad979c04bca4;hb=96a71766125d211be08d7670c93938cf0ea09c04;hp=7609b0a8a0e122e36e42709028c2c376ee0aa7cb;hpb=72420d58d18ec71d4777d029daaf0c6a1c820b32;p=palacios.git

diff --git a/palacios/src/devices/lnx_virtio_nic.c b/palacios/src/devices/lnx_virtio_nic.c
index 7609b0a..899909f 100644
--- a/palacios/src/devices/lnx_virtio_nic.c
+++ b/palacios/src/devices/lnx_virtio_nic.c
@@ -115,11 +115,7 @@ struct virtio_net_state {
 #define ERR_VIRTIO_TXQ_DISABLED 6
 
 
-static int virtio_free(struct vm_device * dev) 
-{
-	
-    return 0;
-}
+
 
 static int virtio_init_state(struct virtio_net_state * virtio) 
 {
@@ -236,8 +232,10 @@ static int handle_rx_kick(struct guest_info *core,
 
     flags = v3_lock_irqsave(virtio->rx_lock);
 
-    virtio->net_ops->start_rx(virtio->backend_data);
-    disable_cb(&virtio->rx_vq);
+    if(virtio->net_ops->start_rx != NULL){
+	virtio->net_ops->start_rx(virtio->backend_data);
+    }
+    	//disable_cb(&virtio->rx_vq);
 
     v3_unlock_irqrestore(virtio->rx_lock, flags);
 	
@@ -375,7 +373,6 @@ static int virtio_io_write(struct guest_info *core,
     struct virtio_net_state * virtio = (struct virtio_net_state *)private_data;
     int port_idx = port % virtio->io_range_size;
 
-
     PrintDebug("VIRTIO NIC %p Write for port %d (index=%d) len=%d, value=%x\n", private_data,
 	       port, port_idx,  length, *(uint32_t *)src);
 
@@ -399,11 +396,11 @@ static int virtio_io_write(struct guest_info *core,
 	    switch (queue_idx) {
 		case 0:
 		    virtio_setup_queue(core, virtio, &virtio->rx_vq, pfn, page_addr);
-		    disable_cb(&virtio->rx_vq);
+		    //disable_cb(&virtio->rx_vq);
 		    break;
 		case 1:
 		    virtio_setup_queue(core, virtio, &virtio->tx_vq, pfn, page_addr);
-		    disable_cb(&virtio->tx_vq);
+		    //disable_cb(&virtio->tx_vq);
 		    break;
 		case 2:
 		    virtio_setup_queue(core, virtio, &virtio->ctrl_vq, pfn, page_addr);
@@ -427,9 +424,7 @@ static int virtio_io_write(struct guest_info *core,
 		uint16_t queue_idx = *(uint16_t *)src;	   		
 		if (queue_idx == 0){
 		    handle_rx_kick(core, virtio);
-		    PrintError("rx kick\n");
 		} else if (queue_idx == 1){
-		    PrintError("tx kick\n");
 		    if (handle_pkt_tx(core, virtio) == -1) {
 			PrintError("Could not handle NIC Notification\n");
 			return -1;
@@ -559,6 +554,13 @@ static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) {
     int ret_val = -ERR_VIRTIO_OTHER;
     int raw = 1;
 
+#ifndef CONFIG_DEBUG_VIRTIO_NET
+   {
+    	PrintDebug("Virtio-NIC: virtio_rx: size: %d\n", size);	
+    	//v3_hexdump(buf, size, NULL, 0);
+   }
+#endif
+
     flags = v3_lock_irqsave(virtio->rx_lock);
 
     virtio->pkt_recv ++;
@@ -647,9 +649,17 @@ exit:
     return ret_val;
 }
 
+static int virtio_free(struct virtio_net_state * virtio) {
+	
+    // unregister from PCI
+
+    V3_Free(virtio);
+    return 0;
+}
+
 
 static struct v3_device_ops dev_ops = {
-    .free = virtio_free,
+    .free = (int (*)(void *))virtio_free,
 };
 
 
@@ -776,6 +786,8 @@ static int connect_fn(struct v3_vm_info * info,
 
     net_state->net_ops = ops;
     net_state->backend_data = private_data;
+    net_state->virtio_dev = virtio;
+	
 
     ops->recv = virtio_rx;
     ops->poll = virtio_nic_poll;