OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

cpu: Pass CPUState to *cpu_synchronize_post*()

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

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Igor Mammedov 2013-04-11 16:51:41 +02:00 committed by Andreas Färber
parent 7f833247df
commit 3f24a58fa7
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpus.c
View File

@ -419,7 +419,7 @@ void cpu_synchronize_all_post_reset(void)
CPUArchState *cpu; CPUArchState *cpu;
for (cpu = first_cpu; cpu; cpu = cpu->next_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; CPUArchState *cpu;
for (cpu = first_cpu; cpu; cpu = cpu->next_cpu) { for (cpu = first_cpu; cpu; cpu = cpu->next_cpu) {
cpu_synchronize_post_init(cpu); cpu_synchronize_post_init(ENV_GET_CPU(cpu));
} }
} }

12
include/sysemu/kvm.h
View File

@ -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 kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function,
uint32_t index, int reg); uint32_t index, int reg);
void kvm_cpu_synchronize_state(CPUArchState *env); 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);
/* generic hooks - to be moved/refactored once there are more users */ /* 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()) { 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()) { if (kvm_enabled()) {
kvm_cpu_synchronize_post_init(env); kvm_cpu_synchronize_post_init(cpu);
} }
} }

8
kvm-all.c
View File

@ -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); kvm_arch_put_registers(cpu, KVM_PUT_RESET_STATE);
cpu->kvm_vcpu_dirty = false; 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); kvm_arch_put_registers(cpu, KVM_PUT_FULL_STATE);
cpu->kvm_vcpu_dirty = false; cpu->kvm_vcpu_dirty = false;
} }

4
kvm-stub.c
View File

@ -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)
{ {
} }