From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52491) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VVy79-0007z6-Vh for qemu-devel@nongnu.org; Tue, 15 Oct 2013 02:28:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VVy73-0004zw-Pc for qemu-devel@nongnu.org; Tue, 15 Oct 2013 02:28:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50313) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VVy73-0004zg-HC for qemu-devel@nongnu.org; Tue, 15 Oct 2013 02:28:13 -0400 Date: Tue, 15 Oct 2013 09:30:43 +0300 From: "Michael S. Tsirkin" Message-ID: <1381818560-18367-12-git-send-email-mst@redhat.com> References: <1381818560-18367-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1381818560-18367-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v2 11/39] hw/pci: removed irq field from PCIDevice List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Anthony Liguori Cc: peter.maydell@linaro.org, imammedo@redhat.com, mst@redhat.com, kraxel@redhat.com, marcel.a@redhat.com From: Marcel Apfelbaum 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 --- include/hw/pci/pci.h | 3 --- hw/pci/pci.c | 2 -- 2 files changed, 5 deletions(-) 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; diff --git a/hw/pci/pci.c b/hw/pci/pci.c index ff4b697..ae23c58 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); -- MST