On 18 August 2016 at 20:04, Dr. David Alan Gilbert <dgilb...@redhat.com> wrote: > Hmm, except there are two separate things with the name "xilinx_spi"; > vmstate_xilinx_spi in hw/ssi/xilinx_spi.c > which is the state for the "xlnx.xps-spi" (aka TYPE_XILINX_SPI) object. > > and for added confusion: > vmstate_m25p80 in hw/block/m25p80.c > which is the state for the "m25p80-generic" (aka TYPE_M25P80) object. > also calls itself "xilinx_spi". > > These went in a pair of Peter Crosthwaite commits at about the same time 4.5 > years > ago; I'm guessing it was just a copy-paste. > > I think my preference would be to update the name for the m25p80 so it's > not got the clash; but it seems m25p80 contains definitions of about a zillion > flash devices all derived from the m25p80, so I think I'd have to try one of > them to see if the xilinx_spi name finds it's way onto the migration stream; > I suspect it doesn't.
Aha. Yeah, we should fix that. (I have a feeling the m25p80 devices are all only for boards where we don't care about migration-compat, but I'm not completely certain.) thanks -- PMM
