From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42608) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPjfN-0007zf-Ha for qemu-devel@nongnu.org; Wed, 20 Jul 2016 01:03:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bPjfL-0004hU-As for qemu-devel@nongnu.org; Wed, 20 Jul 2016 01:03:28 -0400 From: Andrey Smirnov Date: Tue, 19 Jul 2016 22:02:59 -0700 Message-Id: <1468990980-4598-10-git-send-email-andrew.smirnov@gmail.com> In-Reply-To: <1468990980-4598-1-git-send-email-andrew.smirnov@gmail.com> References: <1468990980-4598-1-git-send-email-andrew.smirnov@gmail.com> Subject: [Qemu-devel] [PATCH v3 09/10] gdbstub: Convert target_memory_rw_debug to use MemoryAccessType List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Andrey Smirnov , Peter Maydell , David Gibson , qemu-ppc@nongnu.org, qemu-arm@nongnu.org, kvm@vger.kernel.org Convert target_memory_rw_debug to use MemoryAccessType as to follow similar conversion of cpu_memory_rw_debug. Signed-off-by: Andrey Smirnov --- gdbstub.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 9c4cbe4..c215672 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -44,15 +44,17 @@ #endif static inline int target_memory_rw_debug(CPUState *cpu, target_ulong addr, - uint8_t *buf, int len, bool is_write) + uint8_t *buf, int len, + MemoryAccessType access_type) { CPUClass *cc = CPU_GET_CLASS(cpu); if (cc->memory_rw_debug) { + const bool is_write = (access_type == MEM_DATA_STORE); return cc->memory_rw_debug(cpu, addr, buf, len, is_write); } - return cpu_memory_rw_debug(cpu, addr, buf, len, - is_write ? MEM_DATA_STORE : MEM_DATA_LOAD); + + return cpu_memory_rw_debug(cpu, addr, buf, len, access_type); } enum { @@ -966,7 +968,8 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) break; } - if (target_memory_rw_debug(s->g_cpu, addr, mem_buf, len, false) != 0) { + if (target_memory_rw_debug(s->g_cpu, addr, mem_buf, + len, MEM_DATA_LOAD) != 0) { put_packet (s, "E14"); } else { memtohex(buf, mem_buf, len); @@ -988,7 +991,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) } hextomem(mem_buf, p, len); if (target_memory_rw_debug(s->g_cpu, addr, mem_buf, len, - true) != 0) { + MEM_DATA_STORE) != 0) { put_packet(s, "E14"); } else { put_packet(s, "OK"); -- 2.5.5