> -----Original Message----- > From: Andrew Cooper <[email protected]> > Sent: 22 September 2020 19:25 > To: Xen-devel <[email protected]> > Cc: Andrew Cooper <[email protected]>; George Dunlap > <[email protected]>; Ian > Jackson <[email protected]>; Jan Beulich <[email protected]>; Stefano > Stabellini > <[email protected]>; Wei Liu <[email protected]>; Julien Grall > <[email protected]>; Paul Durrant > <[email protected]>; Michał Leszczyński <[email protected]>; Hubert > Jasudowicz > <[email protected]>; Tamas K Lengyel <[email protected]> > Subject: [PATCH v2 08/11] xen/memory: Indent part of acquire_resource() > > Indent the middle of acquire_resource() inside a do {} while ( 0 ) loop. This > is broken out specifically to make the following change readable. > > No functional change. > > Signed-off-by: Andrew Cooper <[email protected]>
Reviewed-by: Paul Durrant <[email protected]> > --- > CC: George Dunlap <[email protected]> > CC: Ian Jackson <[email protected]> > CC: Jan Beulich <[email protected]> > CC: Stefano Stabellini <[email protected]> > CC: Wei Liu <[email protected]> > CC: Julien Grall <[email protected]> > CC: Paul Durrant <[email protected]> > CC: Michał Leszczyński <[email protected]> > CC: Hubert Jasudowicz <[email protected]> > CC: Tamas K Lengyel <[email protected]> > --- > xen/common/memory.c | 66 > +++++++++++++++++++++++++++-------------------------- > 1 file changed, 34 insertions(+), 32 deletions(-) > > diff --git a/xen/common/memory.c b/xen/common/memory.c > index c559935732..369154b7c0 100644 > --- a/xen/common/memory.c > +++ b/xen/common/memory.c > @@ -1087,44 +1087,46 @@ static int acquire_resource( > goto out; > } > > - switch ( xmar.type ) > - { > - case XENMEM_resource_grant_table: > - rc = gnttab_acquire_resource(d, xmar.id, xmar.frame, xmar.nr_frames, > - mfn_list); > - break; > + do { > + switch ( xmar.type ) > + { > + case XENMEM_resource_grant_table: > + rc = gnttab_acquire_resource(d, xmar.id, xmar.frame, > xmar.nr_frames, > + mfn_list); > + break; > > - default: > - rc = arch_acquire_resource(d, xmar.type, xmar.id, xmar.frame, > - xmar.nr_frames, mfn_list); > - break; > - } > + default: > + rc = arch_acquire_resource(d, xmar.type, xmar.id, xmar.frame, > + xmar.nr_frames, mfn_list); > + break; > + } > > - if ( rc ) > - goto out; > + if ( rc ) > + goto out; > > - if ( !paging_mode_translate(currd) ) > - { > - if ( copy_to_guest(xmar.frame_list, mfn_list, xmar.nr_frames) ) > - rc = -EFAULT; > - } > - else > - { > - xen_pfn_t gfn_list[ARRAY_SIZE(mfn_list)]; > - unsigned int i; > + if ( !paging_mode_translate(currd) ) > + { > + if ( copy_to_guest(xmar.frame_list, mfn_list, xmar.nr_frames) ) > + rc = -EFAULT; > + } > + else > + { > + xen_pfn_t gfn_list[ARRAY_SIZE(mfn_list)]; > + unsigned int i; > > - if ( copy_from_guest(gfn_list, xmar.frame_list, xmar.nr_frames) ) > - rc = -EFAULT; > + if ( copy_from_guest(gfn_list, xmar.frame_list, xmar.nr_frames) ) > + rc = -EFAULT; > > - for ( i = 0; !rc && i < xmar.nr_frames; i++ ) > - { > - rc = set_foreign_p2m_entry(currd, gfn_list[i], > - _mfn(mfn_list[i])); > - /* rc should be -EIO for any iteration other than the first */ > - if ( rc && i ) > - rc = -EIO; > + for ( i = 0; !rc && i < xmar.nr_frames; i++ ) > + { > + rc = set_foreign_p2m_entry(currd, gfn_list[i], > + _mfn(mfn_list[i])); > + /* rc should be -EIO for any iteration other than the first > */ > + if ( rc && i ) > + rc = -EIO; > + } > } > - } > + } while ( 0 ); > > out: > rcu_unlock_domain(d); > -- > 2.11.0
