From nobody Wed May 15 04:01:12 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1710923874; cv=none; d=zohomail.com; s=zohoarc; b=R9/Eon+aNF84oeWNAN6KE0iIvsaJlkFdyOWVdl8BGXpY5N/ADnjG7EyQVL0es0xh9se8NXIXixoVA5IU/eQauwhJgj0OHPOQW+mvD/GaqqsNQVcc4OVxMNdWwks9zeZskjHXauLwomUU9WNlQme/89e1lSPUFQME3mZMjmmBsAA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710923874; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=I3OtV336bsVLtUGiHIOFUg8Bue0wPJVfB3sQ93GyyEE=; b=E1hjB9Ms6hThe/p4R0wOiQI3KQEGqcFN/dX6GDl0RLtuDfRaKQLnf763oCubbK+u5ji/gWmew7IgyQ1qSeAXNKSMgD6Er48N9JadkrDdEa7kjrMjVQ7lQnMuF61byVL48GcbfnLvUOalopVahnK3yiwIFB5FtQ+Fmg9qpWjDDf0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710923874040985.1206855129949; Wed, 20 Mar 2024 01:37:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rmrSG-0001bG-QM; Wed, 20 Mar 2024 04:37:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmrSF-0001b4-Jp for qemu-devel@nongnu.org; Wed, 20 Mar 2024 04:37:47 -0400 Received: from mgamail.intel.com ([192.198.163.12]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmrSD-0006Xw-MH for qemu-devel@nongnu.org; Wed, 20 Mar 2024 04:37:47 -0400 Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2024 01:37:43 -0700 Received: from st-server.bj.intel.com ([10.240.193.102]) by fmviesa007.fm.intel.com with ESMTP; 20 Mar 2024 01:37:41 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1710923866; x=1742459866; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=/WOtNChErkTECWXLaSZye7ujURhkRbblG95vN+VMjEs=; b=HjdUG/SZUWPiG/LwGValbbcuvjWBCMKitGOaCk8AfozU/e54hH8En2jd Y8PhZoz59NvYgvx7MyIRG7+95gKchArYlSflGQS2wDVVUMhzlDt2MjL+H GDowRSohDp2kzssd1TexNix9VltnNfKc/6SR60N0izXDFtPAQ9VskIiWx KZcITFEX6NAlbnrO+BRaaNj8ICnGEaZbnsef7XS6T+rqaNIRAgHiSa4GD PzQ57YhOa+w2y8XJDbEQuYG6vc8lClMdquA7fEGcqQqVFDqnHFDsBJ/tW Ghv6XCIdlch8BuIKwFfF4D0xZE9u3SWv2eOmciTKBFwwalnAfqj/iI611 A==; X-IronPort-AV: E=McAfee;i="6600,9927,11018"; a="9603567" X-IronPort-AV: E=Sophos;i="6.07,139,1708416000"; d="scan'208";a="9603567" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,139,1708416000"; d="scan'208";a="14059640" From: Tao Su To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, xiaoyao.li@intel.com, alex.bennee@linaro.org, armbru@redhat.com, philmd@linaro.org, tao1.su@linux.intel.com Subject: [PATCH v2] target/i386: Revert monitor_puts() in do_inject_x86_mce() Date: Wed, 20 Mar 2024 16:36:40 +0800 Message-Id: <20240320083640.523287-1-tao1.su@linux.intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=192.198.163.12; envelope-from=tao1.su@linux.intel.com; helo=mgamail.intel.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.422, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1710923875586100001 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Markus Armbruster Signed-off-by: Tao Su --- v1 -> v2: - Instead revert the broken part of commit bf0c50d4aa85 - Add Markus's Reviewed-by v1: - https://lore.kernel.org/all/20240320052118.520378-1-tao1.su@linux.intel.c= om/ --- 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 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; base-commit: c62d54d0a8067ffb3d5b909276f7296d7df33fa7 --=20 2.34.1