From patchwork Wed Jan 20 16:22:28 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: ide save/restore current transfer fields
From: Marcelo Tosatti <mtosatti@redhat.com>
X-Patchwork-Id: 43308
Message-Id: <20100120162228.GB14374@amt.cnet>
To: qemu-devel@nongnu.org
Cc: Avi Kivity <avi@redhat.com>, Juan Quintela <quintela@redhat.com>
Date: Wed, 20 Jan 2010 14:22:28 -0200

If migration takes place between write of the bmdma address register and
write of the command register (to initiate DMA), the destination will
not properly start the DMA op, hanging the guest:

ata1.00: exception Emask 0x0 SAct 0x0 SErr 0x0 action 0x6 frozen
ata1.00: cmd c8/00:16:41:00:00/00:00:00:00:00/e0 tag 0 dma 11264 in
         res 40/00:00:00:00:00/00:00:00:00:00/00 Emask 0x4 (timeout)
ata1.00: status: { DRDY }

Fix by sending current transfer information in the migration data.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>


diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 780fc5f..9f245ed 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -133,6 +135,10 @@ static const VMStateDescription vmstate_bmdma = {
         VMSTATE_INT64(sector_num, BMDMAState),
         VMSTATE_UINT32(nsector, BMDMAState),
         VMSTATE_UINT8(unit, BMDMAState),
+        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()
     }
 };