[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 13/18] hw/scsi/esp-pci.c: switch ESPState to use PCI device i
|
From: |
Mark Cave-Ayland |
|
Subject: |
[RFC PATCH 13/18] hw/scsi/esp-pci.c: switch ESPState to use PCI device input gpio |
|
Date: |
Thu, 11 May 2023 09:57:26 +0100 |
This replaces the call to pci_allocate_irq() and also allows the corresponding
qemu_free_irq() to be removed. Since esp_pci_scsi_exit() is now empty it can
also
be removed at the same time.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/scsi/esp-pci.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c
index 2f7f11e70b..9447e6c429 100644
--- a/hw/scsi/esp-pci.c
+++ b/hw/scsi/esp-pci.c
@@ -386,19 +386,11 @@ static void esp_pci_scsi_realize(PCIDevice *dev, Error
**errp)
"esp-io", 0x80);
pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &pci->io);
- s->irq = pci_allocate_irq(dev);
+ s->irq = qdev_get_gpio_in_named(DEVICE(dev), "pci-input-irq", 0);
scsi_bus_init(&s->bus, sizeof(s->bus), d, &esp_pci_scsi_info);
}
-static void esp_pci_scsi_exit(PCIDevice *d)
-{
- PCIESPState *pci = PCI_ESP(d);
- ESPState *s = ESP(&pci->esp);
-
- qemu_free_irq(s->irq);
-}
-
static void esp_pci_init(Object *obj)
{
PCIESPState *pci = PCI_ESP(obj);
@@ -412,7 +404,6 @@ static void esp_pci_class_init(ObjectClass *klass, void
*data)
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
k->realize = esp_pci_scsi_realize;
- k->exit = esp_pci_scsi_exit;
k->vendor_id = PCI_VENDOR_ID_AMD;
k->device_id = PCI_DEVICE_ID_AMD_SCSI;
k->revision = 0x10;
--
2.30.2
- Re: [RFC PATCH 03/18] hw/pci: use PCIDevice gpio for device IRQ, (continued)
- [RFC PATCH 02/18] hw/pci: introduce PCI bus input IRQs, Mark Cave-Ayland, 2023/05/11
- [RFC PATCH 05/18] hw/char/serial-pci.c: switch SerialState to use PCI device input gpio, Mark Cave-Ayland, 2023/05/11
- [RFC PATCH 06/18] hw/ide/ich.c: switch AHCIState to use PCI device input gpio, Mark Cave-Ayland, 2023/05/11
- [RFC PATCH 07/18] hw/net/can/can_mioe3680_pci.c: switch Mioe3680PCIState to use PCI device input gpio, Mark Cave-Ayland, 2023/05/11
- [RFC PATCH 08/18] hw/net/can/can_pcm3680_pci.c: switch SerialState to use PCI device input gpio, Mark Cave-Ayland, 2023/05/11
- [RFC PATCH 09/18] hw/net/can/ctucan_pci.c: switch CtuCanPCIState to use PCI device input gpio, Mark Cave-Ayland, 2023/05/11
- [RFC PATCH 10/18] hw/net/ne2000-pci.c: switch NE2000State to use PCI device input gpio, Mark Cave-Ayland, 2023/05/11
- [RFC PATCH 11/18] hw/net/pcnet-pci.c: switch PCIPCNetState to use PCI device input gpio, Mark Cave-Ayland, 2023/05/11
- [RFC PATCH 12/18] hw/net/tulip.c: switch TULIPState to use PCI device input gpio, Mark Cave-Ayland, 2023/05/11
- [RFC PATCH 13/18] hw/scsi/esp-pci.c: switch ESPState to use PCI device input gpio,
Mark Cave-Ayland <=
- [RFC PATCH 14/18] hw/sd/sdhci-pci.c: switch SDHCIState to use PCI device input gpio, Mark Cave-Ayland, 2023/05/11
- [RFC PATCH 15/18] hw/usb/hcd-ehci-pci.c: switch EHCIState to use PCI device input gpio, Mark Cave-Ayland, 2023/05/11
- [RFC PATCH 16/18] hw/usb/hcd-ohci-pci.c: switch OHCIState to use PCI device input gpio, Mark Cave-Ayland, 2023/05/11
- [RFC PATCH 17/18] hw/usb/hcd-uhci.c: switch UHCIState to use PCI device input gpio, Mark Cave-Ayland, 2023/05/11
- [RFC PATCH 18/18] hw/pci/pci.c: remove pci_allocate_irq(), Mark Cave-Ayland, 2023/05/11