From c31d04b516b183b02336f8cce65a41bd547f6f6b Mon Sep 17 00:00:00 2001 From: Marcel Apfelbaum Date: Mon, 7 Oct 2013 10:36:41 +0300 Subject: [PATCH] hw/pci: removed irq field from PCIDevice Instead of exposing the the irq field, pci wrappers to qemu_set_irq or qemu_irq_* can be used. Signed-off-by: Marcel Apfelbaum Signed-off-by: Michael S. Tsirkin --- hw/pci/pci.c | 2 -- include/hw/pci/pci.h | 3 --- 2 files changed, 5 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index ff4b697cce..ae23c58c14 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -889,14 +889,12 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, pci_dev->config_read = config_read; pci_dev->config_write = config_write; bus->devices[devfn] = pci_dev; - pci_dev->irq = qemu_allocate_irqs(pci_irq_handler, pci_dev, PCI_NUM_PINS); pci_dev->version_id = 2; /* Current pci device vmstate version */ return pci_dev; } static void do_pci_unregister_device(PCIDevice *pci_dev) { - qemu_free_irqs(pci_dev->irq); pci_dev->bus->devices[pci_dev->devfn] = NULL; pci_config_free(pci_dev); diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 990342c53d..37ffa53119 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -247,9 +247,6 @@ struct PCIDevice { PCIConfigReadFunc *config_read; PCIConfigWriteFunc *config_write; - /* IRQ objects for the INTA-INTD pins. */ - qemu_irq *irq; - /* Legacy PCI VGA regions */ MemoryRegion *vga_regions[QEMU_PCI_VGA_NUM_REGIONS]; bool has_vga;