Skip to content

Commit cdb2d3e

Browse files
roxellMarc Zyngier
authored andcommitted
arm64: KVM: hyp: debug-sr: Mark expected switch fall-through
When fall-through warnings was enabled by default the following warnings was starting to show up: ../arch/arm64/kvm/hyp/debug-sr.c: In function ‘__debug_save_state’: ../arch/arm64/kvm/hyp/debug-sr.c:20:19: warning: this statement may fall through [-Wimplicit-fallthrough=] case 15: ptr[15] = read_debug(reg, 15); \ ../arch/arm64/kvm/hyp/debug-sr.c:113:2: note: in expansion of macro ‘save_debug’ save_debug(dbg->dbg_bcr, dbgbcr, brps); ^~~~~~~~~~ ../arch/arm64/kvm/hyp/debug-sr.c:21:2: note: here case 14: ptr[14] = read_debug(reg, 14); \ ^~~~ ../arch/arm64/kvm/hyp/debug-sr.c:113:2: note: in expansion of macro ‘save_debug’ save_debug(dbg->dbg_bcr, dbgbcr, brps); ^~~~~~~~~~ ../arch/arm64/kvm/hyp/debug-sr.c:21:19: warning: this statement may fall through [-Wimplicit-fallthrough=] case 14: ptr[14] = read_debug(reg, 14); \ ../arch/arm64/kvm/hyp/debug-sr.c:113:2: note: in expansion of macro ‘save_debug’ save_debug(dbg->dbg_bcr, dbgbcr, brps); ^~~~~~~~~~ ../arch/arm64/kvm/hyp/debug-sr.c:22:2: note: here case 13: ptr[13] = read_debug(reg, 13); \ ^~~~ ../arch/arm64/kvm/hyp/debug-sr.c:113:2: note: in expansion of macro ‘save_debug’ save_debug(dbg->dbg_bcr, dbgbcr, brps); ^~~~~~~~~~ Rework to add a 'Fall through' comment where the compiler warned about fall-through, hence silencing the warning. Fixes: d93512e ("Makefile: Globally enable fall-through warning") Signed-off-by: Anders Roxell <[email protected]> [maz: fixed commit message] Signed-off-by: Marc Zyngier <[email protected]>
1 parent 6701c61 commit cdb2d3e

File tree

1 file changed

+30
-0
lines changed

1 file changed

+30
-0
lines changed

arch/arm64/kvm/hyp/debug-sr.c

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,40 +18,70 @@
1818
#define save_debug(ptr,reg,nr) \
1919
switch (nr) { \
2020
case 15: ptr[15] = read_debug(reg, 15); \
21+
/* Fall through */ \
2122
case 14: ptr[14] = read_debug(reg, 14); \
23+
/* Fall through */ \
2224
case 13: ptr[13] = read_debug(reg, 13); \
25+
/* Fall through */ \
2326
case 12: ptr[12] = read_debug(reg, 12); \
27+
/* Fall through */ \
2428
case 11: ptr[11] = read_debug(reg, 11); \
29+
/* Fall through */ \
2530
case 10: ptr[10] = read_debug(reg, 10); \
31+
/* Fall through */ \
2632
case 9: ptr[9] = read_debug(reg, 9); \
33+
/* Fall through */ \
2734
case 8: ptr[8] = read_debug(reg, 8); \
35+
/* Fall through */ \
2836
case 7: ptr[7] = read_debug(reg, 7); \
37+
/* Fall through */ \
2938
case 6: ptr[6] = read_debug(reg, 6); \
39+
/* Fall through */ \
3040
case 5: ptr[5] = read_debug(reg, 5); \
41+
/* Fall through */ \
3142
case 4: ptr[4] = read_debug(reg, 4); \
43+
/* Fall through */ \
3244
case 3: ptr[3] = read_debug(reg, 3); \
45+
/* Fall through */ \
3346
case 2: ptr[2] = read_debug(reg, 2); \
47+
/* Fall through */ \
3448
case 1: ptr[1] = read_debug(reg, 1); \
49+
/* Fall through */ \
3550
default: ptr[0] = read_debug(reg, 0); \
3651
}
3752

3853
#define restore_debug(ptr,reg,nr) \
3954
switch (nr) { \
4055
case 15: write_debug(ptr[15], reg, 15); \
56+
/* Fall through */ \
4157
case 14: write_debug(ptr[14], reg, 14); \
58+
/* Fall through */ \
4259
case 13: write_debug(ptr[13], reg, 13); \
60+
/* Fall through */ \
4361
case 12: write_debug(ptr[12], reg, 12); \
62+
/* Fall through */ \
4463
case 11: write_debug(ptr[11], reg, 11); \
64+
/* Fall through */ \
4565
case 10: write_debug(ptr[10], reg, 10); \
66+
/* Fall through */ \
4667
case 9: write_debug(ptr[9], reg, 9); \
68+
/* Fall through */ \
4769
case 8: write_debug(ptr[8], reg, 8); \
70+
/* Fall through */ \
4871
case 7: write_debug(ptr[7], reg, 7); \
72+
/* Fall through */ \
4973
case 6: write_debug(ptr[6], reg, 6); \
74+
/* Fall through */ \
5075
case 5: write_debug(ptr[5], reg, 5); \
76+
/* Fall through */ \
5177
case 4: write_debug(ptr[4], reg, 4); \
78+
/* Fall through */ \
5279
case 3: write_debug(ptr[3], reg, 3); \
80+
/* Fall through */ \
5381
case 2: write_debug(ptr[2], reg, 2); \
82+
/* Fall through */ \
5483
case 1: write_debug(ptr[1], reg, 1); \
84+
/* Fall through */ \
5585
default: write_debug(ptr[0], reg, 0); \
5686
}
5787

0 commit comments

Comments
 (0)