[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/17] exec.c: Convert subpage memory ops to _with_at
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 05/17] exec.c: Convert subpage memory ops to _with_attrs |
Date: |
Mon, 27 Apr 2015 16:20:33 +0100 |
Convert the subpage memory ops to _with_attrs; this will allow
us to pass the attributes through to the underlying access
functions. (Nothing uses the attributes yet.)
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
---
exec.c | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/exec.c b/exec.c
index 34dafd2..bba6f26 100644
--- a/exec.c
+++ b/exec.c
@@ -1941,8 +1941,8 @@ static const MemoryRegionOps watch_mem_ops = {
.endianness = DEVICE_NATIVE_ENDIAN,
};
-static uint64_t subpage_read(void *opaque, hwaddr addr,
- unsigned len)
+static MemTxResult subpage_read(void *opaque, hwaddr addr, uint64_t *data,
+ unsigned len, MemTxAttrs attrs)
{
subpage_t *subpage = opaque;
uint8_t buf[8];
@@ -1951,23 +1951,29 @@ static uint64_t subpage_read(void *opaque, hwaddr addr,
printf("%s: subpage %p len %u addr " TARGET_FMT_plx "\n", __func__,
subpage, len, addr);
#endif
- address_space_read(subpage->as, addr + subpage->base, buf, len);
+ if (address_space_read(subpage->as, addr + subpage->base, buf, len)) {
+ return MEMTX_DECODE_ERROR;
+ }
switch (len) {
case 1:
- return ldub_p(buf);
+ *data = ldub_p(buf);
+ return MEMTX_OK;
case 2:
- return lduw_p(buf);
+ *data = lduw_p(buf);
+ return MEMTX_OK;
case 4:
- return ldl_p(buf);
+ *data = ldl_p(buf);
+ return MEMTX_OK;
case 8:
- return ldq_p(buf);
+ *data = ldq_p(buf);
+ return MEMTX_OK;
default:
abort();
}
}
-static void subpage_write(void *opaque, hwaddr addr,
- uint64_t value, unsigned len)
+static MemTxResult subpage_write(void *opaque, hwaddr addr,
+ uint64_t value, unsigned len, MemTxAttrs
attrs)
{
subpage_t *subpage = opaque;
uint8_t buf[8];
@@ -1993,7 +1999,10 @@ static void subpage_write(void *opaque, hwaddr addr,
default:
abort();
}
- address_space_write(subpage->as, addr + subpage->base, buf, len);
+ if (address_space_write(subpage->as, addr + subpage->base, buf, len)) {
+ return MEMTX_DECODE_ERROR;
+ }
+ return MEMTX_OK;
}
static bool subpage_accepts(void *opaque, hwaddr addr,
@@ -2010,8 +2019,8 @@ static bool subpage_accepts(void *opaque, hwaddr addr,
}
static const MemoryRegionOps subpage_ops = {
- .read = subpage_read,
- .write = subpage_write,
+ .read_with_attrs = subpage_read,
+ .write_with_attrs = subpage_write,
.impl.min_access_size = 1,
.impl.max_access_size = 8,
.valid.min_access_size = 1,
--
1.9.1
- [Qemu-devel] [PULL 00/17] target-arm queue, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 17/17] Allow ARMv8 SCR.SMD updates, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 14/17] target-arm: Check watchpoints against CPU security state, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 16/17] target-arm: Adjust id_aa64pfr0 when has_el3 CPU property disabled, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 01/17] memory: Define API for MemoryRegionOps to take attrs and return status, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 15/17] target-arm: rename c1_coproc to cpacr_el1, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 12/17] target-arm: Add user-mode transaction attribute, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 13/17] target-arm: Use attribute info to handle user-only watchpoints, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 11/17] target-arm: Use correct memory attributes for page table walks, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 10/17] target-arm: Honour NS bits in page tables, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 05/17] exec.c: Convert subpage memory ops to _with_attrs,
Peter Maydell <=
- [Qemu-devel] [PULL 03/17] Make CPU iotlb a structure rather than a plain hwaddr, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 06/17] exec.c: Make address_space_rw take transaction attributes, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 07/17] exec.c: Add new address_space_ld*/st* functions, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 09/17] Switch non-CPU callers from ld/st*_phys to address_space_ld/st*, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 02/17] memory: Replace io_mem_read/write with memory_region_dispatch_read/write, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 08/17] exec.c: Capture the memory attributes for a watchpoint hit, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 04/17] Add MemTxAttrs to the IOTLB, Peter Maydell, 2015/04/27
- Re: [Qemu-devel] [PULL 00/17] target-arm queue, Peter Maydell, 2015/04/28