summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. David Alan Gilbert <dgilbert@redhat.com>2014-12-09 18:15:08 +0000
committerKevin Wolf <kwolf@redhat.com>2015-02-06 17:24:20 +0100
commit819fa276311ce328a8e38ad9306c1093961b3f4b (patch)
treec2c77e0df0838a77f2b29f850e2b6956711246da
parentcebbae86b4f7ee3d3dd9df906b97d269e70d9cc7 (diff)
downloadhqemu-819fa276311ce328a8e38ad9306c1093961b3f4b.zip
hqemu-819fa276311ce328a8e38ad9306c1093961b3f4b.tar.gz
Restore atapi_dma flag across migration
If a migration happens just after the guest has kicked off an ATAPI command and kicked off DMA, we lose the atapi_dma flag, and the destination tries to complete the command as PIO rather than DMA. This upsets Linux; modern libata based kernels stumble and recover OK, older kernels end up passing bad data to userspace. Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: John Snow <jsnow@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--hw/ide/core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c
index d4af5e2..ac3f015 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -2417,6 +2417,7 @@ static int ide_drive_pio_post_load(void *opaque, int version_id)
s->end_transfer_func = transfer_end_table[s->end_transfer_fn_idx];
s->data_ptr = s->io_buffer + s->cur_io_buffer_offset;
s->data_end = s->data_ptr + s->cur_io_buffer_len;
+ s->atapi_dma = s->feature & 1; /* as per cmd_packet */
return 0;
}
OpenPOWER on IntegriCloud