On Tue, Sep 27, 2011 at 12:50:21PM +0100, Peter Maydell wrote: > On 27 September 2011 12:25, Michael S. Tsirkin <m...@redhat.com> wrote: > > e1000 spec says CTRL.RST write should have the same effect > > as bus reset, except that is preserves PCI Config. > > Reset device registers and interrupts. > > > > Fix suggested by Andy Gospodarek <a...@greyhouse.net> > > Doesn't this have the same effect as this patch: > http://patchwork.ozlabs.org/patch/108673/
Right except mine clears the interrupts as well. I missed that patch - what happened to it in the end? > except that it's harder to read because it's moved a lot > of code around in the file? > > (I think you have an extra qemu_set_irq() call in there, The device spec says we should reset the interrupts. So it seems necessary. > actually. But it was hard to find. I probably should split the patch out 1. code movement 2. code change Forward declarations just to work around random placement of functions in file seem wrong - why not order the functions sensibly instead? > Also your code has the > bug that was in earlier revisions of Anthony's patch where > after doing the reset you fall through and allow other bits > in the ctrl register to be set.) > > -- PMM True. -- MST
