Commit 3f24a58f authored by Igor Mammedov's avatar Igor Mammedov Committed by Andreas Färber
Browse files

cpu: Pass CPUState to *cpu_synchronize_post*() 



... so it could be called without requiring CPUArchState.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 7f833247

cpus.c

+2 −2
Original line number Diff line number Diff line
@@ -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));

    }

}

include/sysemu/kvm.h

+6 −6
Original line number Diff line number Diff line
@@ -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);

    }

}

kvm-all.c

+2 −6
Original line number Diff line number Diff line
@@ -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;

}

kvm-stub.c

+2 −2
Original line number Diff line number Diff line
@@ -41,11 +41,11 @@ void kvm_cpu_synchronize_state(CPUArchState *env) 
{

}



void kvm_cpu_synchronize_post_reset(CPUArchState *env)

void kvm_cpu_synchronize_post_reset(CPUState *cpu)

{

}



void kvm_cpu_synchronize_post_init(CPUArchState *env)

void kvm_cpu_synchronize_post_init(CPUState *cpu)

{

}