x86/xen: Drop xen_irq_ops

Instead of having a pre-filled array xen_irq_ops for Xen PV paravirt
functions, drop the array and assign each element individually.

This is in preparation of reducing the paravirt include hell by
splitting paravirt.h into multiple more fine grained header files,
which will in turn require to split up the pv_ops vector as well.
Dropping the pre-filled array makes life easier for objtool to
detect missing initializers in multiple pv_ops_ arrays.

Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Link: https://patch.msgid.link/20260105110520.21356-16-jgross@suse.com

diff --git a/arch/x86/xen/irq.c b/arch/x86/xen/irq.c
index 39982f955cfe933ae33bf9db509372511eec8915..d8678c3d3971987d5100afc49a8c37473042e162 100644 (file)
--- a/arch/x86/xen/irq.c
+++ b/arch/x86/xen/irq.c
@@ -40,20 +40,14 @@ static void xen_halt(void)
                xen_safe_halt();
 }
 
-static const typeof(pv_ops) xen_irq_ops __initconst = {
-       .irq = {
-               /* Initial interrupt flag handling only called while interrupts off. */
-               .save_fl = __PV_IS_CALLEE_SAVE(paravirt_ret0),
-               .irq_disable = __PV_IS_CALLEE_SAVE(paravirt_nop),
-               .irq_enable = __PV_IS_CALLEE_SAVE(BUG_func),
-
-               .safe_halt = xen_safe_halt,
-               .halt = xen_halt,
-       },
-};
-
 void __init xen_init_irq_ops(void)
 {
-       pv_ops.irq = xen_irq_ops.irq;
+       /* Initial interrupt flag handling only called while interrupts off. */
+       pv_ops.irq.save_fl = __PV_IS_CALLEE_SAVE(paravirt_ret0);
+       pv_ops.irq.irq_disable = __PV_IS_CALLEE_SAVE(paravirt_nop);
+       pv_ops.irq.irq_enable = __PV_IS_CALLEE_SAVE(BUG_func);
+       pv_ops.irq.safe_halt = xen_safe_halt;
+       pv_ops.irq.halt = xen_halt;
+
        x86_init.irqs.intr_init = xen_init_IRQ;
 }

diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 3f7999317f4dfacbcec5163a536556873221a0f6..0c32a92dc693586166933be4133d762447fe4466 100644 (file)
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -571,7 +571,6 @@ static int init_pv_ops(struct objtool_file *file)
        static const char *pv_ops_tables[] = {
                "pv_ops",
                "xen_cpu_ops",
-               "xen_irq_ops",
                "xen_mmu_ops",
                NULL,
        };