On Sat, Sep 30, 2017 at 05:49:35PM +0100, Mark Cave-Ayland wrote: > Commit 4f7265f "ppc/ide/macio: Add missing registers" added two extra macio > registers but forgot to add them to the corresponding VMStateDescription. > > The version number is bumped accordingly, although this will have little > effect given that the Mac machines are practically unmigratable. > > Signed-off-by: Mark Cave-Ayland <[email protected]>
Merged to ppc-for-2.11. As you say, none of the Mac machines really
work for migration at the moment, so bumping the version (and
therefore notionally breaking backwards migration) isn't an issue.
> ---
> hw/ide/macio.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/hw/ide/macio.c b/hw/ide/macio.c
> index ce194c6..2e043ef 100644
> --- a/hw/ide/macio.c
> +++ b/hw/ide/macio.c
> @@ -353,12 +353,14 @@ static const MemoryRegionOps pmac_ide_ops = {
>
> static const VMStateDescription vmstate_pmac = {
> .name = "ide",
> - .version_id = 4,
> + .version_id = 5,
> .minimum_version_id = 0,
> .fields = (VMStateField[]) {
> VMSTATE_IDE_BUS(bus, MACIOIDEState),
> VMSTATE_IDE_DRIVES(bus.ifs, MACIOIDEState),
> VMSTATE_BOOL(dma_active, MACIOIDEState),
> + VMSTATE_UINT32(timing_reg, MACIOIDEState),
> + VMSTATE_UINT32(irq_reg, MACIOIDEState),
> VMSTATE_END_OF_LIST()
> }
> };
--
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
