From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49351) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfncT-0006wr-OJ for qemu-devel@nongnu.org; Wed, 08 Apr 2015 06:54:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YfncS-0000Wo-OG for qemu-devel@nongnu.org; Wed, 08 Apr 2015 06:54:05 -0400 Received: from mail-wi0-x235.google.com ([2a00:1450:400c:c05::235]:36945) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfncS-0000Wj-Hn for qemu-devel@nongnu.org; Wed, 08 Apr 2015 06:54:04 -0400 Received: by wiaa2 with SMTP id a2so53411636wia.0 for ; Wed, 08 Apr 2015 03:54:03 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <552508C8.4000406@redhat.com> Date: Wed, 08 Apr 2015 12:54:00 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1428437400-8474-1-git-send-email-peter.maydell@linaro.org> <1428437400-8474-6-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1428437400-8474-6-git-send-email-peter.maydell@linaro.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 05/14] exec.c: Convert subpage memory ops to _with_attrs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , qemu-devel@nongnu.org Cc: Peter Crosthwaite , patches@linaro.org, Greg Bellows , "Edgar E. Iglesias" , =?windows-1252?Q?Alex_Benn=E9e?= , Richard Henderson On 07/04/2015 22:09, 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. Perhaps mention in the commit message that the attributes are not used yet. Reviewed-by: Paolo Bonzini > Signed-off-by: Peter Maydell > --- > 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, >