From: Jan Beulich <jbeulich@suse.com>
Date: Tue, 25 Feb 2025 07:45:46 +0000 (+0100)
Subject: x86/PV: don't half-open-code SIF_PM_MASK
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=20ae01c041f8f28f6adfdfbfcd9f008c4f6255d6;p=people%2Froyger%2Fxen.git

x86/PV: don't half-open-code SIF_PM_MASK

Avoid using the same literal number (8) in two distinct places, by using
MASK_INTR() to avoid opencoding the literal 8.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c
index f54d1da5c6..96e28c7b6a 100644
--- a/xen/arch/x86/pv/dom0_build.c
+++ b/xen/arch/x86/pv/dom0_build.c
@@ -886,7 +886,7 @@ static int __init dom0_construct(struct boot_info *bi, struct domain *d)
         si->flags    = SIF_PRIVILEGED | SIF_INITDOMAIN;
     if ( !vinitrd_start && initrd_len )
         si->flags   |= SIF_MOD_START_PFN;
-    si->flags       |= (xen_processor_pmbits << 8) & SIF_PM_MASK;
+    si->flags       |= MASK_INSR(xen_processor_pmbits, SIF_PM_MASK);
     si->pt_base      = vpt_start;
     si->nr_pt_frames = nr_pt_pages;
     si->mfn_list     = vphysmap_start;