Skip to content

Commit

Permalink
Introduce cpu_clean_all_dirty
Browse files Browse the repository at this point in the history
Introduce cpu_clean_all_dirty, to force subsequent cpu_synchronize_all_states
to read in-kernel register state.

Cc: qemu-stable@nongnu.org
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit de9d61e)
Conflicts:
	kvm-all.c

*removed context dependency on kvm_cpu_synchronize_post_init

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
  • Loading branch information
matosatti authored and mdroth committed Dec 24, 2014
1 parent 3807aeb commit a9ed615
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 0 deletions.
9 changes: 9 additions & 0 deletions cpus.c
Expand Up @@ -523,6 +523,15 @@ void cpu_synchronize_all_post_init(void)
}
}

void cpu_clean_all_dirty(void)
{
CPUState *cpu;

CPU_FOREACH(cpu) {
cpu_clean_state(cpu);
}
}

static int do_vm_stop(RunState state)
{
int ret = 0;
Expand Down
1 change: 1 addition & 0 deletions include/sysemu/cpus.h
Expand Up @@ -10,6 +10,7 @@ void cpu_stop_current(void);
void cpu_synchronize_all_states(void);
void cpu_synchronize_all_post_reset(void);
void cpu_synchronize_all_post_init(void);
void cpu_clean_all_dirty(void);

void qtest_clock_warp(int64_t dest);

Expand Down
8 changes: 8 additions & 0 deletions include/sysemu/kvm.h
Expand Up @@ -348,6 +348,7 @@ int kvm_physical_memory_addr_from_host(KVMState *s, void *ram_addr,
void kvm_cpu_synchronize_state(CPUState *cpu);
void kvm_cpu_synchronize_post_reset(CPUState *cpu);
void kvm_cpu_synchronize_post_init(CPUState *cpu);
void kvm_cpu_clean_state(CPUState *cpu);

/* generic hooks - to be moved/refactored once there are more users */

Expand All @@ -372,6 +373,13 @@ static inline void cpu_synchronize_post_init(CPUState *cpu)
}
}

static inline void cpu_clean_state(CPUState *cpu)
{
if (kvm_enabled()) {
kvm_cpu_clean_state(cpu);
}
}

int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg);
int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg);
void kvm_irqchip_release_virq(KVMState *s, int virq);
Expand Down
5 changes: 5 additions & 0 deletions kvm-all.c
Expand Up @@ -1681,6 +1681,11 @@ void kvm_cpu_synchronize_post_init(CPUState *cpu)
cpu->kvm_vcpu_dirty = false;
}

void kvm_cpu_clean_state(CPUState *cpu)
{
cpu->kvm_vcpu_dirty = false;
}

int kvm_cpu_exec(CPUState *cpu)
{
struct kvm_run *run = cpu->kvm_run;
Expand Down

0 comments on commit a9ed615

Please sign in to comment.