From: Roger Pau Monné Date: Mon, 24 Aug 2020 13:35:49 +0000 (+0200) Subject: x86/vpic: fix vpic_elcr_mask macro parameter usage X-Git-Tag: 4.15.0-rc1~896 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=888dd66ea65688f2257ed01d509087fc3a97dcae;p=people%2Fjgross%2Fxen.git x86/vpic: fix vpic_elcr_mask macro parameter usage vpic_elcr_mask wasn't using the v parameter, and instead worked because in the context of the callers v would be vpic. Fix this by correctly using the parameter. While there also remove the unneeded casts to uint8_t and the ending semicolon. No functional change intended. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index 61f4b6784c..936c7b27c6 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -41,7 +41,7 @@ #define vpic_lock(v) spin_lock(__vpic_lock(v)) #define vpic_unlock(v) spin_unlock(__vpic_lock(v)) #define vpic_is_locked(v) spin_is_locked(__vpic_lock(v)) -#define vpic_elcr_mask(v) (vpic->is_master ? (uint8_t)0xf8 : (uint8_t)0xde); +#define vpic_elcr_mask(v) ((v)->is_master ? 0xf8 : 0xde) /* Return the highest priority found in mask. Return 8 if none. */ #define VPIC_PRIO_NONE 8