2020-08-10 01:19:52

by Jiaxun Yang

Subject: [PATCH RESEND for-5.9] MIPS: KVM: Convert a fallthrough comment to fallthrough

There is a fallthrough comment being forgotten,
GCC complains about it:

arch/mips/kvm/emulate.c: In function kvm_mips_emulate_load:
arch/mips/kvm/emulate.c:1936:21: error: this statement may fall through
1936 | vcpu->mmio_needed = 1; /* unsigned */
| ~~~~~~~~~~~~~~~~~~^~~
arch/mips/kvm/emulate.c:1939:2: note: here
1939 | case lw_op:

Just fix it.

Signed-off-by: Jiaxun Yang <[email protected]>
Reviewed-by: Huacai Chen <[email protected]>
---
This is blocking KVM MIPS from build, so it needs to get into 5.9.
---
arch/mips/kvm/emulate.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c
index 703782355318..d70c4f8e14e2 100644
--- a/arch/mips/kvm/emulate.c
+++ b/arch/mips/kvm/emulate.c
@@ -1935,7 +1935,7 @@ enum emulation_result kvm_mips_emulate_load(union mips_instruction inst,

case lwu_op:
vcpu->mmio_needed = 1; /* unsigned */
- /* fall through */
+ fallthrough;
#endif
case lw_op:
run->mmio.len = 4;
--
2.28.0.rc1

2020-08-10 08:12:51

by Paolo Bonzini

Subject: Re: [PATCH RESEND for-5.9] MIPS: KVM: Convert a fallthrough comment to fallthrough

On 10/08/20 03:17, Jiaxun Yang wrote:
> There is a fallthrough comment being forgotten,
> GCC complains about it:
>
> arch/mips/kvm/emulate.c: In function kvm_mips_emulate_load:
> arch/mips/kvm/emulate.c:1936:21: error: this statement may fall through
> 1936 | vcpu->mmio_needed = 1; /* unsigned */
> | ~~~~~~~~~~~~~~~~~~^~~
> arch/mips/kvm/emulate.c:1939:2: note: here
> 1939 | case lw_op:
>
> Just fix it.
>
> Signed-off-by: Jiaxun Yang <[email protected]>
> Reviewed-by: Huacai Chen <[email protected]>
> ---
> This is blocking KVM MIPS from build, so it needs to get into 5.9.
> ---
> arch/mips/kvm/emulate.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c
> index 703782355318..d70c4f8e14e2 100644
> --- a/arch/mips/kvm/emulate.c
> +++ b/arch/mips/kvm/emulate.c
> @@ -1935,7 +1935,7 @@ enum emulation_result kvm_mips_emulate_load(union mips_instruction inst,
>
> case lwu_op:
> vcpu->mmio_needed = 1; /* unsigned */
> - /* fall through */
> + fallthrough;
> #endif
> case lw_op:
> run->mmio.len = 4;
>

Queued, thanks.

Paolo