From: Avi Kivity <avi@redhat.com>
To: qemu-devel@nongnu.org
Cc: kvm@vger.kernel.org
Subject: [Qemu-devel] [RFC v4 54/58] pci: remove pci_register_bar_simple()
Date: Sun, 17 Jul 2011 14:14:21 +0300 [thread overview]
Message-ID: <1310901265-32051-55-git-send-email-avi@redhat.com> (raw)
In-Reply-To: <1310901265-32051-1-git-send-email-avi@redhat.com>
Superceded by pci_register_bar_region().
Signed-off-by: Avi Kivity <avi@redhat.com>
---
hw/pci.c | 16 ----------------
hw/pci.h | 2 --
2 files changed, 0 insertions(+), 18 deletions(-)
diff --git a/hw/pci.c b/hw/pci.c
index 980840f..9db6fc8 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -923,13 +923,6 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num,
}
}
-static void pci_simple_bar_mapfunc(PCIDevice *pci_dev, int region_num,
- pcibus_t addr, pcibus_t size, int type)
-{
- cpu_register_physical_memory(addr, size,
- pci_dev->io_regions[region_num].ram_addr);
-}
-
static void pci_simple_bar_mapfunc_region(PCIDevice *pci_dev, int region_num,
pcibus_t addr, pcibus_t size,
int type)
@@ -942,15 +935,6 @@ static void pci_simple_bar_mapfunc_region(PCIDevice *pci_dev, int region_num,
1);
}
-void pci_register_bar_simple(PCIDevice *pci_dev, int region_num,
- pcibus_t size, uint8_t attr, ram_addr_t ram_addr)
-{
- pci_register_bar(pci_dev, region_num, size,
- PCI_BASE_ADDRESS_SPACE_MEMORY | attr,
- pci_simple_bar_mapfunc);
- pci_dev->io_regions[region_num].ram_addr = ram_addr;
-}
-
void pci_register_bar_region(PCIDevice *pci_dev, int region_num,
uint8_t attr, MemoryRegion *memory)
{
diff --git a/hw/pci.h b/hw/pci.h
index a95e2ad..5209964 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -204,8 +204,6 @@ PCIDevice *pci_register_device(PCIBus *bus, const char *name,
void pci_register_bar(PCIDevice *pci_dev, int region_num,
pcibus_t size, uint8_t type,
PCIMapIORegionFunc *map_func);
-void pci_register_bar_simple(PCIDevice *pci_dev, int region_num,
- pcibus_t size, uint8_t attr, ram_addr_t ram_addr);
void pci_register_bar_region(PCIDevice *pci_dev, int region_num,
uint8_t attr, MemoryRegion *memory);
pcibus_t pci_get_bar_addr(PCIDevice *pci_dev, int region_num);
--
1.7.5.3
next prev parent reply other threads:[~2011-07-17 11:14 UTC|newest]
Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-17 11:13 [Qemu-devel] [RFC v4 00/58] Memory API Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 01/58] Hierarchical memory region API Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 02/58] memory: implement dirty tracking Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 03/58] memory: merge adjacent segments of a single memory region Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 04/58] Internal interfaces for memory API Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 05/58] memory: abstract address space operations Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 06/58] memory: rename MemoryRegion::has_ram_addr to ::terminates Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 07/58] memory: late initialization of ram_addr Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 08/58] memory: I/O address space support Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 09/58] memory: add backward compatibility for old portio registration Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 10/58] memory: add backward compatibility for old mmio registration Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 11/58] memory: add ioeventfd support Avi Kivity
2011-07-20 17:29 ` Blue Swirl
2011-07-20 17:31 ` Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 12/58] exec.c: initialize memory map Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 13/58] ioport: register ranges by byte aligned addresses always Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 14/58] pc: grab system_memory Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 15/58] pc: convert pc_memory_init() to memory API Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 16/58] pc: move global memory map out of pc_init1() and into its callers Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 17/58] pci: pass address space to pci bus when created Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 18/58] pci: add MemoryRegion based BAR management API Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 19/58] sysbus: add MemoryRegion based memory " Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 20/58] usb-ohci: convert to MemoryRegion Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 21/58] pci: add API to get a BAR's mapped address Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 22/58] vmsvga: don't remember pci BAR address in callback any more Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 23/58] vga: convert vga and its derivatives to the memory API Avi Kivity
2011-07-20 14:05 ` Jan Kiszka
2011-07-20 14:40 ` Avi Kivity
2011-07-20 14:45 ` Jan Kiszka
2011-07-20 14:48 ` Avi Kivity
2011-07-20 14:52 ` Jan Kiszka
2011-07-20 14:55 ` Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 24/58] cirrus: simplify mmio BAR access functions Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 25/58] cirrus: simplify bitblt " Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 26/58] cirrus: simplify vga window mmio " Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 27/58] vga: " Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 28/58] cirrus: simplify linear framebuffer " Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 29/58] Integrate I/O memory regions into qemu Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 30/58] exec.c: fix initialization of system I/O memory region Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 31/58] pci: pass I/O address space to new PCI bus Avi Kivity
2011-07-17 11:13 ` [Qemu-devel] [RFC v4 32/58] pci: allow I/O BARs to be registered with pci_register_bar_region() Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 33/58] rtl8139: convert to memory API Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 34/58] ac97: " Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 35/58] e1000: " Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 36/58] eepro100: " Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 37/58] es1370: " Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 38/58] ide: " Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 39/58] ivshmem: " Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 40/58] virtio-pci: " Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 41/58] ahci: " Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 42/58] intel-hda: " Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 43/58] lsi53c895a: " Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 44/58] ppc: " Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 45/58] ne2000: " Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 46/58] pcnet: " Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 47/58] i6300esb: " Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 48/58] isa-mmio: concert " Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 49/58] sun4u: convert " Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 50/58] ehci: " Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 51/58] uhci: " Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 52/58] xen-platform: " Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 53/58] msix: " Avi Kivity
2011-07-17 11:14 ` Avi Kivity [this message]
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 55/58] pci: convert pci rom " Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 56/58] pci: remove pci_register_bar() Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 57/58] pci: fold BAR mapping function into its caller Avi Kivity
2011-07-17 11:14 ` [Qemu-devel] [RFC v4 58/58] pci: rename pci_register_bar_region() to pci_register_bar() Avi Kivity
2011-07-19 13:09 ` [Qemu-devel] [RFC v4 00/58] Memory API Anthony Liguori
2011-07-19 13:27 ` Avi Kivity
2011-07-19 14:50 ` Anthony Liguori
2011-07-19 16:05 ` Avi Kivity
2011-07-19 16:10 ` Avi Kivity
2011-07-19 20:51 ` Anthony Liguori
2011-07-19 21:03 ` Sasha Levin
2011-07-20 2:53 ` Anthony Liguori
2011-07-20 6:10 ` Sasha Levin
2011-07-20 8:12 ` Avi Kivity
2011-07-20 12:12 ` Anthony Liguori
2011-07-20 8:10 ` Avi Kivity
2011-07-20 14:31 ` Anthony Liguori
2011-07-20 14:45 ` Avi Kivity
2011-07-19 13:56 ` Michael S. Tsirkin
2011-07-19 13:57 ` Avi Kivity
2011-07-19 17:01 ` Jan Kiszka
2011-07-19 17:14 ` Avi Kivity
2011-07-19 17:30 ` Jan Kiszka
2011-07-20 8:13 ` Avi Kivity
2011-07-20 11:20 ` Jan Kiszka
2011-07-20 11:59 ` Avi Kivity
2011-07-20 11:43 ` Jan Kiszka
2011-07-20 11:57 ` Avi Kivity
2011-07-20 13:57 ` Jan Kiszka
2011-07-20 14:32 ` Avi Kivity
2011-07-20 14:37 ` Michael S. Tsirkin
2011-07-20 14:42 ` Jan Kiszka
2011-07-20 14:54 ` Avi Kivity
2011-07-20 15:58 ` Jan Kiszka
2011-07-20 16:02 ` Avi Kivity
2011-07-20 16:13 ` Jan Kiszka
2011-07-20 16:19 ` Avi Kivity
2011-07-20 16:10 ` Michael S. Tsirkin
2011-07-20 16:52 ` Avi Kivity
2011-07-20 17:06 ` Michael S. Tsirkin
2011-07-20 16:53 ` 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=1310901265-32051-55-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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).