[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/6] target/i386: Revert monitor_puts() in do_inject_x86_mce()
From: |
Paolo Bonzini |
Subject: |
[PULL 4/6] target/i386: Revert monitor_puts() in do_inject_x86_mce() |
Date: |
Wed, 20 Mar 2024 11:32:11 +0100 |
From: Tao Su <tao1.su@linux.intel.com>
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>
---
target/i386/helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/i386/helper.c b/target/i386/helper.c
index 2070dd0dda1..23ccb23a5b4 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;
--
2.44.0
- [PULL 0/6] QEMU bug fixes for 20240320, Paolo Bonzini, 2024/03/20
- [PULL 1/6] target/i386: fix direction of "32-bit MMU" test, Paolo Bonzini, 2024/03/20
- [PULL 4/6] target/i386: Revert monitor_puts() in do_inject_x86_mce(),
Paolo Bonzini <=
- [PULL 5/6] tests/plugins: fix use-after-free bug, Paolo Bonzini, 2024/03/20
- [PULL 3/6] vl: do not assert if sev-guest is used together with TCG, Paolo Bonzini, 2024/03/20
- [PULL 6/6] meson: remove dead dictionary access, Paolo Bonzini, 2024/03/20
- [PULL 2/6] vl: convert qemu_machine_creation_done() to Error **, Paolo Bonzini, 2024/03/20
- Re: [PULL 0/6] QEMU bug fixes for 20240320, Peter Maydell, 2024/03/20