On Fri, Jan 29, 2016 at 09:02:47AM +0100, Aurelien Jarno wrote: > On 2016-01-29 16:06, David Gibson wrote: > > From: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> > > > > Currently the aiocb is held within MACIOIDEState, however the IDE core code > > assumes that the current actvie DMA aiocb is held in aiocb in a few places, > > e.g. ide_bus_reset() and ide_reset(). > > > > Switch over to using IDEDMA aiocb to store the aiocb for the current active > > DMA request so that bus resets and restarts are handled correctly. As a > > consequence we can now use ide_set_inactive() rather than handling its > > functionality ourselves. > > > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> > > Reviewed-by: John Snow <js...@redhat.com> > > Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> > > --- > > hw/ide/macio.c | 20 +- > > hw/ide/macio.c.orig | 634 > > ++++++++++++++++++++++++++++++++++++++++++++++++++++ > > I don't think you want to add this file to the git.
Sigh. Indeed. Not doing well with these pulls lately :(. -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature