fixes for the virtio block device

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

diff --git a/palacios/src/devices/pci.c b/palacios/src/devices/pci.c
index 3a10e03..ab85aea 100644 (file)
--- a/palacios/src/devices/pci.c
+++ b/palacios/src/devices/pci.c
@@ -75,8 +75,8 @@ struct pci_bus {
     // Bitmap of the allocated device numbers
     uint8_t dev_map[MAX_BUS_DEVICES / 8];
 
-    int (*raise_pci_irq)(struct vm_device * dev, uint_t intr_pin);
-    int (*lower_pci_irq)(struct vm_device * dev, uint_t intr_pin);
+    int (*raise_pci_irq)(struct vm_device * dev, struct pci_device * pci_dev);
+    int (*lower_pci_irq)(struct vm_device * dev, struct pci_device * pci_dev);
     struct vm_device * irq_bridge_dev;
 };
 
@@ -706,8 +706,8 @@ static inline int init_bars(struct pci_device * pci_dev) {
 
 
 int v3_pci_set_irq_bridge(struct  vm_device * pci_bus, int bus_num, 
-                         int (*raise_pci_irq)(struct vm_device * dev, uint_t intr_line), 
-                         int (*lower_pci_irq)(struct vm_device * dev, uint_t intr_line), 
+                         int (*raise_pci_irq)(struct vm_device * dev, struct pci_device * pci_dev),
+                         int (*lower_pci_irq)(struct vm_device * dev, struct pci_device * pci_dev),
                          struct vm_device * bridge_dev) {
     struct pci_internal * pci_state = (struct pci_internal *)pci_bus->private_data;
 
@@ -723,14 +723,14 @@ int v3_pci_raise_irq(struct vm_device * pci_bus, int bus_num, struct pci_device
    struct pci_internal * pci_state = (struct pci_internal *)pci_bus->private_data;
    struct pci_bus * bus = &(pci_state->bus_list[bus_num]);
 
-   return bus->raise_pci_irq(bus->irq_bridge_dev, dev->config_header.intr_pin);
+   return bus->raise_pci_irq(bus->irq_bridge_dev, dev);
 }
 
 int v3_pci_lower_irq(struct vm_device * pci_bus, int bus_num, struct pci_device * dev) {
    struct pci_internal * pci_state = (struct pci_internal *)pci_bus->private_data;
    struct pci_bus * bus = &(pci_state->bus_list[bus_num]);
 
-   return bus->lower_pci_irq(bus->irq_bridge_dev, dev->config_header.intr_pin);
+   return bus->lower_pci_irq(bus->irq_bridge_dev, dev);
 }
 
 // if dev_num == -1, auto assign