Skip to content

Commit

Permalink
vl: Move cpu_synchronize_all_states() into qemu_system_reset()
Browse files Browse the repository at this point in the history
There are currently 3 calls to qemu_system_reset() in vl.c.  Two of them
are immediately preceded by a cpu_synchronize_all_states9) and the
remaining one should be.

The one which doesn't is the very first reset called directly from main().
Without a cpu_synchronize_all_states(), kvm_vcpu_dirty is false at this
point from the earlier cpu_synchronize_all_post_init().  That's incorrect
because the reset path is quite likely to update the CPU state, and that
updated state should be pushed back to KVM, not overwritten with stale
data pushed to KVM immediately after init.

This patch moves the call to cpu_synchronize_all_states() into
qemu_system_reset() for safety, so it is always called.  AFAICT this should
be safe for the handful of callers outside vl.c - these all appear to be in
places where the cpu state is already synchronized so the extra call
will be a no-op.

Signed-off-by: David Gibson <[email protected]>
Acked-by: Paolo Bonzini <[email protected]>
Tested-by: Laurent Vivier <[email protected]>
  • Loading branch information
dgibson committed Apr 5, 2016
1 parent f40eb92 commit efdaf79
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions vl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1745,6 +1745,8 @@ void qemu_system_reset(bool report)

mc = current_machine ? MACHINE_GET_CLASS(current_machine) : NULL;

cpu_synchronize_all_states();

if (mc && mc->reset) {
mc->reset();
} else {
Expand Down Expand Up @@ -1893,7 +1895,6 @@ static bool main_loop_should_exit(void)
}
if (qemu_reset_requested()) {
pause_all_vcpus();
cpu_synchronize_all_states();
qemu_system_reset(VMRESET_REPORT);
resume_all_vcpus();
if (!runstate_check(RUN_STATE_RUNNING) &&
Expand All @@ -1903,7 +1904,6 @@ static bool main_loop_should_exit(void)
}
if (qemu_wakeup_requested()) {
pause_all_vcpus();
cpu_synchronize_all_states();
qemu_system_reset(VMRESET_SILENT);
notifier_list_notify(&wakeup_notifiers, &wakeup_reason);
wakeup_reason = QEMU_WAKEUP_REASON_NONE;
Expand Down

0 comments on commit efdaf79

Please sign in to comment.