X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Flnx_virtio_symmod.c;h=993dcb6727a95b8052926327fec7efb728cc1551;hb=e1736715107efcc3afbdd93347bd8a7d86d995b9;hp=fb2984b664ca9e7e2f8f301089a1095402a97a52;hpb=13d9a33d365278c508b8709288f9c7c2949a50f9;p=palacios.git diff --git a/palacios/src/devices/lnx_virtio_symmod.c b/palacios/src/devices/lnx_virtio_symmod.c index fb2984b..993dcb6 100644 --- a/palacios/src/devices/lnx_virtio_symmod.c +++ b/palacios/src/devices/lnx_virtio_symmod.c @@ -153,11 +153,11 @@ static int handle_xfer_kick(struct guest_info * core, struct virtio_sym_state * cmd_desc = &(q->desc[desc_idx]); - if (guest_pa_to_host_va(core, cmd_desc->addr_gpa, (addr_t *)&cmd) == -1) { + if (v3_gpa_to_hva(core, cmd_desc->addr_gpa, (addr_t *)&cmd) == -1) { PrintError("Could not translate SYMMOD header address\n"); return -1; } - + desc_idx = cmd_desc->next; if (cmd->cmd == CMD_LOAD) { @@ -177,7 +177,7 @@ static int handle_xfer_kick(struct guest_info * core, struct virtio_sym_state * name_desc = &(q->desc[desc_idx]); - if (guest_pa_to_host_va(core, name_desc->addr_gpa, (addr_t *)&name) == -1) { + if (v3_gpa_to_hva(core, name_desc->addr_gpa, (addr_t *)&name) == -1) { PrintError("Could not translate SYMMOD header address\n"); return -1; } @@ -192,7 +192,7 @@ static int handle_xfer_kick(struct guest_info * core, struct virtio_sym_state * buf_desc = &(q->desc[desc_idx]); - if (guest_pa_to_host_va(core, buf_desc->addr_gpa, (addr_t *)&(buf)) == -1) { + if (v3_gpa_to_hva(core, buf_desc->addr_gpa, (addr_t *)&(buf)) == -1) { PrintError("Could not translate buffer address\n"); return -1; } @@ -218,7 +218,7 @@ static int handle_xfer_kick(struct guest_info * core, struct virtio_sym_state * status_desc = &(q->desc[desc_idx]); - if (guest_pa_to_host_va(core, status_desc->addr_gpa, (addr_t *)&status_ptr) == -1) { + if (v3_gpa_to_hva(core, status_desc->addr_gpa, (addr_t *)&status_ptr) == -1) { PrintError("SYMMOD Error could not translate status address\n"); return -1; } @@ -283,7 +283,7 @@ static int handle_notification_kick(struct guest_info * core, struct virtio_sym_ hdr_desc = &(q->desc[desc_idx]); - if (guest_pa_to_host_va(core, hdr_desc->addr_gpa, (addr_t *)&hdr) == -1) { + if (v3_gpa_to_hva(core, hdr_desc->addr_gpa, (addr_t *)&hdr) == -1) { PrintError("Could not translate SYMMOD header address\n"); return -1; } @@ -352,19 +352,19 @@ static int virtio_io_write(struct guest_info * core, uint16_t port, void * src, // round up to next page boundary. sym_state->cur_queue->ring_used_addr = (sym_state->cur_queue->ring_used_addr + 0xfff) & ~0xfff; - if (guest_pa_to_host_va(core, sym_state->cur_queue->ring_desc_addr, (addr_t *)&(sym_state->cur_queue->desc)) == -1) { + if (v3_gpa_to_hva(core, sym_state->cur_queue->ring_desc_addr, (addr_t *)&(sym_state->cur_queue->desc)) == -1) { PrintError("Could not translate ring descriptor address\n"); return -1; } - if (guest_pa_to_host_va(core, sym_state->cur_queue->ring_avail_addr, (addr_t *)&(sym_state->cur_queue->avail)) == -1) { + if (v3_gpa_to_hva(core, sym_state->cur_queue->ring_avail_addr, (addr_t *)&(sym_state->cur_queue->avail)) == -1) { PrintError("Could not translate ring available address\n"); return -1; } - if (guest_pa_to_host_va(core, sym_state->cur_queue->ring_used_addr, (addr_t *)&(sym_state->cur_queue->used)) == -1) { + if (v3_gpa_to_hva(core, sym_state->cur_queue->ring_used_addr, (addr_t *)&(sym_state->cur_queue->used)) == -1) { PrintError("Could not translate ring used address\n"); return -1; } @@ -547,10 +547,12 @@ static int virtio_load_capsule(struct v3_vm_info * vm, struct v3_sym_capsule * m notifier_desc = &(q->desc[notifier_idx]); - PrintDebug("SYMMOD: Notifier Descriptor (ptr=%p) gpa=%p, len=%d, flags=%x, next=%d\n", notifier_desc, - (void *)(notifier_desc->addr_gpa), notifier_desc->length, notifier_desc->flags, notifier_desc->next); + PrintDebug("SYMMOD: Notifier Descriptor (ptr=%p) gpa=%p, len=%d, flags=%x, next=%d\n", + notifier_desc, (void *)(addr_t)(notifier_desc->addr_gpa), + notifier_desc->length, notifier_desc->flags, + notifier_desc->next); - if (guest_pa_to_host_va(&(vm->cores[0]), notifier_desc->addr_gpa, (addr_t *)&(notifier)) == -1) { + if (v3_gpa_to_hva(&(vm->cores[0]), notifier_desc->addr_gpa, (addr_t *)&(notifier)) == -1) { PrintError("Could not translate receive buffer address\n"); return -1; } @@ -586,13 +588,16 @@ static int virtio_load_capsule(struct v3_vm_info * vm, struct v3_sym_capsule * m } +static 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, }; @@ -607,7 +612,7 @@ static int virtio_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { struct virtio_sym_state * virtio_state = NULL; struct v3_symmod_state * symmod_state = &(vm->sym_vm_state.symmod_state); struct pci_device * pci_dev = NULL; - char * name = v3_cfg_val(cfg, "name"); + char * dev_id = v3_cfg_val(cfg, "ID"); PrintDebug("SYMMOD: Initializing VIRTIO Symbiotic Module device\n"); @@ -625,10 +630,11 @@ static int virtio_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { - struct vm_device * dev = v3_allocate_device(name, &dev_ops, virtio_state); + struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, virtio_state); - if (v3_attach_device(vm, dev) == -1) { - PrintError("Could not attach device %s\n", name); + if (dev == NULL) { + PrintError("Could not attach device %s\n", dev_id); + V3_Free(virtio_state); return -1; } @@ -675,6 +681,7 @@ static int virtio_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { if (!pci_dev) { PrintError("Could not register PCI Device\n"); + v3_remove_device(dev); return -1; } @@ -699,7 +706,6 @@ static int virtio_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { } - V3_Print("SYMMOD: %d available sym modules\n", virtio_state->sym_cfg.avail_mods); virtio_reset(virtio_state);