From patchwork Fri Feb 2 09:37:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simone Ballarin X-Patchwork-Id: 13542560 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0A2D3C4828E for ; Fri, 2 Feb 2024 09:38:52 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.674922.1050120 (Exim 4.92) (envelope-from ) id 1rVq0S-0006Zo-Bj; Fri, 02 Feb 2024 09:38:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 674922.1050120; Fri, 02 Feb 2024 09:38:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVq0S-0006Zf-7d; Fri, 02 Feb 2024 09:38:44 +0000 Received: by outflank-mailman (input) for mailman id 674922; Fri, 02 Feb 2024 09:38:43 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rVq0R-0006GX-3x for xen-devel@lists.xenproject.org; Fri, 02 Feb 2024 09:38:43 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id d8f2270f-c1ae-11ee-8a43-1f161083a0e0; Fri, 02 Feb 2024 10:38:41 +0100 (CET) Received: from beta.station (net-188-218-67-100.cust.vodafonedsl.it [188.218.67.100]) by support.bugseng.com (Postfix) with ESMTPSA id 97E9E4EE073D; Fri, 2 Feb 2024 10:38:39 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: d8f2270f-c1ae-11ee-8a43-1f161083a0e0 From: Simone Ballarin To: xen-devel@lists.xenproject.org Cc: consulting@bugseng.com, sstabellini@kernel.org, Simone Ballarin , Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Wei Liu Subject: [PATCH v3 3/4] xen/x86: address violations of MISRA C:2012 Rule 13.1 Date: Fri, 2 Feb 2024 10:37:46 +0100 Message-Id: <7e54cfeaffea70f567d248779c092c4005e93a36.1706700228.git.maria.celeste.cesario@bugseng.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Rule 13.1: Initializer lists shall not contain persistent side effects This patch moves expressions with side-effects into new variables before the initializer lists. No functional changes. Signed-off-by: Simone Ballarin --- xen/arch/x86/io_apic.c | 9 ++++++--- xen/arch/x86/mpparse.c | 3 ++- xen/arch/x86/setup.c | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index b48a642465..4a6ab85689 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -2559,9 +2559,12 @@ integer_param("max_gsi_irqs", max_gsi_irqs); static __init bool bad_ioapic_register(unsigned int idx) { - union IO_APIC_reg_00 reg_00 = { .raw = io_apic_read(idx, 0) }; - union IO_APIC_reg_01 reg_01 = { .raw = io_apic_read(idx, 1) }; - union IO_APIC_reg_02 reg_02 = { .raw = io_apic_read(idx, 2) }; + uint32_t reg_00_raw = io_apic_read(idx, 0); + uint32_t reg_01_raw = io_apic_read(idx, 1); + uint32_t reg_02_raw = io_apic_read(idx, 2); + union IO_APIC_reg_00 reg_00 = { .raw = reg_00_raw }; + union IO_APIC_reg_01 reg_01 = { .raw = reg_01_raw }; + union IO_APIC_reg_02 reg_02 = { .raw = reg_02_raw }; if ( reg_00.raw == -1 && reg_01.raw == -1 && reg_02.raw == -1 ) { diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index d8ccab2449..81a819403b 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -798,11 +798,12 @@ void __init mp_register_lapic_address ( int mp_register_lapic(u32 id, bool enabled, bool hotplug) { + u32 apic = apic_read(APIC_LVR); struct mpc_config_processor processor = { .mpc_type = MP_PROCESSOR, /* Note: We don't fill in fields not consumed anywhere. */ .mpc_apicid = id, - .mpc_apicver = GET_APIC_VERSION(apic_read(APIC_LVR)), + .mpc_apicver = GET_APIC_VERSION(apic), .mpc_cpuflag = (enabled ? CPU_ENABLED : 0) | (id == boot_cpu_physical_apicid ? CPU_BOOTPROCESSOR : 0), diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index ee682dd136..886031d86a 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -885,13 +885,14 @@ static struct domain *__init create_dom0(const module_t *image, { static char __initdata cmdline[MAX_GUEST_CMDLINE]; + unsigned int max_vcpus = dom0_max_vcpus(); struct xen_domctl_createdomain dom0_cfg = { .flags = IS_ENABLED(CONFIG_TBOOT) ? XEN_DOMCTL_CDF_s3_integrity : 0, .max_evtchn_port = -1, .max_grant_frames = -1, .max_maptrack_frames = -1, .grant_opts = XEN_DOMCTL_GRANT_version(opt_gnttab_max_version), - .max_vcpus = dom0_max_vcpus(), + .max_vcpus = max_vcpus, .arch = { .misc_flags = opt_dom0_msr_relaxed ? XEN_X86_MSR_RELAXED : 0, },