summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorTao Su <tao1.su@linux.intel.com>2024-03-20 16:36:40 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2024-03-20 09:47:00 +0100
commit7fd226b04746f0be0b636de5097f1b42338951a0 (patch)
treef60cfa43e5758cd24bc7af345819804740c4d992
parent3343f296ff9474ce2c3b73ff25b6eece18799216 (diff)
downloadfocaccia-qemu-7fd226b04746f0be0b636de5097f1b42338951a0.tar.gz
focaccia-qemu-7fd226b04746f0be0b636de5097f1b42338951a0.zip
target/i386: Revert monitor_puts() in do_inject_x86_mce()
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: bf0c50d4aa85 (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>
-rw-r--r--target/i386/helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/i386/helper.c b/target/i386/helper.c
index 2070dd0dda..23ccb23a5b 100644
--- a/target/i386/helper.c
+++ b/target/i386/helper.c
@@ -430,7 +430,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;