diff options
| author | Avi Kivity | 2011-08-08 15:09:31 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2011-08-08 17:22:30 +0200 |
| commit | e824b2cc3b4f6fbcbaa254abd8db55d2fbe8d19e (patch) | |
| tree | 72d1a08845c780d6a82cea88f3dd6ea2e5ca7e2e /hw/ide | |
| parent | pci: fold BAR mapping function into its caller (diff) | |
| download | qemu-e824b2cc3b4f6fbcbaa254abd8db55d2fbe8d19e.tar.gz qemu-e824b2cc3b4f6fbcbaa254abd8db55d2fbe8d19e.tar.xz qemu-e824b2cc3b4f6fbcbaa254abd8db55d2fbe8d19e.zip | |
pci: rename pci_register_bar_region() to pci_register_bar()
Reviewed-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/ide')
| -rw-r--r-- | hw/ide/cmd646.c | 14 | ||||
| -rw-r--r-- | hw/ide/ich.c | 2 | ||||
| -rw-r--r-- | hw/ide/piix.c | 3 | ||||
| -rw-r--r-- | hw/ide/via.c | 3 |
4 files changed, 8 insertions, 14 deletions
diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 13e6f2ff91..4d91e2c642 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -270,16 +270,12 @@ static int pci_cmd646_ide_initfn(PCIDevice *dev) setup_cmd646_bar(d, 0); setup_cmd646_bar(d, 1); - pci_register_bar_region(dev, 0, PCI_BASE_ADDRESS_SPACE_IO, - &d->cmd646_bar[0].data); - pci_register_bar_region(dev, 1, PCI_BASE_ADDRESS_SPACE_IO, - &d->cmd646_bar[0].cmd); - pci_register_bar_region(dev, 2, PCI_BASE_ADDRESS_SPACE_IO, - &d->cmd646_bar[1].data); - pci_register_bar_region(dev, 3, PCI_BASE_ADDRESS_SPACE_IO, - &d->cmd646_bar[1].cmd); + pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &d->cmd646_bar[0].data); + pci_register_bar(dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &d->cmd646_bar[0].cmd); + pci_register_bar(dev, 2, PCI_BASE_ADDRESS_SPACE_IO, &d->cmd646_bar[1].data); + pci_register_bar(dev, 3, PCI_BASE_ADDRESS_SPACE_IO, &d->cmd646_bar[1].cmd); bmdma_setup_bar(d); - pci_register_bar_region(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar); + pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar); /* TODO: RST# value should be 0 */ pci_conf[PCI_INTERRUPT_PIN] = 0x01; // interrupt on pin 1 diff --git a/hw/ide/ich.c b/hw/ide/ich.c index 698b5f60bd..5278bc4d6c 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -98,7 +98,7 @@ static int pci_ich9_ahci_init(PCIDevice *dev) msi_init(dev, 0x50, 1, true, false); d->ahci.irq = d->card.irq[0]; - pci_register_bar_region(&d->card, 5, 0, &d->ahci.mem); + pci_register_bar(&d->card, 5, 0, &d->ahci.mem); return 0; } diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 5aa0a30365..8525336075 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -155,8 +155,7 @@ static int pci_piix_ide_initfn(PCIDevice *dev) qemu_register_reset(piix3_reset, d); bmdma_setup_bar(d); - pci_register_bar_region(&d->dev, 4, PCI_BASE_ADDRESS_SPACE_IO, - &d->bmdma_bar); + pci_register_bar(&d->dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar); vmstate_register(&d->dev.qdev, 0, &vmstate_ide_pci, d); diff --git a/hw/ide/via.c b/hw/ide/via.c index eb6a4095a3..c0b9d43827 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -180,8 +180,7 @@ static int vt82c686b_ide_initfn(PCIDevice *dev) qemu_register_reset(via_reset, d); bmdma_setup_bar(d); - pci_register_bar_region(&d->dev, 4, PCI_BASE_ADDRESS_SPACE_IO, - &d->bmdma_bar); + pci_register_bar(&d->dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar); vmstate_register(&dev->qdev, 0, &vmstate_ide_pci, d); |