[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 8/8] memory: remove old_portio-style callbacks support
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [RFC 8/8] memory: remove old_portio-style callbacks support |
Date: |
Sun, 23 Dec 2012 16:32:48 +0100 |
Signed-off-by: Hervé Poussineau <address@hidden>
---
memory.c | 44 --------------------------------------------
memory.h | 4 ----
2 files changed, 48 deletions(-)
diff --git a/memory.c b/memory.c
index 7419853..ea3bb8a 100644
--- a/memory.c
+++ b/memory.c
@@ -365,21 +365,6 @@ static void access_with_adjusted_size(hwaddr addr,
}
}
-static const MemoryRegionPortio *find_portio(MemoryRegion *mr, uint64_t offset,
- unsigned width, bool write)
-{
- const MemoryRegionPortio *mrp;
-
- for (mrp = mr->ops->old_portio; mrp->size; ++mrp) {
- if (offset >= mrp->offset && offset < mrp->offset + mrp->len
- && width == mrp->size
- && (write ? (bool)mrp->write : (bool)mrp->read)) {
- return mrp;
- }
- }
- return NULL;
-}
-
static void memory_region_iorange_read(IORange *iorange,
uint64_t offset,
unsigned width,
@@ -390,21 +375,6 @@ static void memory_region_iorange_read(IORange *iorange,
MemoryRegion *mr = mrio->mr;
offset += mrio->offset;
- if (mr->ops->old_portio) {
- const MemoryRegionPortio *mrp = find_portio(mr, offset - mrio->offset,
- width, false);
-
- *data = ((uint64_t)1 << (width * 8)) - 1;
- if (mrp) {
- *data = mrp->read(mr->opaque, offset);
- } else if (width == 2) {
- mrp = find_portio(mr, offset - mrio->offset, 1, false);
- assert(mrp);
- *data = mrp->read(mr->opaque, offset) |
- (mrp->read(mr->opaque, offset + 1) << 8);
- }
- return;
- }
*data = 0;
access_with_adjusted_size(offset, data, width,
mr->ops->impl.min_access_size,
@@ -422,20 +392,6 @@ static void memory_region_iorange_write(IORange *iorange,
MemoryRegion *mr = mrio->mr;
offset += mrio->offset;
- if (mr->ops->old_portio) {
- const MemoryRegionPortio *mrp = find_portio(mr, offset - mrio->offset,
- width, true);
-
- if (mrp) {
- mrp->write(mr->opaque, offset, data);
- } else if (width == 2) {
- mrp = find_portio(mr, offset - mrio->offset, 1, true);
- assert(mrp);
- mrp->write(mr->opaque, offset, data & 0xff);
- mrp->write(mr->opaque, offset + 1, data >> 8);
- }
- return;
- }
access_with_adjusted_size(offset, &data, width,
mr->ops->impl.min_access_size,
mr->ops->impl.max_access_size,
diff --git a/memory.h b/memory.h
index 9462bfd..bdde0d0 100644
--- a/memory.h
+++ b/memory.h
@@ -103,10 +103,6 @@ struct MemoryRegionOps {
bool unaligned;
} impl;
- /* If .read and .write are not present, old_portio may be used for
- * backwards compatibility with old portio registration
- */
- const MemoryRegionPortio *old_portio;
/* If .read and .write are not present, old_mmio may be used for
* backwards compatibility with old mmio registration
*/
--
1.7.10.4
- [Qemu-devel] [RFC 0/8] Remove old_portio usage, Hervé Poussineau, 2012/12/23
- [Qemu-devel] [RFC 3/8] uhci: do not use old_portio-style callbacks, Hervé Poussineau, 2012/12/23
- [Qemu-devel] [RFC 1/8] pc: disable bochs bios debug ports (do not apply!), Hervé Poussineau, 2012/12/23
- [Qemu-devel] [RFC 2/8] xen_platform: do not use old_portio-style callbacks, Hervé Poussineau, 2012/12/23
- [Qemu-devel] [RFC 5/8] vga/qxl: do not use portio_list_init/portio_list_add, Hervé Poussineau, 2012/12/23
- [Qemu-devel] [RFC 4/8] acpi-piix4: do not use old_portio-style callbacks, Hervé Poussineau, 2012/12/23
- [Qemu-devel] [RFC 6/8] isa: use memory regions instead of portio_list_* functions, Hervé Poussineau, 2012/12/23
- [Qemu-devel] [RFC 8/8] memory: remove old_portio-style callbacks support,
Hervé Poussineau <=
- [Qemu-devel] [RFC 7/8] ioport: remove now useless portio_list_* functions, Hervé Poussineau, 2012/12/23