Skip to content

Commit

Permalink
target/i386: Revert monitor_puts() in do_inject_x86_mce()
Browse files Browse the repository at this point in the history
monitor_puts() doesn't check the monitor pointer, but do_inject_x86_mce()
may have a parameter with NULL monitor pointer. Revert monitor_puts() in
do_inject_x86_mce() to fix, then the fact that we send the same message to
monitor and log is again more obvious.

Fixes: bf0c50d (monitor: expose monitor_puts to rest of code)
Reviwed-by: Xiaoyao Li <xiaoyao.li@intel.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Tao Su <tao1.su@linux.intel.com>
Message-ID: <20240320083640.523287-1-tao1.su@linux.intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit 7fd226b)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
  • Loading branch information
taosu-linux authored and Michael Tokarev committed Apr 5, 2024
1 parent e4b2389 commit da2956e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion target/i386/helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ static void do_inject_x86_mce(CPUState *cs, run_on_cpu_data data)
if (need_reset) {
emit_guest_memory_failure(MEMORY_FAILURE_ACTION_RESET, ar,
recursive);
monitor_puts(params->mon, msg);
monitor_printf(params->mon, "%s", msg);
qemu_log_mask(CPU_LOG_RESET, "%s\n", msg);
qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);
return;
Expand Down

0 comments on commit da2956e

Please sign in to comment.