[Qemu-devel] Re: [PATCH 5/5] guest debug init for 440 and e500 core

[Jan Kiszka]

Liu Yu wrote:
> e500 only support 2 hardware breakpoints,
> 440(BOOKE) supports 4.
> 
> Signed-off-by: Liu Yu <address@hidden>
> ---
>  hw/ppc440_bamboo.c     |    1 +
>  hw/ppce500_mpc8544ds.c |    1 +
>  target-ppc/kvm_ppc.h   |    1 +
>  3 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
> index f1ba130..8c9c3b6 100644
> --- a/hw/ppc440_bamboo.c
> +++ b/hw/ppc440_bamboo.c
> @@ -185,6 +185,7 @@ static void bamboo_init(ram_addr_t ram_size,
>      if (kvm_enabled()) {
>          kvm_arch_put_registers(env);
>          kvmppc_init();
> +        kvmppc_debug_init(4, 2);
>      }
>  }
>  
> diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c
> index f1b3c1a..6c2aa61 100644
> --- a/hw/ppce500_mpc8544ds.c
> +++ b/hw/ppce500_mpc8544ds.c
> @@ -279,6 +279,7 @@ static void mpc8544ds_init(ram_addr_t ram_size,
>      if (kvm_enabled()) {
>          kvm_arch_put_registers(env);
>          kvmppc_init();
> +        kvmppc_debug_init(2, 2); /* E500v2 doesn't support IAC3,IAC4 */

I think those two are better moved to kvm_arch_init_vcpu.

>      }
>  
>      return;
> diff --git a/target-ppc/kvm_ppc.h b/target-ppc/kvm_ppc.h
> index 3792ef7..8b4edca 100644
> --- a/target-ppc/kvm_ppc.h
> +++ b/target-ppc/kvm_ppc.h
> @@ -13,5 +13,6 @@ void kvmppc_init(void);
>  void kvmppc_fdt_update(void *fdt);
>  int kvmppc_read_host_property(const char *node_path, const char *prop,
>                                       void *val, size_t len);
> +void kvmppc_debug_init(int max_hw_bp, int max_hw_wp);
>  
>  #endif /* __KVM_PPC_H__ */

Jan

signature.asc
Description: OpenPGP digital signature