gwj / at91sam9263 · Commits

Commit d154615d94d8fefea57d01f5f17f20d757d8f649

Authored by aliguori
1 parent e22a25c9

monitor: sync from kvm state before generating output (Jan Kiszka) 

Ported from the KVM tree: Synchronize the qemu cpu state with kvm's
before invoking various monitor info commands (like 'info registers').

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6826 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 2 additions and 0 deletions
monitor.c
  View file @d154615
@@ -318,6 +318,7 @@ static CPUState *mon_get_cpu(void) @@ -318,6 +318,7 @@ static CPUState *mon_get_cpu(void)
318 if (!cur_mon->mon_cpu) { 318 if (!cur_mon->mon_cpu) {
319 mon_set_cpu(0); 319 mon_set_cpu(0);
320 } 320 }
  321 + cpu_synchronize_state(cur_mon->mon_cpu, 0);
321 return cur_mon->mon_cpu; 322 return cur_mon->mon_cpu;
322 } 323 }
323 324
@@ -344,6 +345,7 @@ static void do_info_cpus(Monitor *mon) @@ -344,6 +345,7 @@ static void do_info_cpus(Monitor *mon)
344 mon_get_cpu(); 345 mon_get_cpu();
345 346
346 for(env = first_cpu; env != NULL; env = env->next_cpu) { 347 for(env = first_cpu; env != NULL; env = env->next_cpu) {
  348 + cpu_synchronize_state(env, 0);
347 monitor_printf(mon, "%c CPU #%d:", 349 monitor_printf(mon, "%c CPU #%d:",
348 (env == mon->mon_cpu) ? '*' : ' ', 350 (env == mon->mon_cpu) ? '*' : ' ',
349 env->cpu_index); 351 env->cpu_index);