On Fri, Apr 05, 2013 at 04:36:56PM +0200, Igor Mammedov wrote:
> ... so it could be called from without requiring CPUArchState
>
> Signed-off-by: Igor Mammedov <imamm...@redhat.com>
Reviewed-by: Eduardo Habkost <ehabk...@redhat.com>
> ---
> cpus.c | 4 ++--
> include/sysemu/kvm.h | 12 ++++++------
> kvm-all.c | 8 ++------
> kvm-stub.c | 4 ++--
> 4 files changed, 12 insertions(+), 16 deletions(-)
>
> diff --git a/cpus.c b/cpus.c
> index e919dd7..9b9a32f 100644
> --- a/cpus.c
> +++ b/cpus.c
> @@ -419,7 +419,7 @@ void cpu_synchronize_all_post_reset(void)
> CPUArchState *cpu;
>
> for (cpu = first_cpu; cpu; cpu = cpu->next_cpu) {
> - cpu_synchronize_post_reset(cpu);
> + cpu_synchronize_post_reset(ENV_GET_CPU(cpu));
> }
> }
>
> @@ -428,7 +428,7 @@ void cpu_synchronize_all_post_init(void)
> CPUArchState *cpu;
>
> for (cpu = first_cpu; cpu; cpu = cpu->next_cpu) {
> - cpu_synchronize_post_init(cpu);
> + cpu_synchronize_post_init(ENV_GET_CPU(cpu));
> }
> }
>
> diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
> index f2d97b5..495e6f8 100644
> --- a/include/sysemu/kvm.h
> +++ b/include/sysemu/kvm.h
> @@ -250,8 +250,8 @@ int kvm_check_extension(KVMState *s, unsigned int
> extension);
> uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function,
> uint32_t index, int reg);
> void kvm_cpu_synchronize_state(CPUArchState *env);
> -void kvm_cpu_synchronize_post_reset(CPUArchState *env);
> -void kvm_cpu_synchronize_post_init(CPUArchState *env);
> +void kvm_cpu_synchronize_post_reset(CPUState *cpu);
> +void kvm_cpu_synchronize_post_init(CPUState *cpu);
>
> /* generic hooks - to be moved/refactored once there are more users */
>
> @@ -262,17 +262,17 @@ static inline void cpu_synchronize_state(CPUArchState
> *env)
> }
> }
>
> -static inline void cpu_synchronize_post_reset(CPUArchState *env)
> +static inline void cpu_synchronize_post_reset(CPUState *cpu)
> {
> if (kvm_enabled()) {
> - kvm_cpu_synchronize_post_reset(env);
> + kvm_cpu_synchronize_post_reset(cpu);
> }
> }
>
> -static inline void cpu_synchronize_post_init(CPUArchState *env)
> +static inline void cpu_synchronize_post_init(CPUState *cpu)
> {
> if (kvm_enabled()) {
> - kvm_cpu_synchronize_post_init(env);
> + kvm_cpu_synchronize_post_init(cpu);
> }
> }
>
> diff --git a/kvm-all.c b/kvm-all.c
> index 9b433d3..fc4e17c 100644
> --- a/kvm-all.c
> +++ b/kvm-all.c
> @@ -1510,18 +1510,14 @@ void kvm_cpu_synchronize_state(CPUArchState *env)
> }
> }
>
> -void kvm_cpu_synchronize_post_reset(CPUArchState *env)
> +void kvm_cpu_synchronize_post_reset(CPUState *cpu)
> {
> - CPUState *cpu = ENV_GET_CPU(env);
> -
> kvm_arch_put_registers(cpu, KVM_PUT_RESET_STATE);
> cpu->kvm_vcpu_dirty = false;
> }
>
> -void kvm_cpu_synchronize_post_init(CPUArchState *env)
> +void kvm_cpu_synchronize_post_init(CPUState *cpu)
> {
> - CPUState *cpu = ENV_GET_CPU(env);
> -
> kvm_arch_put_registers(cpu, KVM_PUT_FULL_STATE);
> cpu->kvm_vcpu_dirty = false;
> }
> diff --git a/kvm-stub.c b/kvm-stub.c
> index 760aadc..82875dd 100644
> --- a/kvm-stub.c
> +++ b/kvm-stub.c
> @@ -42,11 +42,11 @@ void kvm_cpu_synchronize_state(CPUArchState *env)
> {
> }
>
> -void kvm_cpu_synchronize_post_reset(CPUArchState *env)
> +void kvm_cpu_synchronize_post_reset(CPUState *env)
> {
> }
>
> -void kvm_cpu_synchronize_post_init(CPUArchState *env)
> +void kvm_cpu_synchronize_post_init(CPUState *cpu)
> {
> }
>
> --
> 1.8.1.4
>
--
Eduardo
