mirror of https://github.com/xemu-project/xemu.git
ide: fix migration in the middle of a bmdma transfer
It reintroduces Revert "ide save/restore pio/atapi cmd transfer fields and io buffer" but using subsections. Added bonus is the addition of ide_dummy_transfer_stop to transfer_end_table, that was missing. Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
50641c5ce2
commit
5ee84c3375
30
hw/ide/pci.c
30
hw/ide/pci.c
|
@ -121,6 +121,28 @@ void bmdma_addr_writel(void *opaque, uint32_t addr, uint32_t val)
|
||||||
bm->cur_addr = bm->addr;
|
bm->cur_addr = bm->addr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool ide_bmdma_current_needed(void *opaque)
|
||||||
|
{
|
||||||
|
BMDMAState *bm = opaque;
|
||||||
|
|
||||||
|
return (bm->cur_prd_len != 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static const VMStateDescription vmstate_bmdma_current = {
|
||||||
|
.name = "ide bmdma_current",
|
||||||
|
.version_id = 1,
|
||||||
|
.minimum_version_id = 1,
|
||||||
|
.minimum_version_id_old = 1,
|
||||||
|
.fields = (VMStateField []) {
|
||||||
|
VMSTATE_UINT32(cur_addr, BMDMAState),
|
||||||
|
VMSTATE_UINT32(cur_prd_last, BMDMAState),
|
||||||
|
VMSTATE_UINT32(cur_prd_addr, BMDMAState),
|
||||||
|
VMSTATE_UINT32(cur_prd_len, BMDMAState),
|
||||||
|
VMSTATE_END_OF_LIST()
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
static const VMStateDescription vmstate_bmdma = {
|
static const VMStateDescription vmstate_bmdma = {
|
||||||
.name = "ide bmdma",
|
.name = "ide bmdma",
|
||||||
.version_id = 3,
|
.version_id = 3,
|
||||||
|
@ -134,6 +156,14 @@ static const VMStateDescription vmstate_bmdma = {
|
||||||
VMSTATE_UINT32(nsector, BMDMAState),
|
VMSTATE_UINT32(nsector, BMDMAState),
|
||||||
VMSTATE_UINT8(unit, BMDMAState),
|
VMSTATE_UINT8(unit, BMDMAState),
|
||||||
VMSTATE_END_OF_LIST()
|
VMSTATE_END_OF_LIST()
|
||||||
|
},
|
||||||
|
.subsections = (VMStateSubsection []) {
|
||||||
|
{
|
||||||
|
.vmsd = &vmstate_bmdma_current,
|
||||||
|
.needed = ide_bmdma_current_needed,
|
||||||
|
}, {
|
||||||
|
/* empty */
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue