From nobody Mon Feb 9 12:11:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1691136261250940.7800888440045; Fri, 4 Aug 2023 01:04:21 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.576964.903719 (Exim 4.92) (envelope-from ) id 1qRpn0-0007r7-81; Fri, 04 Aug 2023 08:04:02 +0000 Received: by outflank-mailman (output) from mailman id 576964.903719; Fri, 04 Aug 2023 08:04:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qRpn0-0007qy-54; Fri, 04 Aug 2023 08:04:02 +0000 Received: by outflank-mailman (input) for mailman id 576964; Fri, 04 Aug 2023 08:04:00 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qRpmy-0007Qe-Dc for xen-devel@lists.xenproject.org; Fri, 04 Aug 2023 08:04:00 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 7729fcc9-329d-11ee-8613-37d641c3527e; Fri, 04 Aug 2023 10:03:58 +0200 (CEST) Received: from nico.bugseng.com (unknown [147.123.100.131]) by support.bugseng.com (Postfix) with ESMTPSA id 9E6BB4EE0742; Fri, 4 Aug 2023 10:03:57 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 7729fcc9-329d-11ee-8613-37d641c3527e From: Nicola Vetrini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, michal.orzel@amd.com, xenia.ragiadakou@amd.com, ayan.kumar.halder@amd.com, consulting@bugseng.com, Nicola Vetrini , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu , George Dunlap , Julien Grall Subject: [XEN PATCH v2 3/4] x86/irq: rename variable to address MISRA C:2012 Rule 5.3 Date: Fri, 4 Aug 2023 10:03:35 +0200 Message-Id: <987ebd142ebd69ed062d74f7eb69c23759c51636.1691135862.git.nicola.vetrini@bugseng.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1691136262941100001 Content-Type: text/plain; charset="utf-8" The extern variable 'irq_desc' defined in 'irq.h' is shadowed by local variables in the changed file. To avoid this, the variable is renamed to 'irq_description'. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini --- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/include/asm/irq.h | 2 +- xen/arch/x86/io_apic.c | 10 +++++----- xen/arch/x86/irq.c | 12 ++++++------ xen/arch/x86/msi.c | 4 ++-- xen/include/xen/irq.h | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 2180abeb33..ca5bb96388 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -474,7 +474,7 @@ void hvm_migrate_pirq(struct hvm_pirq_dpci *pirq_dpci, = const struct vcpu *v) =20 if ( !desc ) return; - ASSERT(MSI_IRQ(desc - irq_desc)); + ASSERT(MSI_IRQ(desc - irq_descriptor)); irq_set_affinity(desc, cpumask_of(v->processor)); spin_unlock_irq(&desc->lock); } diff --git a/xen/arch/x86/include/asm/irq.h b/xen/arch/x86/include/asm/irq.h index ad907fc97f..f6df977170 100644 --- a/xen/arch/x86/include/asm/irq.h +++ b/xen/arch/x86/include/asm/irq.h @@ -172,7 +172,7 @@ int assign_irq_vector(int irq, const cpumask_t *mask); =20 void cf_check irq_complete_move(struct irq_desc *desc); =20 -extern struct irq_desc *irq_desc; +extern struct irq_desc *irq_descriptor; =20 void lock_vector_lock(void); void unlock_vector_lock(void); diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index b3afef8933..b59d6cfb9e 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -990,9 +990,9 @@ static inline void ioapic_register_intr(int irq, unsign= ed long trigger) { if ((trigger =3D=3D IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) || trigger =3D=3D IOAPIC_LEVEL) - irq_desc[irq].handler =3D &ioapic_level_type; + irq_descriptor[irq].handler =3D &ioapic_level_type; else - irq_desc[irq].handler =3D &ioapic_edge_type; + irq_descriptor[irq].handler =3D &ioapic_edge_type; } =20 static void __init setup_IO_APIC_irqs(void) @@ -1098,7 +1098,7 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int= apic, unsigned int pin, in * The timer IRQ doesn't have to know that behind the * scene we have a 8259A-master in AEOI mode ... */ - irq_desc[0].handler =3D &ioapic_edge_type; + irq_descriptor[0].handler =3D &ioapic_edge_type; =20 /* * Add it to the IO-APIC irq-routing table: @@ -1912,7 +1912,7 @@ static void __init check_timer(void) if ((ret =3D bind_irq_vector(0, vector, &cpumask_all))) printk(KERN_ERR"..IRQ0 is not set correctly with ioapic!!!, err:%d= \n", ret); =20 - irq_desc[0].status &=3D ~IRQ_DISABLED; + irq_descriptor[0].status &=3D ~IRQ_DISABLED; =20 /* * Subtle, code in do_timer_interrupt() expects an AEOI @@ -2009,7 +2009,7 @@ static void __init check_timer(void) printk(KERN_INFO "...trying to set up timer as Virtual Wire IRQ..."); =20 disable_8259A_irq(irq_to_desc(0)); - irq_desc[0].handler =3D &lapic_irq_type; + irq_descriptor[0].handler =3D &lapic_irq_type; apic_write(APIC_LVT0, APIC_DM_FIXED | vector); /* Fixed mode */ enable_8259A_irq(irq_to_desc(0)); =20 diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 6abfd81621..ed95896bce 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -45,7 +45,7 @@ integer_param("irq-max-guests", irq_max_guests); =20 vmask_t global_used_vector_map; =20 -struct irq_desc __read_mostly *irq_desc =3D NULL; +struct irq_desc __read_mostly *irq_descriptor =3D NULL; =20 static DECLARE_BITMAP(used_vectors, X86_NR_VECTORS); =20 @@ -424,9 +424,9 @@ int __init init_irq_data(void) for ( vector =3D 0; vector < X86_NR_VECTORS; ++vector ) this_cpu(vector_irq)[vector] =3D INT_MIN; =20 - irq_desc =3D xzalloc_array(struct irq_desc, nr_irqs); - =20 - if ( !irq_desc ) + irq_descriptor =3D xzalloc_array(struct irq_desc, nr_irqs); + + if ( !irq_descriptor ) return -ENOMEM; =20 for ( irq =3D 0; irq < nr_irqs_gsi; irq++ ) @@ -1133,7 +1133,7 @@ static void cf_check set_eoi_ready(void *data); static void cf_check irq_guest_eoi_timer_fn(void *data) { struct irq_desc *desc =3D data; - unsigned int i, irq =3D desc - irq_desc; + unsigned int i, irq =3D desc - irq_descriptor; irq_guest_action_t *action; =20 spin_lock_irq(&desc->lock); @@ -1382,7 +1382,7 @@ static void __set_eoi_ready(const struct irq_desc *de= sc) struct pending_eoi *peoi =3D this_cpu(pending_eoi); int irq, sp; =20 - irq =3D desc - irq_desc; + irq =3D desc - irq_descriptor; =20 if ( !action || action->in_flight || !cpumask_test_and_clear_cpu(smp_processor_id(), diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index d0bf63df1d..35d417c63a 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -1322,7 +1322,7 @@ int pci_restore_msi_state(struct pci_dev *pdev) unsigned int i =3D 0, nr =3D 1; =20 irq =3D entry->irq; - desc =3D &irq_desc[irq]; + desc =3D &irq_descriptor[irq]; =20 spin_lock_irqsave(&desc->lock, flags); =20 @@ -1377,7 +1377,7 @@ int pci_restore_msi_state(struct pci_dev *pdev) break; =20 spin_unlock_irqrestore(&desc->lock, flags); - desc =3D &irq_desc[entry[++i].irq]; + desc =3D &irq_descriptor[entry[++i].irq]; spin_lock_irqsave(&desc->lock, flags); if ( desc->msi_desc !=3D entry + i ) goto bogus; diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h index 9747e818f7..56a3aa6a29 100644 --- a/xen/include/xen/irq.h +++ b/xen/include/xen/irq.h @@ -107,7 +107,7 @@ typedef struct irq_desc { } __cacheline_aligned irq_desc_t; =20 #ifndef irq_to_desc -#define irq_to_desc(irq) (&irq_desc[irq]) +#define irq_to_desc(irq) (&irq_descriptor[irq]) #endif =20 int init_one_irq_desc(struct irq_desc *desc); --=20 2.34.1