KVM: arm64: vgic-v3: mark expected switch fall-through
PATCH 1/1 KVM: arm64: vgic-v3: mark expected switch fall-through
Mark switch cases where we are expecting to fall through, fixes the following warning:
arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c: In function ‘__vgic_v3_save_aprs’:arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:351:24: warning: this statement may fall through [-Wimplicit-fallthrough=]
cpu_if->vgic_ap0r[2] = __vgic_v3_read_ap0rn(2);
~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:352:2: note: here
case 6:
^~~~arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:353:24: warning: this statement may fall through [-Wimplicit-fallthrough=]
cpu_if->vgic_ap0r[1] = __vgic_v3_read_ap0rn(1);
~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:354:2: note: here
default:
^~~~~~~arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:361:24: warning: this statement may fall through [-Wimplicit-fallthrough=]
cpu_if->vgic_ap1r[2] = __vgic_v3_read_ap1rn(2);
~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:362:2: note: here
case 6:
^~~~arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:363:24: warning: this statement may fall through [-Wimplicit-fallthrough=]
cpu_if->vgic_ap1r[1] = __vgic_v3_read_ap1rn(1);
~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:364:2: note: here
default:
^~~~~~~arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c: In function ‘__vgic_v3_restore_aprs’:arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:384:3: warning: this statement may fall through [-Wimplicit-fallthrough=]
__vgic_v3_write_ap0rn(cpu_if->vgic_ap0r[2], 2);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:385:2: note: here
case 6:
^~~~arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:386:3: warning: this statement may fall through [-Wimplicit-fallthrough=]
__vgic_v3_write_ap0rn(cpu_if->vgic_ap0r[1], 1);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:387:2: note: here
default:
^~~~~~~arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:394:3: warning: this statement may fall through [-Wimplicit-fallthrough=]
__vgic_v3_write_ap1rn(cpu_if->vgic_ap1r[2], 2);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:395:2: note: here
case 6:
^~~~arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:396:3: warning: this statement may fall through [-Wimplicit-fallthrough=]
__vgic_v3_write_ap1rn(cpu_if->vgic_ap1r[1], 1);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:397:2: note: here
default:
^~~~~~~
--- virt/kvm/arm/hyp/vgic-v3-sr.c | 8 ++++++++ 1 file changed, 8 insertions(+)
virt/kvm/arm/hyp/vgic-v3-sr.c +8 -0
@@ -349,8 +349,10 @@ void __hyp_text __vgic_v3_save_aprs(struct kvm_vcpu *vcpu)case 7 : cpu_if->vgic_ap0r[3 ] =__vgic_v3_read_ap0rn (3 ); cpu_if->vgic_ap0r[2 ] =__vgic_v3_read_ap0rn (2 ); +/* fallthrough */ case 6 : cpu_if->vgic_ap0r[1 ] =__vgic_v3_read_ap0rn (1 ); +/* fallthrough */ default : cpu_if->vgic_ap0r[0 ] =__vgic_v3_read_ap0rn (0 ); }
@@ -359,8 +361,10 @@ void __hyp_text __vgic_v3_save_aprs(struct kvm_vcpu *vcpu)case 7 : cpu_if->vgic_ap1r[3 ] =__vgic_v3_read_ap1rn (3 ); cpu_if->vgic_ap1r[2 ] =__vgic_v3_read_ap1rn (2 ); +/* fallthrough */ case 6 : cpu_if->vgic_ap1r[1 ] =__vgic_v3_read_ap1rn (1 ); +/* fallthrough */ default : cpu_if->vgic_ap1r[0 ] =__vgic_v3_read_ap1rn (0 ); }
@@ -382,8 +386,10 @@ void __hyp_text __vgic_v3_restore_aprs(struct kvm_vcpu *vcpu)case 7 :__vgic_v3_write_ap0rn (cpu_if->vgic_ap0r[3 ],3 );__vgic_v3_write_ap0rn (cpu_if->vgic_ap0r[2 ],2 ); +/* fallthrough */ case 6 :__vgic_v3_write_ap0rn (cpu_if->vgic_ap0r[1 ],1 ); +/* fallthrough */ default :__vgic_v3_write_ap0rn (cpu_if->vgic_ap0r[0 ],0 ); }
@@ -392,8 +398,10 @@ void __hyp_text __vgic_v3_restore_aprs(struct kvm_vcpu *vcpu)case 7 :__vgic_v3_write_ap1rn (cpu_if->vgic_ap1r[3 ],3 );__vgic_v3_write_ap1rn (cpu_if->vgic_ap1r[2 ],2 ); +/* fallthrough */ case 6 :__vgic_v3_write_ap1rn (cpu_if->vgic_ap1r[1 ],1 ); +/* fallthrough */ default :__vgic_v3_write_ap1rn (cpu_if->vgic_ap1r[0 ],0 ); }
Signature · 7 lines
2.21.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Marc Zyngier
maintainerQuoted 98 lines · Matteo Croce
Mark switch cases where we are expecting to fall through, fixes the following warning:
arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c: In function ‘__vgic_v3_save_aprs’:arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:351:24: warning: this statement may fall through [-Wimplicit-fallthrough=]cpu_if->vgic_ap0r[2] = __vgic_v3_read_ap0rn(2); ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:352:2: note: here
case 6:
^~~~arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:353:24: warning: this statement may fall through [-Wimplicit-fallthrough=]cpu_if->vgic_ap0r[1] = __vgic_v3_read_ap0rn(1); ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:354:2: note: here
default:
^~~~~~~arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:361:24: warning: this statement may fall through [-Wimplicit-fallthrough=]cpu_if->vgic_ap1r[2] = __vgic_v3_read_ap1rn(2); ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:362:2: note: here
case 6:
^~~~arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:363:24: warning: this statement may fall through [-Wimplicit-fallthrough=]cpu_if->vgic_ap1r[1] = __vgic_v3_read_ap1rn(1); ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:364:2: note: here
default:
^~~~~~~arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c: In function ‘__vgic_v3_restore_aprs’:arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:384:3: warning: this statement may fall through [-Wimplicit-fallthrough=]__vgic_v3_write_ap0rn(cpu_if->vgic_ap0r[2], 2); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:385:2: note: here
case 6:
^~~~arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:386:3: warning: this statement may fall through [-Wimplicit-fallthrough=]__vgic_v3_write_ap0rn(cpu_if->vgic_ap0r[1], 1); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:387:2: note: here
default:
^~~~~~~arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:394:3: warning: this statement may fall through [-Wimplicit-fallthrough=]__vgic_v3_write_ap1rn(cpu_if->vgic_ap1r[2], 2); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:395:2: note: here
case 6:
^~~~arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:396:3: warning: this statement may fall through [-Wimplicit-fallthrough=]__vgic_v3_write_ap1rn(cpu_if->vgic_ap1r[1], 1); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/arm64/kvm/hyp/../../../../virt/kvm/arm/hyp/vgic-v3-sr.c:397:2: note: here
default:
^~~~~~~Signed-off-by Matteo Croce <[email protected]>--- virt/kvm/arm/hyp/vgic-v3-sr.c | 8 ++++++++ 1 file changed, 8 insertions(+)virt/kvm/arm/hyp/vgic-v3-sr.c +6
-0@@ -349,8 +349,10 @@ void __hyp_text __vgic_v3_save_aprs(struct kvm_vcpu *vcpu)case 7 : cpu_if->vgic_ap0r[3 ] =__vgic_v3_read_ap0rn (3 ); cpu_if->vgic_ap0r[2 ] =__vgic_v3_read_ap0rn (2 ); +/* fallthrough */ case 6 : cpu_if->vgic_ap0r[1 ] =__vgic_v3_read_ap0rn (1 ); +/* fallthrough */ default : cpu_if->vgic_ap0r[0 ] =__vgic_v3_read_ap0rn (0 ); }@@ -359,8 +361,10 @@ void __hyp_text __vgic_v3_save_aprs(struct kvm_vcpu *vcpu)case 7 : cpu_if->vgic_ap1r[3 ] =__vgic_v3_read_ap1rn (3 ); cpu_if->vgic_ap1r[2 ] =__vgic_v3_read_ap1rn (2 ); +/* fallthrough */ case 6 : cpu_if->vgic_ap1r[1 ] =__vgic_v3_read_ap1rn (1 ); +/* fallthrough */ default : cpu_if->vgic_ap1r[0 ] =__vgic_v3_read_ap1rn (0 ); }@@ -382,8 +386,10 @@ void __hyp_text __vgic_v3_restore_aprs(struct kvm_vcpu *vcpu)case 7 :__vgic_v3_write_ap0rn (cpu_if->vgic_ap0r[3 ],3 );__vgic_v3_write_ap0rn (cpu_if->vgic_ap0r[2 ],2 ); +/* fallthrough */ case 6 :__vgic_v3_write_ap0rn (cpu_if->vgic_ap0r[1 ],1 ); +/* fallthrough */ default :__vgic_v3_write_ap0rn (cpu_if->vgic_ap0r[0 ],0 ); }
virt/kvm/arm/hyp/vgic-v3-sr.c void __hyp_text __vgic_v3_restore_aprs(struct kvm_vcpu *vcpu) · line 407
Quoted 10 lines
virt/kvm/arm/hyp/vgic-v3-sr.c +2
-0@@ -392,8 +398,10 @@ void __hyp_text __vgic_v3_restore_aprs(struct kvm_vcpu *vcpu)case 7 :__vgic_v3_write_ap1rn (cpu_if->vgic_ap1r[3 ],3 );__vgic_v3_write_ap1rn (cpu_if->vgic_ap1r[2 ],2 ); +/* fallthrough */ case 6 :__vgic_v3_write_ap1rn (cpu_if->vgic_ap1r[1 ],1 ); +/* fallthrough */ default :__vgic_v3_write_ap1rn (cpu_if->vgic_ap1r[0 ],0 ); }
Already fixed here[1].
M.
Signature · 6 lines
Jazz is not dead, it just smells funny... _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel