diff options
| author | Marcel Apfelbaum <marcel.a@redhat.com> | 2013-10-07 10:36:39 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2013-10-14 17:11:45 +0300 |
| commit | 9e64f8a3fcc88a508990a62ecc5a1269e41272ad (patch) | |
| tree | cc9461940fb228d4b0e8cf9b945785b374a5da41 /hw/scsi/esp-pci.c | |
| parent | 68919cace8242363edfe8ff9b9c68b5e58c30db4 (diff) | |
hw: set interrupts using pci irq wrappers
pci_set_irq and the other pci irq wrappers use
PCI_INTERRUPT_PIN config register to compute device
INTx pin to assert/deassert.
An irq is allocated using pci_allocate_irq wrapper
only if is needed by non pci devices.
Removed irq related fields from state if not used anymore.
Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/scsi/esp-pci.c')
| -rw-r--r-- | hw/scsi/esp-pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c index 99bf8ec446..48c8b82350 100644 --- a/hw/scsi/esp-pci.c +++ b/hw/scsi/esp-pci.c @@ -361,7 +361,7 @@ static int esp_pci_scsi_init(PCIDevice *dev) "esp-io", 0x80); pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &pci->io); - s->irq = dev->irq[0]; + s->irq = pci_allocate_irq(dev); scsi_bus_new(&s->bus, sizeof(s->bus), d, &esp_pci_scsi_info, NULL); if (!d->hotplugged) { @@ -378,6 +378,7 @@ static void esp_pci_scsi_uninit(PCIDevice *d) { PCIESPState *pci = PCI_ESP(d); + qemu_free_irq(pci->esp.irq); memory_region_destroy(&pci->io); } |