[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 11/39] hw/pci: removed irq field from PCIDevice
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 11/39] hw/pci: removed irq field from PCIDevice |
Date: |
Tue, 15 Oct 2013 09:30:43 +0300 |
From: Marcel Apfelbaum <address@hidden>
Instead of exposing the the irq field,
pci wrappers to qemu_set_irq or qemu_irq_*
can be used.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
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
- [Qemu-devel] [PULL v2 00/39] pci, pc, acpi fixes, enhancements, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 01/39] memory: Change MemoryRegion priorities from unsigned to signed, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 02/39] docs/memory: Explictly state that MemoryRegion priority is signed, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 03/39] hw/pci: partially handle pci master abort, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 04/39] hw/core: Add interface to allocate and free a single IRQ, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 05/39] hw/pci: add pci wrappers for allocating and asserting irqs, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 06/39] hw/pci-bridge: set PCI_INTERRUPT_PIN register before shpc init, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 07/39] hw/vmxnet3: set interrupts using pci irq wrappers, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 08/39] hw/vfio: set interrupts using pci irq wrappers, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 10/39] hw/pcie: AER and hot-plug events must use device's interrupt, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 11/39] hw/pci: removed irq field from PCIDevice,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 09/39] hw: set interrupts using pci irq wrappers, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 12/39] cleanup object.h: include error.h directly, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 13/39] qom: cleanup struct Error references, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 14/39] qom: add pointer to int property helpers, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 15/39] pci: fix up w64 size calculation helper, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 16/39] fw_cfg: interface to trigger callback on read, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 17/39] loader: support for unmapped ROM blobs, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 18/39] pcie_host: expose UNMAPPED macro, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 19/39] pcie_host: expose address format, Michael S. Tsirkin, 2013/10/15
- [Qemu-devel] [PULL v2 20/39] q35: use macro for MCFG property name, Michael S. Tsirkin, 2013/10/15