From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Tao Su <tao1.su@linux.intel.com>,
Xiaoyao Li <xiaoyao.li@intel.com>,
Markus Armbruster <armbru@redhat.com>
Subject: [PULL 4/6] target/i386: Revert monitor_puts() in do_inject_x86_mce()
Date: Wed, 20 Mar 2024 11:32:11 +0100 [thread overview]
Message-ID: <20240320103213.1048405-5-pbonzini@redhat.com> (raw)
In-Reply-To: <20240320103213.1048405-1-pbonzini@redhat.com>
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
next prev parent reply other threads:[~2024-03-20 10:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-20 10:32 [PULL 0/6] QEMU bug fixes for 20240320 Paolo Bonzini
2024-03-20 10:32 ` [PULL 1/6] target/i386: fix direction of "32-bit MMU" test Paolo Bonzini
2024-03-20 10:32 ` [PULL 2/6] vl: convert qemu_machine_creation_done() to Error ** Paolo Bonzini
2024-03-20 10:32 ` [PULL 3/6] vl: do not assert if sev-guest is used together with TCG Paolo Bonzini
2024-03-20 10:32 ` Paolo Bonzini [this message]
2024-03-20 10:32 ` [PULL 5/6] tests/plugins: fix use-after-free bug Paolo Bonzini
2024-03-20 10:32 ` [PULL 6/6] meson: remove dead dictionary access Paolo Bonzini
2024-03-20 16:58 ` [PULL 0/6] QEMU bug fixes for 20240320 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240320103213.1048405-5-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=tao1.su@linux.intel.com \
--cc=xiaoyao.li@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.