From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VPSTn-0005LO-De for qemu-devel@nongnu.org; Fri, 27 Sep 2013 03:28:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VPSTh-0004cc-1m for qemu-devel@nongnu.org; Fri, 27 Sep 2013 03:28:47 -0400 Message-ID: <524533A1.6030305@redhat.com> Date: Fri, 27 Sep 2013 09:28:33 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1380245138-9716-1-git-send-email-akong@redhat.com> In-Reply-To: <1380245138-9716-1-git-send-email-akong@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] exec: cleanup DEBUG_SUBPAGE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Amos Kong Cc: qemu-trivial , peter.maydell@linaro.org, qemu-devel@nongnu.org, anthony@codemonkey.ws Michael, want to pick this up for -trivial? Reviewed-by: Paolo Bonzini Il 27/09/2013 03:25, Amos Kong ha scritto: > Touched some error after enabling DEBUG_SUBPAGE. > > Signed-off-by: Amos Kong > --- > exec.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/exec.c b/exec.c > index 07aa2c6..5aef833 100644 > --- a/exec.c > +++ b/exec.c > @@ -1573,7 +1573,7 @@ static uint64_t subpage_read(void *opaque, hwaddr addr, > uint8_t buf[4]; > > #if defined(DEBUG_SUBPAGE) > - printf("%s: subpage %p len %d addr " TARGET_FMT_plx "\n", __func__, > + 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); > @@ -1596,7 +1596,7 @@ static void subpage_write(void *opaque, hwaddr addr, > uint8_t buf[4]; > > #if defined(DEBUG_SUBPAGE) > - printf("%s: subpage %p len %d addr " TARGET_FMT_plx > + printf("%s: subpage %p len %u addr " TARGET_FMT_plx > " value %"PRIx64"\n", > __func__, subpage, len, addr, value); > #endif > @@ -1617,16 +1617,16 @@ static void subpage_write(void *opaque, hwaddr addr, > } > > static bool subpage_accepts(void *opaque, hwaddr addr, > - unsigned size, bool is_write) > + unsigned len, bool is_write) > { > subpage_t *subpage = opaque; > #if defined(DEBUG_SUBPAGE) > - printf("%s: subpage %p %c len %d addr " TARGET_FMT_plx "\n", > + printf("%s: subpage %p %c len %u addr " TARGET_FMT_plx "\n", > __func__, subpage, is_write ? 'w' : 'r', len, addr); > #endif > > return address_space_access_valid(subpage->as, addr + subpage->base, > - size, is_write); > + len, is_write); > } > > static const MemoryRegionOps subpage_ops = { > @@ -1646,8 +1646,8 @@ static int subpage_register (subpage_t *mmio, uint32_t start, uint32_t end, > idx = SUBPAGE_IDX(start); > eidx = SUBPAGE_IDX(end); > #if defined(DEBUG_SUBPAGE) > - printf("%s: %p start %08x end %08x idx %08x eidx %08x mem %ld\n", __func__, > - mmio, start, end, idx, eidx, memory); > + printf("%s: %p start %08x end %08x idx %08x eidx %08x section %d\n", > + __func__, mmio, start, end, idx, eidx, section); > #endif > for (; idx <= eidx; idx++) { > mmio->sub_section[idx] = section; > @@ -1668,8 +1668,8 @@ static subpage_t *subpage_init(AddressSpace *as, hwaddr base) > "subpage", TARGET_PAGE_SIZE); > mmio->iomem.subpage = true; > #if defined(DEBUG_SUBPAGE) > - printf("%s: %p base " TARGET_FMT_plx " len %08x %d\n", __func__, > - mmio, base, TARGET_PAGE_SIZE, subpage_memory); > + printf("%s: %p base " TARGET_FMT_plx " len %08x\n", __func__, > + mmio, base, TARGET_PAGE_SIZE); > #endif > subpage_register(mmio, 0, TARGET_PAGE_SIZE-1, PHYS_SECTION_UNASSIGNED); > >