| Message ID | 20221130165455.31125-2-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | More Oxenstored live update fixes | expand |
> On 30 Nov 2022, at 16:54, Andrew Cooper <andrew.cooper3@citrix.com> wrote: > > This file has some style problems so severe that they interfere with the > readability of the subsequent bugfix patches. > > Fix these issues ahead of time, to make the subsequent changes more readable. > > No functional change. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > --- > CC: Christian Lindig <christian.lindig@citrix.com> > CC: David Scott <dave@recoil.org> > CC: Edwin Torok <edvin.torok@citrix.com> > CC: Rob Hoes <Rob.Hoes@citrix.com> Reviewed-by: Edwin Török <edvin.torok@citrix.com> > > v2: > * New > --- > tools/ocaml/xenstored/domain.ml | 16 +++++++--------- > 1 file changed, 7 insertions(+), 9 deletions(-) > > diff --git a/tools/ocaml/xenstored/domain.ml b/tools/ocaml/xenstored/domain.ml > index 81cb59b8f1a2..ab08dcf37f62 100644 > --- a/tools/ocaml/xenstored/domain.ml > +++ b/tools/ocaml/xenstored/domain.ml > @@ -57,17 +57,16 @@ let is_paused_for_conflict dom = dom.conflict_credit <= 0.0 > let is_free_to_conflict = is_dom0 > > let string_of_port = function > -| None -> "None" > -| Some x -> string_of_int (Xeneventchn.to_int x) > + | None -> "None" > + | Some x -> string_of_int (Xeneventchn.to_int x) I would've expected ocp-indent to already do the right thing on this part. > > let dump d chan = > fprintf chan "dom,%d,%nd,%d\n" d.id d.mfn d.remote_port > > -let notify dom = match dom.port with > -| None -> > - warn "domain %d: attempt to notify on unknown port" dom.id > -| Some port -> > - Event.notify dom.eventchn port > +let notify dom = > + match dom.port with > + | None -> warn "domain %d: attempt to notify on unknown port" dom.id > + | Some port -> Event.notify dom.eventchn port but yes for this we'd need ocamlformat, not ocp-indent. > > let bind_interdomain dom = > begin match dom.port with > @@ -84,8 +83,7 @@ let close dom = > | None -> () > | Some port -> Event.unbind dom.eventchn port > end; > - Xenmmap.unmap dom.interface; > - () > + Xenmmap.unmap dom.interface > > let make id mfn remote_port interface eventchn = { > id = id; > -- > 2.11.0 >
> On 30 Nov 2022, at 16:54, Andrew Cooper <Andrew.Cooper3@citrix.com> wrote: > > This file has some style problems so severe that they interfere with the > readability of the subsequent bugfix patches. > > Fix these issues ahead of time, to make the subsequent changes more readable. Acked-by: Christian Lindig <christian.lindig@citrix.com>
diff --git a/tools/ocaml/xenstored/domain.ml b/tools/ocaml/xenstored/domain.ml index 81cb59b8f1a2..ab08dcf37f62 100644 --- a/tools/ocaml/xenstored/domain.ml +++ b/tools/ocaml/xenstored/domain.ml @@ -57,17 +57,16 @@ let is_paused_for_conflict dom = dom.conflict_credit <= 0.0 let is_free_to_conflict = is_dom0 let string_of_port = function -| None -> "None" -| Some x -> string_of_int (Xeneventchn.to_int x) + | None -> "None" + | Some x -> string_of_int (Xeneventchn.to_int x) let dump d chan = fprintf chan "dom,%d,%nd,%d\n" d.id d.mfn d.remote_port -let notify dom = match dom.port with -| None -> - warn "domain %d: attempt to notify on unknown port" dom.id -| Some port -> - Event.notify dom.eventchn port +let notify dom = + match dom.port with + | None -> warn "domain %d: attempt to notify on unknown port" dom.id + | Some port -> Event.notify dom.eventchn port let bind_interdomain dom = begin match dom.port with @@ -84,8 +83,7 @@ let close dom = | None -> () | Some port -> Event.unbind dom.eventchn port end; - Xenmmap.unmap dom.interface; - () + Xenmmap.unmap dom.interface let make id mfn remote_port interface eventchn = { id = id;
This file has some style problems so severe that they interfere with the readability of the subsequent bugfix patches. Fix these issues ahead of time, to make the subsequent changes more readable. No functional change. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Christian Lindig <christian.lindig@citrix.com> CC: David Scott <dave@recoil.org> CC: Edwin Torok <edvin.torok@citrix.com> CC: Rob Hoes <Rob.Hoes@citrix.com> v2: * New --- tools/ocaml/xenstored/domain.ml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)