#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)
{
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);
}
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);
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);
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);
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;
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 ++;
return ret_val;
}
+static int virtio_free(struct virtio_dev_state * virtio) {
+ struct virtio_net_state * backend = NULL;
+ struct virtio_net_state * tmp = NULL;
+
+
+ list_for_each_entry_safe(backend, tmp, &(virtio->dev_list), dev_link) {
+
+ // unregister from PCI
+
+ list_del(&(backend->dev_link));
+ V3_Free(backend);
+ }
+
+ V3_Free(virtio);
+ return 0;
+}
+
static struct v3_device_ops dev_ops = {
- .free = virtio_free,
- .reset = NULL,
- .start = NULL,
- .stop = NULL,
+ .free = (int (*)(void *))virtio_free,
};
virtio_init_state(net_state);
+
+ /* Add backend to list of devices */
+ list_add(&(net_state->dev_link), &(virtio->dev_list));
+
return 0;
}
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;
virtio_state->pci_bus = pci_bus;
virtio_state->vm = vm;
- struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, virtio_state);
- if (v3_attach_device(vm, dev) == -1) {
+ 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, 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;
}