From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47956) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VT5NU-0000ki-Ak for qemu-devel@nongnu.org; Mon, 07 Oct 2013 03:37:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VT5NN-00080B-Tn for qemu-devel@nongnu.org; Mon, 07 Oct 2013 03:37:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61736) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VT5NN-000801-L7 for qemu-devel@nongnu.org; Mon, 07 Oct 2013 03:37:09 -0400 From: Marcel Apfelbaum Date: Mon, 7 Oct 2013 10:36:41 +0300 Message-Id: <1381131401-15155-9-git-send-email-marcel.a@redhat.com> In-Reply-To: <1381131401-15155-1-git-send-email-marcel.a@redhat.com> References: <1381131401-15155-1-git-send-email-marcel.a@redhat.com> Subject: [Qemu-devel] [PATCH v3 8/8] hw/pci: removed irq field from PCIDevice List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, anthony@codemonkey.ws, mst@redhat.com, sw@weilnetz.de, jasowang@redhat.com, dkoch@verizon.com, keith.busch@intel.com, alex.williamson@redhat.com, kraxel@redhat.com, stefanha@redhat.com, dmitry@daynix.com, pbonzini@redhat.com, afaerber@suse.de, ehabkost@redhat.com Instead of exposing the the irq field, pci wrappers to qemu_set_irq or qemu_irq_* can be used. Signed-off-by: Marcel Apfelbaum --- 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 fbfd8f7..f8d0b81 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -863,14 +863,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 990342c..37ffa53 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; -- 1.8.3.1