OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/pci: removed irq field from PCIDevice

Browse Source 
Instead of exposing the the irq field,
pci wrappers to qemu_set_irq or qemu_irq_*
can be used.

Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Marcel Apfelbaum 2013-10-07 10:36:41 +03:00 committed by Michael S. Tsirkin
parent 5a03e708f2
commit c31d04b516
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/pci/pci.c
View File

@ -889,14 +889,12 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus,
pci_dev->config_read = config_read; pci_dev->config_read = config_read;
pci_dev->config_write = config_write; pci_dev->config_write = config_write;
bus->devices[devfn] = pci_dev; 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 */ pci_dev->version_id = 2; /* Current pci device vmstate version */
return pci_dev; return pci_dev;
} }
static void do_pci_unregister_device(PCIDevice *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_dev->bus->devices[pci_dev->devfn] = NULL;
pci_config_free(pci_dev); pci_config_free(pci_dev);

3
include/hw/pci/pci.h
View File

@ -247,9 +247,6 @@ struct PCIDevice {
PCIConfigReadFunc *config_read; PCIConfigReadFunc *config_read;
PCIConfigWriteFunc *config_write; PCIConfigWriteFunc *config_write;
/* IRQ objects for the INTA-INTD pins. */
qemu_irq *irq;
/* Legacy PCI VGA regions */ /* Legacy PCI VGA regions */
MemoryRegion *vga_regions[QEMU_PCI_VGA_NUM_REGIONS]; MemoryRegion *vga_regions[QEMU_PCI_VGA_NUM_REGIONS];
bool has_vga; bool has_vga;