reworked PCI bus implmentation -- moved to mask based implementation -- added capabil...

[palacios.git] / palacios / src / devices / lnx_virtio_symmod.c

diff --git a/palacios/src/devices/lnx_virtio_symmod.c b/palacios/src/devices/lnx_virtio_symmod.c
index 4e55c79..d8172df 100644 (file)
--- a/palacios/src/devices/lnx_virtio_symmod.c
+++ b/palacios/src/devices/lnx_virtio_symmod.c
@@ -238,7 +238,7 @@ static int handle_xfer_kick(struct guest_info * core, struct virtio_sym_state *
 
     if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) {
        PrintDebug("Raising IRQ %d\n",  sym_state->pci_dev->config_header.intr_line);
-       v3_pci_raise_irq(sym_state->pci_bus, 0, sym_state->pci_dev);
+       v3_pci_raise_irq(sym_state->pci_bus, sym_state->pci_dev, 0);
        sym_state->virtio_cfg.pci_isr = 1;
     }
 
@@ -307,7 +307,7 @@ static int handle_notification_kick(struct guest_info * core, struct virtio_sym_
 
     if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) {
        PrintDebug("Raising IRQ %d\n",  sym_state->pci_dev->config_header.intr_line);
-       v3_pci_raise_irq(sym_state->pci_bus, 0, sym_state->pci_dev);
+       v3_pci_raise_irq(sym_state->pci_bus, sym_state->pci_dev, 0);
        sym_state->virtio_cfg.pci_isr = 1;
     }
 
@@ -491,7 +491,7 @@ static int virtio_io_read(struct guest_info * core, uint16_t port, void * dst, u
        case VIRTIO_ISR_PORT:
            *(uint8_t *)dst = sym_state->virtio_cfg.pci_isr;
            sym_state->virtio_cfg.pci_isr = 0;
-           v3_pci_lower_irq(sym_state->pci_bus, 0, sym_state->pci_dev);
+           v3_pci_lower_irq(sym_state->pci_bus, sym_state->pci_dev, 0);
            break;
 
        default:
@@ -547,8 +547,10 @@ 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 (v3_gpa_to_hva(&(vm->cores[0]), notifier_desc->addr_gpa, (addr_t *)&(notifier)) == -1) {
            PrintError("Could not translate receive buffer address\n");
@@ -577,7 +579,7 @@ static int virtio_load_capsule(struct v3_vm_info * vm, struct v3_sym_capsule * m
 
     if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) {
        PrintDebug("SYMMOD: Raising IRQ %d\n",  virtio->pci_dev->config_header.intr_line);
-       v3_pci_raise_irq(virtio->pci_bus, 0, virtio->pci_dev);
+       v3_pci_raise_irq(virtio->pci_bus, virtio->pci_dev, 0);
        virtio->virtio_cfg.pci_isr = 0x1;
     }
 
@@ -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,
 };
 
 
@@ -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(dev_id, &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) {
+    if (dev == NULL) {
        PrintError("Could not attach device %s\n", dev_id);
+       V3_Free(virtio_state);
        return -1;
     }
 
@@ -671,10 +677,11 @@ static int virtio_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
        pci_dev = v3_pci_register_device(pci_bus, PCI_STD_DEVICE, 
                                         0, PCI_AUTO_DEV_NUM, 0,
                                         "LNX_VIRTIO_SYMMOD", bars,
-                                        NULL, NULL, NULL, virtio_state);
+                                        NULL, NULL, NULL, NULL, virtio_state);
 
        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);