[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/6] ide: fix migration in the middle of a bmdma tra
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 5/6] ide: fix migration in the middle of a bmdma transfer |
Date: |
Mon, 26 Jul 2010 21:38:45 +0200 |
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 <address@hidden>
---
hw/ide/pci.c | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 780fc5f..4331d77 100644
--- a/hw/ide/pci.c
+++ b/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;
}
+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 = {
.name = "ide bmdma",
.version_id = 3,
@@ -134,6 +156,14 @@ static const VMStateDescription vmstate_bmdma = {
VMSTATE_UINT32(nsector, BMDMAState),
VMSTATE_UINT8(unit, BMDMAState),
VMSTATE_END_OF_LIST()
+ },
+ .subsections = (VMStateSubsection []) {
+ {
+ .vmsd = &vmstate_bmdma_current,
+ .needed = ide_bmdma_current_needed,
+ }, {
+ /* empty */
+ }
}
};
--
1.7.1.1
- [Qemu-devel] [PATCH 0/6] [PATCH v2 0/6] Migration subsections (and ide as example), Juan Quintela, 2010/07/26
- [Qemu-devel] [PATCH 2/6] Revert "ide save/restore current transfer fields", Juan Quintela, 2010/07/26
- [Qemu-devel] [PATCH 3/6] vmstate: add subsections code, Juan Quintela, 2010/07/26
- [Qemu-devel] [PATCH 4/6] ide: fix migration in the middle of pio operation, Juan Quintela, 2010/07/26
- [Qemu-devel] [PATCH 1/6] Revert "ide save/restore pio/atapi cmd transfer fields and io buffer", Juan Quintela, 2010/07/26
- [Qemu-devel] [PATCH 5/6] ide: fix migration in the middle of a bmdma transfer,
Juan Quintela <=
- [Qemu-devel] [PATCH 6/6] Initial documentation for migration, Juan Quintela, 2010/07/26