From: Avi Kivity <avi@redhat.com> To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org Subject: [RFC v3 55/56] pci: fold BAR mapping function into its caller Date: Sun, 10 Jul 2011 21:15:08 +0300 [thread overview] Message-ID: <1310321709-30770-56-git-send-email-avi@redhat.com> (raw) In-Reply-To: <1310321709-30770-1-git-send-email-avi@redhat.com> There is only one function, so no need for a function pointer. Signed-off-by: Avi Kivity <avi@redhat.com> --- hw/pci.c | 25 +++++++++---------------- hw/pci.h | 1 - 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 2543ced..04b6372 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -881,18 +881,6 @@ static int pci_unregister_device(DeviceState *dev) return 0; } -static void pci_simple_bar_mapfunc_region(PCIDevice *pci_dev, int region_num, - pcibus_t addr, pcibus_t size, - int type) -{ - PCIIORegion *r = &pci_dev->io_regions[region_num]; - - memory_region_add_subregion_overlap(r->address_space, - addr, - r->memory, - 1); -} - void pci_register_bar_region(PCIDevice *pci_dev, int region_num, uint8_t type, MemoryRegion *memory) { @@ -914,7 +902,6 @@ void pci_register_bar_region(PCIDevice *pci_dev, int region_num, r->size = size; r->filtered_size = size; r->type = type; - r->map_func = pci_simple_bar_mapfunc_region; r->ram_addr = IO_MEM_UNASSIGNED; r->memory = NULL; @@ -1103,10 +1090,16 @@ static void pci_update_mappings(PCIDevice *d) * addr & (size - 1) != 0. */ if (r->type & PCI_BASE_ADDRESS_SPACE_IO) { - r->map_func(d, i, r->addr, r->filtered_size, r->type); + memory_region_add_subregion_overlap(r->address_space, + r->addr, + r->memory, + 1); } else { - r->map_func(d, i, pci_to_cpu_addr(d->bus, r->addr), - r->filtered_size, r->type); + memory_region_add_subregion_overlap(r->address_space, + pci_to_cpu_addr(d->bus, + r->addr), + r->memory, + 1); } } } diff --git a/hw/pci.h b/hw/pci.h index 3751b13..274d719 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -92,7 +92,6 @@ typedef struct PCIIORegion { pcibus_t size; pcibus_t filtered_size; uint8_t type; - PCIMapIORegionFunc *map_func; ram_addr_t ram_addr; MemoryRegion *memory; MemoryRegion *address_space; -- 1.7.5.3
WARNING: multiple messages have this Message-ID (diff)
From: Avi Kivity <avi@redhat.com> To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org Subject: [Qemu-devel] [RFC v3 55/56] pci: fold BAR mapping function into its caller Date: Sun, 10 Jul 2011 21:15:08 +0300 [thread overview] Message-ID: <1310321709-30770-56-git-send-email-avi@redhat.com> (raw) In-Reply-To: <1310321709-30770-1-git-send-email-avi@redhat.com> There is only one function, so no need for a function pointer. Signed-off-by: Avi Kivity <avi@redhat.com> --- hw/pci.c | 25 +++++++++---------------- hw/pci.h | 1 - 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 2543ced..04b6372 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -881,18 +881,6 @@ static int pci_unregister_device(DeviceState *dev) return 0; } -static void pci_simple_bar_mapfunc_region(PCIDevice *pci_dev, int region_num, - pcibus_t addr, pcibus_t size, - int type) -{ - PCIIORegion *r = &pci_dev->io_regions[region_num]; - - memory_region_add_subregion_overlap(r->address_space, - addr, - r->memory, - 1); -} - void pci_register_bar_region(PCIDevice *pci_dev, int region_num, uint8_t type, MemoryRegion *memory) { @@ -914,7 +902,6 @@ void pci_register_bar_region(PCIDevice *pci_dev, int region_num, r->size = size; r->filtered_size = size; r->type = type; - r->map_func = pci_simple_bar_mapfunc_region; r->ram_addr = IO_MEM_UNASSIGNED; r->memory = NULL; @@ -1103,10 +1090,16 @@ static void pci_update_mappings(PCIDevice *d) * addr & (size - 1) != 0. */ if (r->type & PCI_BASE_ADDRESS_SPACE_IO) { - r->map_func(d, i, r->addr, r->filtered_size, r->type); + memory_region_add_subregion_overlap(r->address_space, + r->addr, + r->memory, + 1); } else { - r->map_func(d, i, pci_to_cpu_addr(d->bus, r->addr), - r->filtered_size, r->type); + memory_region_add_subregion_overlap(r->address_space, + pci_to_cpu_addr(d->bus, + r->addr), + r->memory, + 1); } } } diff --git a/hw/pci.h b/hw/pci.h index 3751b13..274d719 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -92,7 +92,6 @@ typedef struct PCIIORegion { pcibus_t size; pcibus_t filtered_size; uint8_t type; - PCIMapIORegionFunc *map_func; ram_addr_t ram_addr; MemoryRegion *memory; MemoryRegion *address_space; -- 1.7.5.3
next prev parent reply other threads:[~2011-07-10 18:15 UTC|newest] Thread overview: 131+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-07-10 18:14 [RFC v3 00/56] Memory API Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 01/56] Hierarchical memory region API Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 02/56] memory: implement dirty tracking Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 03/56] memory: merge adjacent segments of a single memory region Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 04/56] Internal interfaces for memory API Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 05/56] memory: abstract address space operations Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 06/56] memory: rename MemoryRegion::has_ram_addr to ::terminates Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 07/56] memory: late initialization of ram_addr Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 08/56] memory: I/O address space support Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 09/56] exec.c: initialize memory map Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 10/56] ioport: register ranges by byte aligned addresses always Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 11/56] pc: grab system_memory Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 12/56] pc: convert pc_memory_init() to memory API Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 13/56] pc: move global memory map out of pc_init1() and into its callers Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 14/56] pci: pass address space to pci bus when created Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 15/56] pci: add MemoryRegion based BAR management API Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 16/56] sysbus: add MemoryRegion based memory " Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 17/56] usb-ohci: convert to MemoryRegion Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 18/56] pci: add API to get a BAR's mapped address Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 19/56] vmsvga: don't remember pci BAR address in callback any more Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 20/56] vga: convert vga and its derivatives to the memory API Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 21/56] cirrus: simplify mmio BAR access functions Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 22/56] cirrus: simplify bitblt " Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 23/56] cirrus: simplify vga window mmio " Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 24/56] vga: " Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 25/56] cirrus: simplify linear framebuffer " Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 26/56] Integrate I/O memory regions into qemu Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 27/56] exec.c: fix initialization of system I/O memory region Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 28/56] pci: pass I/O address space to new PCI bus Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 29/56] pci: allow I/O BARs to be registered with pci_register_bar_region() Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 30/56] rtl8139: convert to memory API Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-12 22:41 ` Alex Williamson 2011-07-12 22:41 ` [Qemu-devel] " Alex Williamson 2011-07-12 22:47 ` Alex Williamson 2011-07-12 22:47 ` [Qemu-devel] " Alex Williamson 2011-07-13 6:52 ` Avi Kivity 2011-07-13 6:52 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 31/56] ac97: " Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 20:33 ` malc 2011-07-11 1:42 ` Anthony Liguori 2011-07-11 1:42 ` Anthony Liguori 2011-07-11 6:49 ` Avi Kivity 2011-07-11 6:49 ` Avi Kivity 2011-07-11 10:47 ` Avi Kivity 2011-07-11 10:47 ` Avi Kivity 2011-07-11 22:03 ` malc 2011-07-11 22:03 ` malc 2011-07-12 7:14 ` Avi Kivity 2011-07-12 7:14 ` Avi Kivity 2011-07-10 18:14 ` [RFC v3 32/56] e1000: " Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 33/56] eepro100: " Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 34/56] es1370: " Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 35/56] ide: " Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 36/56] memory: add ioeventfd support Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 37/56] ivshmem: convert to memory API Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 38/56] virtio-pci: " Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 39/56] ahci: " Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 40/56] intel-hda: " Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 41/56] lsi53c895a: " Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 42/56] ppc: " Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 43/56] ne2000: " Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 44/56] pcnet: " Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 45/56] i6300esb: " Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:14 ` [RFC v3 46/56] isa-mmio: concert " Avi Kivity 2011-07-10 18:14 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:15 ` [RFC v3 47/56] sun4u: convert " Avi Kivity 2011-07-10 18:15 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:15 ` [RFC v3 48/56] ehci: " Avi Kivity 2011-07-10 18:15 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:15 ` [RFC v3 49/56] uhci: " Avi Kivity 2011-07-10 18:15 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:15 ` [RFC v3 50/56] xen-platform: " Avi Kivity 2011-07-10 18:15 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:15 ` [RFC v3 51/56] msix: " Avi Kivity 2011-07-10 18:15 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:15 ` [RFC v3 52/56] pci: remove pci_register_bar_simple() Avi Kivity 2011-07-10 18:15 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:15 ` [RFC v3 53/56] pci: convert pci rom to memory API Avi Kivity 2011-07-10 18:15 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:15 ` [RFC v3 54/56] pci: remove pci_register_bar() Avi Kivity 2011-07-10 18:15 ` [Qemu-devel] " Avi Kivity 2011-07-10 18:15 ` Avi Kivity [this message] 2011-07-10 18:15 ` [Qemu-devel] [RFC v3 55/56] pci: fold BAR mapping function into its caller Avi Kivity 2011-07-10 18:15 ` [RFC v3 56/56] pci: rename pci_register_bar_region() to pci_register_bar() Avi Kivity 2011-07-10 18:15 ` [Qemu-devel] " Avi Kivity
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1310321709-30770-56-git-send-email-avi@redhat.com \ --to=avi@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=qemu-devel@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.