| Message ID | 0773f4b5678ee340af201b454e37178e750cbd8d.1725958416.git.federico.serafini@bugseng.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | x86: address violations of MISRA C Rule 16.3 | expand |
On 10.09.2024 12:08, Federico Serafini wrote: > Address violations of MISRA C:2012 Rule 16.3: > "An unconditional `break' statement shall terminate every > switch-clause". > > No functional change. > > Signed-off-by: Federico Serafini <federico.serafini@bugseng.com> > --- > xen/arch/x86/mm/guest_walk.c | 1 + > xen/arch/x86/mm/hap/hap.c | 2 +- > xen/arch/x86/mm/hap/nested_hap.c | 1 + > xen/arch/x86/mm/paging.c | 2 +- > 4 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/xen/arch/x86/mm/guest_walk.c b/xen/arch/x86/mm/guest_walk.c > index fe7393334f..bc032d697c 100644 > --- a/xen/arch/x86/mm/guest_walk.c > +++ b/xen/arch/x86/mm/guest_walk.c > @@ -497,6 +497,7 @@ guest_walk_tables(const struct vcpu *v, struct p2m_domain *p2m, > paging_mark_dirty(d, gw->l4mfn); > hvmemul_write_cache(v, l4gpa, &gw->l4e, sizeof(gw->l4e)); > } > + break; > #endif > } This wants inserting after the #endif, I think. If you agree, I'm happy to adjust while committing. With the adjustment: Acked-by: Jan Beulich <jbeulich@suse.com> Jan
On 10/09/24 16:55, Jan Beulich wrote: > On 10.09.2024 12:08, Federico Serafini wrote: >> Address violations of MISRA C:2012 Rule 16.3: >> "An unconditional `break' statement shall terminate every >> switch-clause". >> >> No functional change. >> >> Signed-off-by: Federico Serafini <federico.serafini@bugseng.com> >> --- >> xen/arch/x86/mm/guest_walk.c | 1 + >> xen/arch/x86/mm/hap/hap.c | 2 +- >> xen/arch/x86/mm/hap/nested_hap.c | 1 + >> xen/arch/x86/mm/paging.c | 2 +- >> 4 files changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/xen/arch/x86/mm/guest_walk.c b/xen/arch/x86/mm/guest_walk.c >> index fe7393334f..bc032d697c 100644 >> --- a/xen/arch/x86/mm/guest_walk.c >> +++ b/xen/arch/x86/mm/guest_walk.c >> @@ -497,6 +497,7 @@ guest_walk_tables(const struct vcpu *v, struct p2m_domain *p2m, >> paging_mark_dirty(d, gw->l4mfn); >> hvmemul_write_cache(v, l4gpa, &gw->l4e, sizeof(gw->l4e)); >> } >> + break; >> #endif >> } > > This wants inserting after the #endif, I think. If you agree, I'm happy to > adjust while committing. With the adjustment: > Acked-by: Jan Beulich <jbeulich@suse.com> You are right, thanks.
diff --git a/xen/arch/x86/mm/guest_walk.c b/xen/arch/x86/mm/guest_walk.c index fe7393334f..bc032d697c 100644 --- a/xen/arch/x86/mm/guest_walk.c +++ b/xen/arch/x86/mm/guest_walk.c @@ -497,6 +497,7 @@ guest_walk_tables(const struct vcpu *v, struct p2m_domain *p2m, paging_mark_dirty(d, gw->l4mfn); hvmemul_write_cache(v, l4gpa, &gw->l4e, sizeof(gw->l4e)); } + break; #endif } diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index d2011fde24..ec5043a8aa 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -652,7 +652,7 @@ int hap_domctl(struct domain *d, struct xen_domctl_shadow_op *sc, return rc; case XEN_DOMCTL_SHADOW_OP_GET_ALLOCATION: sc->mb = hap_get_allocation(d); - /* Fall through... */ + fallthrough; case XEN_DOMCTL_SHADOW_OP_OFF: return 0; default: diff --git a/xen/arch/x86/mm/hap/nested_hap.c b/xen/arch/x86/mm/hap/nested_hap.c index 080b60adf0..cc7bc6e5ea 100644 --- a/xen/arch/x86/mm/hap/nested_hap.c +++ b/xen/arch/x86/mm/hap/nested_hap.c @@ -217,6 +217,7 @@ int nestedhvm_hap_nested_page_fault( p2ma_10 = p2m_access_n; /* For safety, remove all permissions. */ gdprintk(XENLOG_ERR, "Unhandled p2m access type:%d\n", p2ma_10); + break; } /* Use minimal permission for nested p2m. */ p2ma_10 &= (p2m_access_t)p2ma_21; diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index dd47bde5ce..c77f4c1dac 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -726,7 +726,7 @@ int paging_domctl(struct domain *d, struct xen_domctl_shadow_op *sc, case XEN_DOMCTL_SHADOW_OP_ENABLE: if ( !(sc->mode & XEN_DOMCTL_SHADOW_ENABLE_LOG_DIRTY) ) break; - /* Else fall through... */ + fallthrough; case XEN_DOMCTL_SHADOW_OP_ENABLE_LOGDIRTY: return paging_log_dirty_enable(d);
Address violations of MISRA C:2012 Rule 16.3: "An unconditional `break' statement shall terminate every switch-clause". No functional change. Signed-off-by: Federico Serafini <federico.serafini@bugseng.com> --- xen/arch/x86/mm/guest_walk.c | 1 + xen/arch/x86/mm/hap/hap.c | 2 +- xen/arch/x86/mm/hap/nested_hap.c | 1 + xen/arch/x86/mm/paging.c | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-)