[PATCH] Initialize kvm qemu enviroment breakpoints for PowerPC

[PATCH] Initialize kvm qemu enviroment breakpoints for PowerPC

[Jerone Young]

2 files changed, 3 insertions(+)
qemu/gdbstub.c          |    2 ++
qemu/qemu-kvm-powerpc.c |    1 +


This patch initilizes breakpoints in the cpu enviroment for PowerPC for kvm qemu.
It also adds places into gdb stub for commands that change env->nip, and load kvm registers with the new program counter.

Signed-off-by: Jerone Young <jyoung5@us.ibm.com>

diff --git a/qemu/gdbstub.c b/qemu/gdbstub.c
--- a/qemu/gdbstub.c
+++ b/qemu/gdbstub.c
@@ -983,6 +983,7 @@ static int gdb_handle_packet(GDBState *s
             kvm_load_registers(env);
 #elif defined (TARGET_PPC)
             env->nip = addr;
+            kvm_load_registers(env);
 #elif defined (TARGET_SPARC)
             env->pc = addr;
             env->npc = addr + 4;
@@ -1021,6 +1022,7 @@ static int gdb_handle_packet(GDBState *s
             kvm_load_registers(env);
 #elif defined (TARGET_PPC)
             env->nip = addr;
+            kvm_load_registers(env);
 #elif defined (TARGET_SPARC)
             env->pc = addr;
             env->npc = addr + 4;
diff --git a/qemu/qemu-kvm-powerpc.c b/qemu/qemu-kvm-powerpc.c
--- a/qemu/qemu-kvm-powerpc.c
+++ b/qemu/qemu-kvm-powerpc.c
@@ -31,6 +31,7 @@ extern kvm_context_t kvm_context;
 
 void cpu_reset(CPUState *env)
 {
+	memset(env->breakpoints, 0, sizeof(env->breakpoints));
 	cpu_ppc_reset(env);
 }
 

Re: [PATCH] Initialize kvm qemu enviroment breakpoints for PowerPC

[Hollis Blanchard]

On Mon, 2008-06-09 at 09:23 -0500, Jerone Young wrote:
> diff --git a/qemu/gdbstub.c b/qemu/gdbstub.c
> --- a/qemu/gdbstub.c
> +++ b/qemu/gdbstub.c
> @@ -983,6 +983,7 @@ static int gdb_handle_packet(GDBState *s
>              kvm_load_registers(env);
>  #elif defined (TARGET_PPC)
>              env->nip = addr;
> +            kvm_load_registers(env);
>  #elif defined (TARGET_SPARC)
>              env->pc = addr;
>              env->npc = addr + 4;
> @@ -1021,6 +1022,7 @@ static int gdb_handle_packet(GDBState *s
>              kvm_load_registers(env);
>  #elif defined (TARGET_PPC)
>              env->nip = addr;
> +            kvm_load_registers(env);
>  #elif defined (TARGET_SPARC)
>              env->pc = addr;
>              env->npc = addr + 4;

These should be protected by a kvm_enabled() test, just like you see for
x86 four lines earlier.

-- 
Hollis Blanchard
IBM Linux Technology Center

Re: [PATCH] Initialize kvm qemu enviroment breakpoints for PowerPC

[Jerone Young]

On Mon, 2008-06-09 at 09:54 -0500, Hollis Blanchard wrote:
> On Mon, 2008-06-09 at 09:23 -0500, Jerone Young wrote:
> > diff --git a/qemu/gdbstub.c b/qemu/gdbstub.c
> > --- a/qemu/gdbstub.c
> > +++ b/qemu/gdbstub.c
> > @@ -983,6 +983,7 @@ static int gdb_handle_packet(GDBState *s
> >              kvm_load_registers(env);
> >  #elif defined (TARGET_PPC)
> >              env->nip = addr;
> > +            kvm_load_registers(env);
> >  #elif defined (TARGET_SPARC)
> >              env->pc = addr;
> >              env->npc = addr + 4;
> > @@ -1021,6 +1022,7 @@ static int gdb_handle_packet(GDBState *s
> >              kvm_load_registers(env);
> >  #elif defined (TARGET_PPC)
> >              env->nip = addr;
> > +            kvm_load_registers(env);
> >  #elif defined (TARGET_SPARC)
> >              env->pc = addr;
> >              env->npc = addr + 4;
> 
> These should be protected by a kvm_enabled() test, just like you see for
> x86 four lines earlier.A

Actually the line above is x86 and it is not using kvm_enabled() before
calling kvm_load_registers().

> 

Re: [PATCH] Initialize kvm qemu enviroment breakpoints for PowerPC

[Avi Kivity]

Jerone Young wrote:
> On Mon, 2008-06-09 at 09:54 -0500, Hollis Blanchard wrote:
>   
>> On Mon, 2008-06-09 at 09:23 -0500, Jerone Young wrote:
>>     
>>> diff --git a/qemu/gdbstub.c b/qemu/gdbstub.c
>>> --- a/qemu/gdbstub.c
>>> +++ b/qemu/gdbstub.c
>>> @@ -983,6 +983,7 @@ static int gdb_handle_packet(GDBState *s
>>>              kvm_load_registers(env);
>>>  #elif defined (TARGET_PPC)
>>>              env->nip = addr;
>>> +            kvm_load_registers(env);
>>>  #elif defined (TARGET_SPARC)
>>>              env->pc = addr;
>>>              env->npc = addr + 4;
>>> @@ -1021,6 +1022,7 @@ static int gdb_handle_packet(GDBState *s
>>>              kvm_load_registers(env);
>>>  #elif defined (TARGET_PPC)
>>>              env->nip = addr;
>>> +            kvm_load_registers(env);
>>>  #elif defined (TARGET_SPARC)
>>>              env->pc = addr;
>>>              env->npc = addr + 4;
>>>       
>> These should be protected by a kvm_enabled() test, just like you see for
>> x86 four lines earlier.A
>>     
>
> Actually the line above is x86 and it is not using kvm_enabled() before
> calling kvm_load_registers().
>
>   

Yes, kvm_load_registers() has a built-in kvm_enabled() test.

-- 
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.

Re: [PATCH] Initialize kvm qemu enviroment breakpoints for PowerPC

[Avi Kivity]

Jerone Young wrote:
> This patch initilizes breakpoints in the cpu enviroment for PowerPC for kvm qemu.
> It also adds places into gdb stub for commands that change env->nip, and load kvm registers with the new program counter.
>   

Applied, thanks.

-- 
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.