Re: [PATCH v2 4/7] misc: fix commonly doubled up words

[Peter Maydell]

On Thu, 7 Jul 2022 at 13:30, Daniel P. Berrangé <berrange@redhat.com> wrote:
>
> On Mon, Jul 04, 2022 at 04:52:40PM +0100, Peter Maydell wrote:
> > On Mon, 4 Jul 2022 at 16:23, Daniel P. Berrangé <berrange@redhat.com> wrote:
> > >
> > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> > > ---
> >
> > > --- a/docs/tools/qemu-pr-helper.rst
> > > +++ b/docs/tools/qemu-pr-helper.rst
> > > @@ -22,7 +22,7 @@ storage fabric. QEMU's SCSI passthrough devices 
> > > ``scsi-block``
> > >  and ``scsi-generic`` support passing guest persistent reservation
> > >  requests to a privileged external helper program. 
> > > :program:`qemu-pr-helper`
> > >  is that external helper; it creates a socket which QEMU can
> > > -connect to to communicate with it.
> > > +connect to communicate with it.
> >
> > This text is correct as it stands, and the change is wrong.
>
> I think the current text is a rather awkward, so I'll rephrase it
> next time.
>
> > > diff --git a/tests/qtest/microbit-test.c b/tests/qtest/microbit-test.c
> > > index 04e199ec33..6cc1f5d932 100644
> > > --- a/tests/qtest/microbit-test.c
> > > +++ b/tests/qtest/microbit-test.c
> > > @@ -449,9 +449,9 @@ static void test_nrf51_timer(void)
> > >      timer_set_prescaler(qts, 0);
> > >      /* Swept over in first step */
> > >      timer_set_cc(qts, 0, 2);
> > > -    /* Barely miss on first step */
> > > +    /* Barely miss in first step */
> > >      timer_set_cc(qts, 1, 162);
> > > -    /* Spot on on third step */
> > > +    /* Spot on in third step */
> > >      timer_set_cc(qts, 2, 480);
> >
> > These changes also look wrong.
>
> It makes them consistent wth the first comment "Swept over in first step"

There's a difference between "in step X" -- during the duration
of the step, and "on step X" -- at the point where the step stops.

-- PMM