Re: [Qemu-ppc] [Qemu-devel] [PATCH v4] ppc: introduce CPUPPCState::cpu_dt_id and CPUState::kvm_cpu_id

[Andreas Färber]

Am 15.11.2013 06:14, schrieb Alexey Kardashevskiy:
> diff --git a/include/qom/cpu.h b/include/qom/cpu.h
> index 7739e00..52fc76d 100644
> --- a/include/qom/cpu.h
> +++ b/include/qom/cpu.h
> @@ -197,6 +197,7 @@ struct CPUState {
>      bool kvm_vcpu_dirty;
>      struct KVMState *kvm_state;
>      struct kvm_run *kvm_run;
> +    int kvm_cpu_id;
>  
>      /* TODO Move common fields from CPUArchState here. */
>      int cpu_index; /* used by alpha TCG */

Here you are adding a field to CPUState, fine with me. (Please add a
documentation line above the struct then.)

> diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
> index bb84767..8052f6b 100644
> --- a/target-ppc/cpu.h
> +++ b/target-ppc/cpu.h
> @@ -1074,6 +1074,9 @@ struct CPUPPCState {
>       */
>      uint8_t fit_period[4];
>      uint8_t wdt_period[4];
> +
> +    /* The CPU index used in the device tree. KVM uses this index too */
> +    int cpu_dt_id;

But I believe I have requested a number of times not to add random
fields to CPUPPCState unless they are accessed by TCG. Please place the
new field in PowerPCCPU instead and put the description into the struct
documentation.

>  };
>  
>  #define SET_FIT_PERIOD(a_, b_, c_, d_)          \
> @@ -2154,4 +2157,8 @@ static inline bool cpu_has_work(CPUState *cpu)
>  
>  void dump_mmu(FILE *f, fprintf_function cpu_fprintf, CPUPPCState *env);
>  
> +int ppc_get_vcpu_dt_id(CPUState *cs);
> +CPUState *ppc_get_vcpu_by_dt_id(int cpu_dt_id);
> +void ppc_fixup_cpu_dt_id(PowerPCCPU *cpu);
> +
>  #endif /* !defined (__CPU_PPC_H__) */

Regards,
Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg