arm64: KVM: Add braces to multi-line if statement in virtual PMU code

wildea01 · chazy · commit 7d4bd1d2819e · 2016-04-01T13:30:55.000+02:00
The kernel is written in C, not python, so we need braces around
multi-line if statements. GCC 6 actually warns about this, thanks to the
fantastic new "-Wmisleading-indentation" flag:

 | virt/kvm/arm/pmu.c: In function ‘kvm_pmu_overflow_status’:
 | virt/kvm/arm/pmu.c:198:3: warning: statement is indented as if it were guarded by... [-Wmisleading-indentation]
 |    reg &amp;= vcpu_sys_reg(vcpu, PMCNTENSET_EL0);
 |    ^~~
 | arch/arm64/kvm/../../../virt/kvm/arm/pmu.c:196:2: note: ...this ‘if’ clause, but it is not
 |   if ((vcpu_sys_reg(vcpu, PMCR_EL0) &amp; ARMV8_PMU_PMCR_E))
 |   ^~

As it turns out, this particular case is harmless (we just do some &amp;=
operations with 0), but worth fixing nonetheless.

Signed-off-by: Will Deacon &lt;will.deacon@arm.com&gt;
Signed-off-by: Christoffer Dall &lt;christoffer.dall@linaro.org&gt;
diff --git a/virt/kvm/arm/pmu.c b/virt/kvm/arm/pmu.c
@@ -193,11 +193,12 @@ static u64 kvm_pmu_overflow_status(struct kvm_vcpu *vcpu)
 {
 	u64 reg = 0;
 
-	if ((vcpu_sys_reg(vcpu, PMCR_EL0) & ARMV8_PMU_PMCR_E))
+	if ((vcpu_sys_reg(vcpu, PMCR_EL0) & ARMV8_PMU_PMCR_E)) {
 		reg = vcpu_sys_reg(vcpu, PMOVSSET_EL0);
 		reg &= vcpu_sys_reg(vcpu, PMCNTENSET_EL0);
 		reg &= vcpu_sys_reg(vcpu, PMINTENSET_EL1);
 		reg &= kvm_pmu_valid_counter_mask(vcpu);
+	}
 
 	return reg;
 }

Original file line number	Diff line number	Diff line change
`@@ -193,11 +193,12 @@ static u64 kvm_pmu_overflow_status(struct kvm_vcpu *vcpu)`
`193`	`193`	`{`
`194`	`194`	`u64 reg = 0;`
`195`	`195`
`196`		`- if ((vcpu_sys_reg(vcpu, PMCR_EL0) & ARMV8_PMU_PMCR_E))`
	`196`	`+ if ((vcpu_sys_reg(vcpu, PMCR_EL0) & ARMV8_PMU_PMCR_E)) {`
`197`	`197`	`reg = vcpu_sys_reg(vcpu, PMOVSSET_EL0);`
`198`	`198`	`reg &= vcpu_sys_reg(vcpu, PMCNTENSET_EL0);`
`199`	`199`	`reg &= vcpu_sys_reg(vcpu, PMINTENSET_EL1);`
`200`	`200`	`reg &= kvm_pmu_valid_counter_mask(vcpu);`
	`201`	`+ }`
`201`	`202`
`202`	`203`	`return reg;`
`203`	`204`	`}`