[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 05/14] exec.c: Convert subpage memory ops to _wi
From: |
Edgar E. Iglesias |
Subject: |
Re: [Qemu-devel] [PATCH 05/14] exec.c: Convert subpage memory ops to _with_attrs |
Date: |
Thu, 9 Apr 2015 19:07:03 +1000 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
On Tue, Apr 07, 2015 at 09:09:51PM +0100, Peter Maydell wrote:
> Convert the subpage memory ops to _with_attrs; this will allow
> us to pass the attributes through to the underlying access
> functions.
>
> Signed-off-by: Peter Maydell <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 52e7a2a..7e53f52 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
>
- Re: [Qemu-devel] [PATCH 01/14] memory: Define API for MemoryRegionOps to take attrs and return status, (continued)
- Re: [Qemu-devel] [PATCH 01/14] memory: Define API for MemoryRegionOps to take attrs and return status, Paolo Bonzini, 2015/04/08
- Re: [Qemu-devel] [PATCH 01/14] memory: Define API for MemoryRegionOps to take attrs and return status, Edgar E. Iglesias, 2015/04/09
- Re: [Qemu-devel] [PATCH 01/14] memory: Define API for MemoryRegionOps to take attrs and return status, Peter Maydell, 2015/04/09
- Re: [Qemu-devel] [PATCH 01/14] memory: Define API for MemoryRegionOps to take attrs and return status, Paolo Bonzini, 2015/04/09
- Re: [Qemu-devel] [PATCH 01/14] memory: Define API for MemoryRegionOps to take attrs and return status, Edgar E. Iglesias, 2015/04/09
- Re: [Qemu-devel] [PATCH 01/14] memory: Define API for MemoryRegionOps to take attrs and return status, Peter Maydell, 2015/04/10
- Re: [Qemu-devel] [PATCH 01/14] memory: Define API for MemoryRegionOps to take attrs and return status, Edgar E. Iglesias, 2015/04/11
- Re: [Qemu-devel] [PATCH 01/14] memory: Define API for MemoryRegionOps to take attrs and return status, Edgar E. Iglesias, 2015/04/09
[Qemu-devel] [PATCH 05/14] exec.c: Convert subpage memory ops to _with_attrs, Peter Maydell, 2015/04/07
[Qemu-devel] [PATCH 08/14] Switch non-CPU callers from ld/st*_phys to address_space_ld/st*, Peter Maydell, 2015/04/07
[Qemu-devel] [PATCH 03/14] Make CPU iotlb a structure rather than a plain hwaddr, Peter Maydell, 2015/04/07
Re: [Qemu-devel] [PATCH 00/14] Add memory attributes and use them in ARM, Edgar E. Iglesias, 2015/04/09