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

diff --git a/palacios/src/devices/lnx_virtio_nic.c b/palacios/src/devices/lnx_virtio_nic.c
index 3ef9509..7609b0a 100644
--- a/palacios/src/devices/lnx_virtio_nic.c
+++ b/palacios/src/devices/lnx_virtio_nic.c
@@ -150,7 +150,7 @@ static int virtio_init_state(struct virtio_net_state * virtio)
     virtio->virtio_cfg.host_features = 0; // (1 << VIRTIO_NET_F_MAC);
 
     if ((v3_lock_init(&(virtio->rx_lock)) == -1) ||
-	  (v3_lock_init(&(virtio->tx_lock)) == -1)){
+	(v3_lock_init(&(virtio->tx_lock)) == -1)){
         PrintError("Virtio NIC: Failure to init locks for net_state\n");
     }
 
@@ -160,7 +160,10 @@ static int virtio_init_state(struct virtio_net_state * virtio)
     return 0;
 }
 
-static int pkt_tx(struct guest_info * core, struct virtio_net_state * virtio, struct vring_desc * buf_desc) 
+static int 
+pkt_tx(struct guest_info * core, 
+       struct virtio_net_state * virtio, 
+       struct vring_desc * buf_desc) 
 {
     uint8_t * buf = NULL;
     uint32_t len = buf_desc->length;
@@ -170,16 +173,17 @@ static int pkt_tx(struct guest_info * core, struct virtio_net_state * virtio, st
 	return -ERR_VIRTIO_OTHER;
     }
 
-    return virtio->net_ops->send(buf, len, virtio->backend_data, NULL);
+    return virtio->net_ops->send(buf, len, virtio->backend_data);
 }
 
 
-static int copy_data_to_desc(struct guest_info * core, 
-					struct virtio_net_state * virtio_state, 
-					struct vring_desc * desc, 
-					uchar_t * buf, 
-					uint_t buf_len,
-					uint_t offset)
+static int 
+copy_data_to_desc(struct guest_info * core, 
+		  struct virtio_net_state * virtio_state, 
+		  struct vring_desc * desc, 
+		  uchar_t * buf, 
+		  uint_t buf_len,
+		  uint_t offset)
 {
     uint32_t len;
     uint8_t * desc_buf = NULL;
@@ -225,7 +229,8 @@ static inline void notify_guest(struct virtio_net_state * virtio){
 
 
 /* guest free some pkts from rx queue */
-static int handle_rx_kick(struct guest_info *core, struct virtio_net_state * virtio) 
+static int handle_rx_kick(struct guest_info *core, 
+			  struct virtio_net_state * virtio) 
 {
     unsigned long flags;
 
@@ -240,12 +245,14 @@ static int handle_rx_kick(struct guest_info *core, struct virtio_net_state * vir
 }
 
 
-static int handle_ctrl(struct guest_info *core, struct virtio_net_state * virtio) {
+static int handle_ctrl(struct guest_info *core, 
+		       struct virtio_net_state * virtio) {
 	
     return 0;
 }
 
-static int handle_pkt_tx(struct guest_info *core, struct virtio_net_state * virtio_state) 
+static int handle_pkt_tx(struct guest_info *core, 
+			 struct virtio_net_state * virtio_state) 
 {
     struct virtio_queue * q = &(virtio_state->tx_vq);
     struct virtio_net_hdr * hdr = NULL;
@@ -322,10 +329,9 @@ exit_error:
 
 
 static int virtio_setup_queue(struct guest_info *core, 
-				struct virtio_net_state * virtio_state, 
-				struct virtio_queue * queue, 
-							addr_t pfn, 
-							addr_t page_addr) {
+			      struct virtio_net_state * virtio_state, 
+			      struct virtio_queue * queue, 
+			      addr_t pfn, addr_t page_addr) {
     queue->pfn = pfn;
 		
     queue->ring_desc_addr = page_addr;
@@ -362,7 +368,9 @@ static int virtio_setup_queue(struct guest_info *core,
     return 0;
 }
 
-static int virtio_io_write(struct guest_info *core, uint16_t port, void * src, uint_t length, void * private_data) 
+static int virtio_io_write(struct guest_info *core, 
+			   uint16_t port, void * src, 
+			   uint_t length, void * private_data) 
 {
     struct virtio_net_state * virtio = (struct virtio_net_state *)private_data;
     int port_idx = port % virtio->io_range_size;
@@ -457,7 +465,9 @@ static int virtio_io_write(struct guest_info *core, uint16_t port, void * src, u
     return length;
 }
 
-static int virtio_io_read(struct guest_info *core, uint16_t port, void * dst, uint_t length, void * private_data) 
+static int virtio_io_read(struct guest_info *core, 
+			  uint16_t port, void * dst, 
+			  uint_t length, void * private_data) 
 {
     struct virtio_net_state * virtio = (struct virtio_net_state *)private_data;
     int port_idx = port % virtio->io_range_size;
@@ -640,9 +650,6 @@ exit:
 
 static struct v3_device_ops dev_ops = {
     .free = virtio_free,
-    .reset = NULL,
-    .start = NULL,
-    .stop = NULL,
 };
 
 
@@ -685,7 +692,8 @@ static void virtio_stop_tx(void * data){
 	
 
 
-static int register_dev(struct virtio_dev_state * virtio, struct virtio_net_state * net_state) 
+static int register_dev(struct virtio_dev_state * virtio, 
+			struct virtio_net_state * net_state) 
 {
     struct pci_device * pci_dev = NULL;
     struct v3_pci_bar bars[6];
@@ -781,9 +789,9 @@ static int connect_fn(struct v3_vm_info * info,
 static int virtio_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct vm_device * pci_bus = v3_find_dev(vm, v3_cfg_val(cfg, "bus"));
     struct virtio_dev_state * virtio_state = NULL;
-    char * name = v3_cfg_val(cfg, "name");
+    char * dev_id = v3_cfg_val(cfg, "ID");
 
-    PrintDebug("Virtio NIC: Initializing VIRTIO Network device: %s\n", name);
+    PrintDebug("Virtio NIC: Initializing VIRTIO Network device: %s\n", dev_id);
 
     if (pci_bus == NULL) {
 	PrintError("Virtio NIC: VirtIO devices require a PCI Bus");
@@ -797,14 +805,17 @@ static int virtio_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     virtio_state->pci_bus = pci_bus;
     virtio_state->vm = vm;
 
-    struct vm_device * dev = v3_allocate_device(name, &dev_ops, virtio_state);
-    if (v3_attach_device(vm, dev) == -1) {
-	PrintError("Virtio NIC: Could not attach device %s\n", name);
+    struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, virtio_state);
+
+    if (dev == NULL) {
+	PrintError("Virtio NIC: Could not attach device %s\n", dev_id);
+	V3_Free(virtio_state);
 	return -1;
     }
 
-    if (v3_dev_add_net_frontend(vm, name, connect_fn, (void *)virtio_state) == -1) {
-	PrintError("Virtio NIC: Could not register %s as net frontend\n", name);
+    if (v3_dev_add_net_frontend(vm, dev_id, connect_fn, (void *)virtio_state) == -1) {
+	PrintError("Virtio NIC: Could not register %s as net frontend\n", dev_id);
+	v3_remove_device(dev);
 	return -1;
     }