From: Lei Xia Date: Mon, 6 Jun 2011 01:32:49 +0000 (-0500) Subject: format fix X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=3265327285cf9896276ddf7fab7cbe0d3060bd10;p=palacios.git format fix --- diff --git a/palacios/src/devices/lnx_virtio_nic.c b/palacios/src/devices/lnx_virtio_nic.c index 5d5b45e..7a4eb4a 100644 --- a/palacios/src/devices/lnx_virtio_nic.c +++ b/palacios/src/devices/lnx_virtio_nic.c @@ -221,11 +221,11 @@ static int tx_one_pkt(struct guest_info * core, /*copy data into ring buffer */ static inline 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 dst_offset){ + struct virtio_net_state * virtio_state, + struct vring_desc * desc, + uchar_t * buf, + uint_t buf_len, + uint_t dst_offset){ uint32_t len; uint8_t * desc_buf = NULL; @@ -321,7 +321,8 @@ static int handle_pkt_tx(struct guest_info * core, v3_unlock_irqrestore(virtio_state->tx_lock, flags); if (txed && !(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) { - v3_pci_raise_irq(virtio_state->virtio_dev->pci_bus, 0, virtio_state->pci_dev); + v3_pci_raise_irq(virtio_state->virtio_dev->pci_bus, + 0, virtio_state->pci_dev); virtio_state->virtio_cfg.pci_isr = 0x1; virtio_state->stats.rx_interrupts ++; } @@ -386,8 +387,9 @@ 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); + PrintDebug("VIRTIO NIC %p Write for port %d (index=%d) len=%d, value=%x\n", + private_data, port, port_idx, + length, *(uint32_t *)src); switch (port_idx) { case GUEST_FEATURES_PORT: @@ -408,17 +410,23 @@ static int virtio_io_write(struct guest_info *core, uint16_t queue_idx = virtio->virtio_cfg.vring_queue_selector; switch (queue_idx) { case 0: - virtio_setup_queue(core, virtio, &virtio->rx_vq, pfn, page_addr); + virtio_setup_queue(core, virtio, + &virtio->rx_vq, + pfn, page_addr); break; case 1: - virtio_setup_queue(core, virtio, &virtio->tx_vq, pfn, page_addr); + virtio_setup_queue(core, virtio, + &virtio->tx_vq, + pfn, page_addr); if(virtio->tx_notify == 0){ disable_cb(&virtio->tx_vq); vnet_thread_wakeup(virtio->poll_thread); } break; case 2: - virtio_setup_queue(core, virtio, &virtio->ctrl_vq, pfn, page_addr); + virtio_setup_queue(core, virtio, + &virtio->ctrl_vq, + pfn, page_addr); break; default: break; @@ -481,8 +489,8 @@ static int virtio_io_read(struct guest_info *core, int port_idx = port % virtio->io_range_size; uint16_t queue_idx = virtio->virtio_cfg.vring_queue_selector; - PrintDebug("Virtio NIC %p: Read for port 0x%x (index =%d), length=%d\n", private_data, - port, port_idx, length); + PrintDebug("Virtio NIC %p: Read for port 0x%x (index =%d), length=%d\n", + private_data, port, port_idx, length); switch (port_idx) { case HOST_FEATURES_PORT: @@ -544,7 +552,8 @@ static int virtio_io_read(struct guest_info *core, case VIRTIO_ISR_PORT: *(uint8_t *)dst = virtio->virtio_cfg.pci_isr; virtio->virtio_cfg.pci_isr = 0; - v3_pci_lower_irq(virtio->virtio_dev->pci_bus, 0, virtio->pci_dev); + v3_pci_lower_irq(virtio->virtio_dev->pci_bus, + 0, virtio->pci_dev); break; case VIRTIO_NET_CONFIG ... VIRTIO_NET_CONFIG + ETH_ALEN: @@ -552,7 +561,8 @@ static int virtio_io_read(struct guest_info *core, break; default: - PrintError("Virtio NIC: Read of Unhandled Virtio Read:%d\n", port_idx); + PrintError("Virtio NIC: Read of Unhandled Virtio Read:%d\n", + port_idx); return -1; } @@ -588,7 +598,8 @@ static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) { uint32_t offset = 0; hdr_len = (virtio->mergeable_rx_bufs)? - sizeof(struct virtio_net_hdr_mrg_rxbuf):sizeof(struct virtio_net_hdr); + sizeof(struct virtio_net_hdr_mrg_rxbuf): + sizeof(struct virtio_net_hdr); if(virtio->mergeable_rx_bufs){/* merged buffer */ struct vring_desc * hdr_desc; @@ -616,7 +627,8 @@ static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) { len = copy_data_to_desc(&(virtio->virtio_dev->vm->cores[0]), virtio, buf_desc, buf+offset, size-offset, 0); if (len < 0){ - V3_Net_Print(2, "Virtio NIC:merged buffer, %d buffer size %d\n", hdr.num_buffers, len); + V3_Net_Print(2, "Virtio NIC:merged buffer, %d buffer size %d\n", + hdr.num_buffers, len); q->cur_avail_idx = old_idx; goto err_exit; } @@ -641,7 +653,8 @@ static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) { len = copy_data_to_desc(&(virtio->virtio_dev->vm->cores[0]), virtio, buf_desc, (uchar_t *)&(hdr.hdr), hdr_len, 0); if(len < hdr_len){ - V3_Net_Print(2, "Virtio NIC: rx copy header error %d, hdr_len %d\n", len, hdr_len); + V3_Net_Print(2, "Virtio NIC: rx copy header error %d, hdr_len %d\n", + len, hdr_len); goto err_exit; } @@ -667,7 +680,8 @@ static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) { buf_desc->flags &= ~VIRTIO_NEXT_FLAG; if(offset < size){ - V3_Net_Print(2, "Virtio NIC: rx not enough ring buffer, buffer size %d\n", len); + V3_Net_Print(2, "Virtio NIC: rx not enough ring buffer, buffer size %d\n", + len); goto err_exit; } @@ -690,7 +704,8 @@ static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) { v3_unlock_irqrestore(virtio->rx_lock, flags); if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG) || kick_guest) { - V3_Net_Print(2, "Virtio NIC: RX Raising IRQ %d\n", virtio->pci_dev->config_header.intr_line); + V3_Net_Print(2, "Virtio NIC: RX Raising IRQ %d\n", + virtio->pci_dev->config_header.intr_line); virtio->virtio_cfg.pci_isr = 0x1; v3_pci_raise_irq(virtio->virtio_dev->pci_bus, 0, virtio->pci_dev); @@ -700,7 +715,9 @@ static int virtio_rx(uint8_t * buf, uint32_t size, void * private_data) { /* notify guest if it is in guest mode */ if((kick_guest || virtio->rx_notify == 1) && V3_Get_CPU() != virtio->virtio_dev->vm->cores[0].pcpu_id){ - v3_interrupt_cpu(virtio->virtio_dev->vm, virtio->virtio_dev->vm->cores[0].pcpu_id, 0); + v3_interrupt_cpu(virtio->virtio_dev->vm, + virtio->virtio_dev->vm->cores[0].pcpu_id, + 0); } return 0; @@ -738,7 +755,8 @@ static struct v3_device_ops dev_ops = { static int virtio_tx_flush(void * args){ struct virtio_net_state *virtio = (struct virtio_net_state *)args; - V3_Print("Virtio TX Poll Thread Starting for %s\n", virtio->vm->name); + V3_Print("Virtio TX Poll Thread Starting for %s\n", + virtio->vm->name); while(1){ if(virtio->tx_notify == 0){ @@ -761,7 +779,7 @@ static int register_dev(struct virtio_dev_state * virtio, int tmp_ports = num_ports; int i; - // This gets the number of ports, rounded up to a power of 2 + /* This gets the number of ports, rounded up to a power of 2 */ net_state->io_range_size = 1; // must be a power of 2 while (tmp_ports > 0) { tmp_ports >>= 1; @@ -769,8 +787,8 @@ static int register_dev(struct virtio_dev_state * virtio, } /* this is to account for any low order bits being set in num_ports - * if there are none, then num_ports was already a power of 2 so we shift right to reset it - */ + * if there are none, then num_ports was already a power of 2 so we shift right to reset it + */ if ((num_ports & ((net_state->io_range_size >> 1) - 1)) == 0) { net_state->io_range_size >>= 1; } @@ -779,7 +797,8 @@ static int register_dev(struct virtio_dev_state * virtio, bars[i].type = PCI_BAR_NONE; } - PrintDebug("Virtio-NIC io_range_size = %d\n", net_state->io_range_size); + PrintDebug("Virtio-NIC io_range_size = %d\n", + net_state->io_range_size); bars[0].type = PCI_BAR_IO; bars[0].default_base_port = -1; @@ -913,7 +932,8 @@ static int connect_fn(struct v3_vm_info * info, net_state->tx_notify = 0; net_state->rx_notify = 0; - net_state->timer = v3_add_timer(&(info->cores[0]),&timer_ops,net_state); + net_state->timer = v3_add_timer(&(info->cores[0]), + &timer_ops,net_state); PrintError("net_state 0x%p\n", (void *)net_state); @@ -921,7 +941,8 @@ static int connect_fn(struct v3_vm_info * info, ops->frontend_data = net_state; memcpy(ops->fnt_mac, virtio->mac, ETH_ALEN); - net_state->poll_thread = vnet_start_thread(virtio_tx_flush, (void *)net_state, "Virtio_Poll"); + net_state->poll_thread = vnet_start_thread(virtio_tx_flush, + (void *)net_state, "Virtio_Poll"); net_state->status = 1;