From: John Snow <jsnow@redhat.com>
Date: Tue, 11 Nov 2014 00:41:40 +0000 (-0500)
Subject: ahci: Fix byte count regression for ATAPI/PIO
X-Git-Tag: v2.2.0-rc2~12^2~10
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a395f3fa2f26c94dac03b37e3dfb1074bfe2ddea;p=qemu-xen-unstable.git

ahci: Fix byte count regression for ATAPI/PIO

This patch fixes a regression caused by commit
659142ecf71a0da240ab0ff7cf929ee25c32b9bc.
The problem occurs when we wish to return early
from the ahci_start_transfer function, but are now
updating the transferred byte count in the AHCI
command header via ahci_commit_buf.

This will cause problems in the Windows 8 installer.

Don't update the byte count in the command header
for the transmission of ATAPI packets: These commands
will distort the final byte count of the actual data
payload.

The call to ahci_commit_buf remains in the "out"
portion of the call in order to clean up the sglist.
The byte count is maintained by forcing size to be 0.

Signed-off-by: John Snow <jsnow@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 61dbed1b97..1f3f951b50 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -1089,6 +1089,7 @@ static void ahci_start_transfer(IDEDMA *dma)
     if (is_atapi && !ad->done_atapi_packet) {
         /* already prepopulated iobuffer */
         ad->done_atapi_packet = true;
+        size = 0;
         goto out;
     }