diff options
author | Avi Kivity <avi@redhat.com> | 2011-08-08 16:09:31 +0300 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-08 10:22:30 -0500 |
commit | e824b2cc3b4f6fbcbaa254abd8db55d2fbe8d19e (patch) | |
tree | 72d1a08845c780d6a82cea88f3dd6ea2e5ca7e2e /hw/ivshmem.c | |
parent | 50181f10dae755aad2b4f4f486d18e48dd66ea37 (diff) |
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/ivshmem.c')
-rw-r--r-- | hw/ivshmem.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/hw/ivshmem.c b/hw/ivshmem.c index bacba604d7..42a5877032 100644 --- a/hw/ivshmem.c +++ b/hw/ivshmem.c @@ -336,7 +336,7 @@ static void create_shared_memory_BAR(IVShmemState *s, int fd) { memory_region_add_subregion(&s->bar, 0, &s->ivshmem); /* region for shared memory */ - pci_register_bar_region(&s->dev, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->bar); + pci_register_bar(&s->dev, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->bar); } static void close_guest_eventfds(IVShmemState *s, int posn) @@ -543,9 +543,8 @@ static void ivshmem_setup_msi(IVShmemState * s) { memory_region_init(&s->msix_bar, "ivshmem-msix", 4096); if (!msix_init(&s->dev, s->vectors, &s->msix_bar, 1, 0)) { - pci_register_bar_region(&s->dev, 1, - PCI_BASE_ADDRESS_SPACE_MEMORY, - &s->msix_bar); + pci_register_bar(&s->dev, 1, PCI_BASE_ADDRESS_SPACE_MEMORY, + &s->msix_bar); IVSHMEM_DPRINTF("msix initialized (%d vectors)\n", s->vectors); } else { IVSHMEM_DPRINTF("msix initialization failed\n"); @@ -665,8 +664,8 @@ static int pci_ivshmem_init(PCIDevice *dev) } /* region for registers*/ - pci_register_bar_region(&s->dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, - &s->ivshmem_mmio); + pci_register_bar(&s->dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, + &s->ivshmem_mmio); memory_region_init(&s->bar, "ivshmem-bar2-container", s->ivshmem_size); @@ -694,8 +693,8 @@ static int pci_ivshmem_init(PCIDevice *dev) /* allocate/initialize space for interrupt handling */ s->peers = qemu_mallocz(s->nb_peers * sizeof(Peer)); - pci_register_bar_region(&s->dev, 2, - PCI_BASE_ADDRESS_SPACE_MEMORY, &s->ivshmem); + pci_register_bar(&s->dev, 2, + PCI_BASE_ADDRESS_SPACE_MEMORY, &s->ivshmem); s->eventfd_chr = qemu_mallocz(s->vectors * sizeof(CharDriverState *)); |