On Wed, May 07, 2014 at 03:18:58PM -0700, [email protected] wrote:
> On Mon, Apr 28, 2014 at 05:25:29PM -0700, Paul E. McKenney wrote:
> > From: "Paul E. McKenney" <[email protected]>
> > 
> > Currently, qemu runs in the foreground, which prevents the script from
> > killing it in case the kernel locks up.  This commit therefore places
> > qemu into the background, allowing the script to recover from lockups.
> > 
> > Signed-off-by: Paul E. McKenney <[email protected]>
> 
> qemu originally did run in the background before this patch series;
> please merge this into the patch that introduces the echo and thus
> breaks that.

Turned out that the conflicts weren't as bad as I had feared, so done!

                                                        Thanx, Paul

> >  tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh 
> > b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
> > index b1e85b049075..67e89f06e77f 100755
> > --- a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
> > +++ b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
> > @@ -157,7 +157,7 @@ then
> >     echo Build-only run specified, boot/test omitted.
> >     exit 0
> >  fi
> > -$QEMU $qemu_args -m 512 -kernel $builddir/$BOOT_IMAGE -append 
> > "$qemu_append $boot_args"; echo $? > $resdir/qemu-retval &
> > +( $QEMU $qemu_args -m 512 -kernel $builddir/$BOOT_IMAGE -append 
> > "$qemu_append $boot_args"; echo $? > $resdir/qemu-retval ) &
> >  qemu_pid=$!
> >  commandcompleted=0
> >  echo Monitoring qemu job at pid $qemu_pid
> > -- 
> > 1.8.1.5
> > 
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to