From: Andrew Jones Date: Tue, 27 Dec 2016 14:59:24 +0000 (+0000) Subject: hw/intc/arm_gicv3_common: fix aff3 in typer X-Git-Tag: v2.9.0-rc0~173^2~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92204403ef939a1baa1b31bd76716f4566c2a6f1;p=thirdparty%2Fqemu.git hw/intc/arm_gicv3_common: fix aff3 in typer Signed-off-by: Andrew Jones Message-id: 20161209143703.29457-1-drjones@redhat.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c index 0f8c4b86e02..0aa9b9ca665 100644 --- a/hw/intc/arm_gicv3_common.c +++ b/hw/intc/arm_gicv3_common.c @@ -204,7 +204,8 @@ static void arm_gicv3_common_realize(DeviceState *dev, Error **errp) /* The CPU mp-affinity property is in MPIDR register format; squash * the affinity bytes into 32 bits as the GICR_TYPER has them. */ - cpu_affid = (cpu_affid & 0xFF00000000ULL >> 8) | (cpu_affid & 0xFFFFFF); + cpu_affid = ((cpu_affid & 0xFF00000000ULL) >> 8) | + (cpu_affid & 0xFFFFFF); s->cpu[i].gicr_typer = (cpu_affid << 32) | (1 << 24) | (i << 8) |