From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45078) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5CMa-0005By-S4 for qemu-devel@nongnu.org; Thu, 10 Jul 2014 07:18:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X5CMT-00029A-V9 for qemu-devel@nongnu.org; Thu, 10 Jul 2014 07:18:08 -0400 Message-ID: <53BE7668.4070408@suse.de> Date: Thu, 10 Jul 2014 13:18:00 +0200 From: Alexander Graf MIME-Version: 1.0 References: <1404989882-17362-1-git-send-email-Bharat.Bhushan@freescale.com> <1404989882-17362-6-git-send-email-Bharat.Bhushan@freescale.com> In-Reply-To: <1404989882-17362-6-git-send-email-Bharat.Bhushan@freescale.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 5/6 v6] ppc: Add software breakpoint support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Bharat Bhushan Cc: maddy@linux.vnet.ibm.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org On 10.07.14 12:58, Bharat Bhushan wrote: > This patch allow insert/remove software breakpoint > > Signed-off-by: Bharat Bhushan > --- > v5->v6 > - No change > > target-ppc/kvm.c | 73 +++++++++++++++++++++++++++++++++++++++++++++----------- > 1 file changed, 59 insertions(+), 14 deletions(-) > > diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c > index d1239b4..c4a1fa5 100644 > --- a/target-ppc/kvm.c > +++ b/target-ppc/kvm.c > @@ -1320,6 +1320,55 @@ static int kvmppc_handle_dcr_write(CPUPPCState *env, uint32_t dcrn, uint32_t dat > return 0; > } > > +int kvm_arch_insert_sw_breakpoint(CPUState *cs, struct kvm_sw_breakpoint *bp) > +{ > + /* Mixed endian case is not handled */ > + uint32_t sc = debug_inst_opcode; > + > + if (cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&bp->saved_insn, > + sizeof(sc), 0) || > + cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&sc, sizeof(sc), 1)) { > + return -EINVAL; > + } > + > + return 0; > +} > + > +int kvm_arch_remove_sw_breakpoint(CPUState *cs, struct kvm_sw_breakpoint *bp) > +{ > + uint32_t sc; > + > + if (cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&sc, sizeof(sc), 0) || > + sc != debug_inst_opcode || > + cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&bp->saved_insn, > + sizeof(sc), 1)) { > + return -EINVAL; > + } > + > + return 0; > +} > + > +void kvm_arch_update_guest_debug(CPUState *cs, struct kvm_guest_debug *dbg) > +{ > + /* Software Breakpoint updates */ > + if (kvm_sw_breakpoints_active(cs)) { > + dbg->control |= KVM_GUESTDBG_ENABLE | KVM_GUESTDBG_USE_SW_BP; > + } > +} > + > +static int kvm_handle_debug(PowerPCCPU *cpu, struct kvm_run *run) > +{ > + CPUState *cs = CPU(cpu); > + struct kvm_debug_exit_arch *arch_info = &run->debug.arch; > + int handle = 0; > + > + if (kvm_find_sw_breakpoint(cs, arch_info->address)) { > + handle = 1; > + } > + > + return handle; > +} > + > int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) > { > PowerPCCPU *cpu = POWERPC_CPU(cs); > @@ -1360,6 +1409,16 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) > ret = 0; > break; > > + case KVM_EXIT_DEBUG: > + DPRINTF("handle debug exception\n"); > + if (kvm_handle_debug(cpu, run)) { > + ret = EXCP_DEBUG; > + break; > + } > + /* re-enter, this exception was guest-internal */ > + ret = 0; Where do we inject the program interrupt into our guest here? Alex