struct vm_device * pci_bus;
struct pci_device * pci_dev;
- struct virtio_queue queue[1];
+ struct virtio_queue queue[2];
struct virtio_queue * cur_queue;
-static int virtio_reset(struct vm_device * dev) {
- struct virtio_sym_state * virtio = (struct virtio_sym_state *)dev->private_data;
+static int virtio_reset(struct virtio_sym_state * virtio) {
memset(virtio->queue, 0, sizeof(struct virtio_queue));
}
-static int handle_kick(struct vm_device * dev) {
- struct virtio_sym_state * virtio = (struct virtio_sym_state *)dev->private_data;
- struct virtio_queue * q = virtio->cur_queue;
+static int handle_kick(struct guest_info * core, struct virtio_sym_state * sym_state) {
+ struct virtio_queue * q = sym_state->cur_queue;
return -1;
- PrintDebug("VIRTIO Symbiotic KICK: cur_index=%d (mod=%d), avail_index=%d\n",
+ PrintDebug(core->vm_info, core, "VIRTIO Symbiotic KICK: cur_index=%d (mod=%d), avail_index=%d\n",
q->cur_avail_idx, q->cur_avail_idx % QUEUE_SIZE, q->avail->index);
while (q->cur_avail_idx < q->avail->index) {
uint32_t req_len = 0;
- PrintDebug("Descriptor Count=%d, index=%d\n", desc_cnt, q->cur_avail_idx % QUEUE_SIZE);
+ PrintDebug(core->vm_info, core, "Descriptor Count=%d, index=%d\n", desc_cnt, q->cur_avail_idx % QUEUE_SIZE);
for (i = 0; i < desc_cnt; i++) {
addr_t page_addr;
tmp_desc = &(q->desc[desc_idx]);
- PrintDebug("Header Descriptor (ptr=%p) gpa=%p, len=%d, flags=%x, next=%d\n", tmp_desc,
- (void *)(tmp_desc->addr_gpa), tmp_desc->length,
+ PrintDebug(core->vm_info, core, "Header Descriptor (ptr=%p) gpa=%p, len=%d, flags=%x, next=%d\n",
+ tmp_desc,
+ (void *)(addr_t)(tmp_desc->addr_gpa), tmp_desc->length,
tmp_desc->flags, tmp_desc->next);
- if (guest_pa_to_host_va(dev->vm, tmp_desc->addr_gpa, (addr_t *)&(page_addr)) == -1) {
- PrintError("Could not translate block header address\n");
+ if (v3_gpa_to_hva(core, tmp_desc->addr_gpa, (addr_t *)&(page_addr)) == -1) {
+ PrintError(core->vm_info, core, "Could not translate block header address\n");
return -1;
}
/*
if (handle_sym_op(dev, tmp_desc, buf_desc, status_desc) == -1) {
- PrintError("Error handling symbiotic operation\n");
+ PrintError(core->vm_info, core, "Error handling symbiotic operation\n");
return -1;
}
*/
- PrintDebug("Symbiotic Device Currently Ignored\n");
+ PrintDebug(core->vm_info, core, "Symbiotic Device Currently Ignored\n");
req_len += tmp_desc->length;
}
if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) {
- PrintDebug("Raising IRQ %d\n", virtio->pci_dev->config_header.intr_line);
- v3_pci_raise_irq(virtio->pci_bus, 0, virtio->pci_dev);
- virtio->virtio_cfg.pci_isr = VIRTIO_ISR_ACTIVE;
+ PrintDebug(core->vm_info, core, "Raising IRQ %d\n", sym_state->pci_dev->config_header.intr_line);
+ v3_pci_raise_irq(sym_state->pci_bus, sym_state->pci_dev, 0);
+ sym_state->virtio_cfg.pci_isr = VIRTIO_ISR_ACTIVE;
}
return 0;
}
-static int virtio_io_write(uint16_t port, void * src, uint_t length, struct vm_device * dev) {
- struct virtio_sym_state * virtio = (struct virtio_sym_state *)dev->private_data;
- int port_idx = port % virtio->io_range_size;
+static int virtio_io_write(struct guest_info * core, uint16_t port, void * src, uint_t length, void * private_data) {
+ struct virtio_sym_state * sym_state = (struct virtio_sym_state *)private_data;
+ int port_idx = port % sym_state->io_range_size;
- PrintDebug("VIRTIO SYMBIOTIC Write for port %d (index=%d) len=%d, value=%x\n",
+/*
+ PrintDebug(core->vm_info, core, "VIRTIO SYMBIOTIC Write for port %d (index=%d) len=%d, value=%x\n",
port, port_idx, length, *(uint32_t *)src);
-
+*/
switch (port_idx) {
case GUEST_FEATURES_PORT:
if (length != 4) {
- PrintError("Illegal write length for guest features\n");
+ PrintError(core->vm_info, core, "Illegal write length for guest features\n");
return -1;
}
- virtio->virtio_cfg.guest_features = *(uint32_t *)src;
+ sym_state->virtio_cfg.guest_features = *(uint32_t *)src;
break;
case VRING_PG_NUM_PORT:
addr_t page_addr = (pfn << VIRTIO_PAGE_SHIFT);
- virtio->cur_queue->pfn = pfn;
+ sym_state->cur_queue->pfn = pfn;
- virtio->cur_queue->ring_desc_addr = page_addr ;
- virtio->cur_queue->ring_avail_addr = page_addr + (QUEUE_SIZE * sizeof(struct vring_desc));
- virtio->cur_queue->ring_used_addr = ( virtio->cur_queue->ring_avail_addr + \
+ sym_state->cur_queue->ring_desc_addr = page_addr ;
+ sym_state->cur_queue->ring_avail_addr = page_addr + (QUEUE_SIZE * sizeof(struct vring_desc));
+ sym_state->cur_queue->ring_used_addr = ( sym_state->cur_queue->ring_avail_addr + \
sizeof(struct vring_avail) + \
(QUEUE_SIZE * sizeof(uint16_t)));
// round up to next page boundary.
- virtio->cur_queue->ring_used_addr = (virtio->cur_queue->ring_used_addr + 0xfff) & ~0xfff;
+ sym_state->cur_queue->ring_used_addr = (sym_state->cur_queue->ring_used_addr + 0xfff) & ~0xfff;
- if (guest_pa_to_host_va(dev->vm, virtio->cur_queue->ring_desc_addr, (addr_t *)&(virtio->cur_queue->desc)) == -1) {
- PrintError("Could not translate ring descriptor address\n");
+ if (v3_gpa_to_hva(core, sym_state->cur_queue->ring_desc_addr, (addr_t *)&(sym_state->cur_queue->desc)) == -1) {
+ PrintError(core->vm_info, core, "Could not translate ring descriptor address\n");
return -1;
}
- if (guest_pa_to_host_va(dev->vm, virtio->cur_queue->ring_avail_addr, (addr_t *)&(virtio->cur_queue->avail)) == -1) {
- PrintError("Could not translate ring available address\n");
+ if (v3_gpa_to_hva(core, sym_state->cur_queue->ring_avail_addr, (addr_t *)&(sym_state->cur_queue->avail)) == -1) {
+ PrintError(core->vm_info, core, "Could not translate ring available address\n");
return -1;
}
- if (guest_pa_to_host_va(dev->vm, virtio->cur_queue->ring_used_addr, (addr_t *)&(virtio->cur_queue->used)) == -1) {
- PrintError("Could not translate ring used address\n");
+ if (v3_gpa_to_hva(core, sym_state->cur_queue->ring_used_addr, (addr_t *)&(sym_state->cur_queue->used)) == -1) {
+ PrintError(core->vm_info, core, "Could not translate ring used address\n");
return -1;
}
- PrintDebug("RingDesc_addr=%p, Avail_addr=%p, Used_addr=%p\n",
- (void *)(virtio->cur_queue->ring_desc_addr),
- (void *)(virtio->cur_queue->ring_avail_addr),
- (void *)(virtio->cur_queue->ring_used_addr));
+ PrintDebug(core->vm_info, core, "RingDesc_addr=%p, Avail_addr=%p, Used_addr=%p\n",
+ (void *)(sym_state->cur_queue->ring_desc_addr),
+ (void *)(sym_state->cur_queue->ring_avail_addr),
+ (void *)(sym_state->cur_queue->ring_used_addr));
- PrintDebug("RingDesc=%p, Avail=%p, Used=%p\n",
- virtio->cur_queue->desc, virtio->cur_queue->avail, virtio->cur_queue->used);
+ PrintDebug(core->vm_info, core, "RingDesc=%p, Avail=%p, Used=%p\n",
+ sym_state->cur_queue->desc, sym_state->cur_queue->avail, sym_state->cur_queue->used);
} else {
- PrintError("Illegal write length for page frame number\n");
+ PrintError(core->vm_info, core, "Illegal write length for page frame number\n");
return -1;
}
break;
case VRING_Q_SEL_PORT:
- virtio->virtio_cfg.vring_queue_selector = *(uint16_t *)src;
+ sym_state->virtio_cfg.vring_queue_selector = *(uint16_t *)src;
- if (virtio->virtio_cfg.vring_queue_selector > 0) {
- PrintError("Virtio Symbiotic device has not qeueues. Selected %d\n",
- virtio->virtio_cfg.vring_queue_selector);
+ if (sym_state->virtio_cfg.vring_queue_selector > 0) {
+ PrintError(core->vm_info, core, "Virtio Symbiotic device has not qeueues. Selected %d\n",
+ sym_state->virtio_cfg.vring_queue_selector);
return -1;
}
- virtio->cur_queue = &(virtio->queue[virtio->virtio_cfg.vring_queue_selector]);
+ sym_state->cur_queue = &(sym_state->queue[sym_state->virtio_cfg.vring_queue_selector]);
break;
case VRING_Q_NOTIFY_PORT:
- PrintDebug("Handling Kick\n");
- if (handle_kick(dev) == -1) {
- PrintError("Could not handle Symbiotic Notification\n");
+ PrintDebug(core->vm_info, core, "Handling Kick\n");
+ if (handle_kick(core, sym_state) == -1) {
+ PrintError(core->vm_info, core, "Could not handle Symbiotic Notification\n");
return -1;
}
break;
case VIRTIO_STATUS_PORT:
- virtio->virtio_cfg.status = *(uint8_t *)src;
+ sym_state->virtio_cfg.status = *(uint8_t *)src;
- if (virtio->virtio_cfg.status == 0) {
- PrintDebug("Resetting device\n");
- virtio_reset(dev);
+ if (sym_state->virtio_cfg.status == 0) {
+ PrintDebug(core->vm_info, core, "Resetting device\n");
+ virtio_reset(sym_state);
}
break;
case VIRTIO_ISR_PORT:
- virtio->virtio_cfg.pci_isr = *(uint8_t *)src;
+ sym_state->virtio_cfg.pci_isr = *(uint8_t *)src;
break;
default:
return -1;
}
-static int virtio_io_read(uint16_t port, void * dst, uint_t length, struct vm_device * dev) {
- struct virtio_sym_state * virtio = (struct virtio_sym_state *)dev->private_data;
- int port_idx = port % virtio->io_range_size;
+static int virtio_io_read(struct guest_info * core, uint16_t port, void * dst, uint_t length, void * private_data) {
+ struct virtio_sym_state * sym_state = (struct virtio_sym_state *)private_data;
+ int port_idx = port % sym_state->io_range_size;
- PrintDebug("VIRTIO SYMBIOTIC Read for port %d (index =%d), length=%d\n",
+/*
+ PrintDebug(core->vm_info, core, "VIRTIO SYMBIOTIC Read for port %d (index =%d), length=%d\n",
port, port_idx, length);
-
+*/
switch (port_idx) {
case HOST_FEATURES_PORT:
if (length != 4) {
- PrintError("Illegal read length for host features\n");
+ PrintError(core->vm_info, core, "Illegal read length for host features\n");
return -1;
}
- *(uint32_t *)dst = virtio->virtio_cfg.host_features;
+ *(uint32_t *)dst = sym_state->virtio_cfg.host_features;
break;
case VRING_PG_NUM_PORT:
if (length != 4) {
- PrintError("Illegal read length for page frame number\n");
+ PrintError(core->vm_info, core, "Illegal read length for page frame number\n");
return -1;
}
- *(uint32_t *)dst = virtio->cur_queue->pfn;
+ *(uint32_t *)dst = sym_state->cur_queue->pfn;
break;
case VRING_SIZE_PORT:
if (length != 2) {
- PrintError("Illegal read length for vring size\n");
+ PrintError(core->vm_info, core, "Illegal read length for vring size\n");
return -1;
}
- *(uint16_t *)dst = virtio->cur_queue->queue_size;
+ *(uint16_t *)dst = sym_state->cur_queue->queue_size;
break;
case VIRTIO_STATUS_PORT:
if (length != 1) {
- PrintError("Illegal read length for status\n");
+ PrintError(core->vm_info, core, "Illegal read length for status\n");
return -1;
}
- *(uint8_t *)dst = virtio->virtio_cfg.status;
+ *(uint8_t *)dst = sym_state->virtio_cfg.status;
break;
case VIRTIO_ISR_PORT:
- *(uint8_t *)dst = virtio->virtio_cfg.pci_isr;
- virtio->virtio_cfg.pci_isr = 0;
- v3_pci_lower_irq(virtio->pci_bus, 0, virtio->pci_dev);
+ *(uint8_t *)dst = sym_state->virtio_cfg.pci_isr;
+ sym_state->virtio_cfg.pci_isr = 0;
+ v3_pci_lower_irq(sym_state->pci_bus, sym_state->pci_dev, 0);
break;
default:
if ( (port_idx >= sizeof(struct virtio_config)) &&
(port_idx < (sizeof(struct virtio_config) + sizeof(struct sym_config))) ) {
int cfg_offset = port_idx - sizeof(struct virtio_config);
- uint8_t * cfg_ptr = (uint8_t *)&(virtio->sym_cfg);
+ uint8_t * cfg_ptr = (uint8_t *)&(sym_state->sym_cfg);
memcpy(dst, cfg_ptr + cfg_offset, length);
} else {
- PrintError("Read of Unhandled Virtio Read\n");
+ PrintError(core->vm_info, core, "Read of Unhandled Virtio Read\n");
return -1;
}
}
+int virtio_free(struct virtio_sym_state * virtio_state) {
+
+ // unregister from PCI
+
+ V3_Free(virtio_state);
+ return 0;
+}
static struct v3_device_ops dev_ops = {
- .free = NULL,
- .reset = NULL,
- .start = NULL,
- .stop = NULL,
+ .free = (int (*)(void *))virtio_free,
};
-static int virtio_init(struct guest_info * vm, void * cfg_data) {
- struct vm_device * pci_bus = v3_find_dev(vm, (char *)cfg_data);
+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_sym_state * virtio_state = NULL;
struct pci_device * pci_dev = NULL;
+ char * dev_id = v3_cfg_val(cfg, "ID");
- PrintDebug("Initializing VIRTIO Symbiotic device\n");
+ PrintDebug(vm, VCORE_NONE, "Initializing VIRTIO Symbiotic device\n");
if (pci_bus == NULL) {
- PrintError("VirtIO devices require a PCI Bus");
+ PrintError(vm, VCORE_NONE, "VirtIO devices require a PCI Bus");
return -1;
}
virtio_state = (struct virtio_sym_state *)V3_Malloc(sizeof(struct virtio_sym_state));
+
+ if (!virtio_state) {
+ PrintError(vm, VCORE_NONE, "Cannot allocate in init\n");
+ return -1;
+ }
+
memset(virtio_state, 0, sizeof(struct virtio_sym_state));
- struct vm_device * dev = v3_allocate_device("LNX_VIRTIO_SYM", &dev_ops, virtio_state);
- if (v3_attach_device(vm, dev) == -1) {
- PrintError("Could not attach device %s\n", "LNX_VIRTIO_SYM");
+ struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, virtio_state);
+
+ if (dev == NULL) {
+ PrintError(vm, VCORE_NONE, "Could not attach device %s\n", dev_id);
+ V3_Free(virtio_state);
return -1;
}
bars[0].io_read = virtio_io_read;
bars[0].io_write = virtio_io_write;
+ bars[0].private_data = virtio_state;
pci_dev = v3_pci_register_device(pci_bus, PCI_STD_DEVICE,
0, PCI_AUTO_DEV_NUM, 0,
"LNX_VIRTIO_SYM", bars,
- NULL, NULL, NULL, dev);
+ NULL, NULL, NULL, NULL, virtio_state);
if (!pci_dev) {
- PrintError("Could not register PCI Device\n");
+ PrintError(vm, VCORE_NONE, "Could not register PCI Device\n");
+ v3_remove_device(dev);
return -1;
}
virtio_state->pci_bus = pci_bus;
}
- virtio_reset(dev);
+ virtio_reset(virtio_state);
return 0;
