From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53150) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpEhs-0000vB-3A for qemu-devel@nongnu.org; Fri, 14 Nov 2014 06:06:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpEhi-0001XE-KR for qemu-devel@nongnu.org; Fri, 14 Nov 2014 06:06:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44043) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpEhi-0001WI-Ci for qemu-devel@nongnu.org; Fri, 14 Nov 2014 06:06:14 -0500 From: Stefan Hajnoczi Date: Fri, 14 Nov 2014 11:05:47 +0000 Message-Id: <1415963157-30103-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1415963157-30103-1-git-send-email-stefanha@redhat.com> References: <1415963157-30103-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL for-2.2 01/11] ahci: Fix byte count regression for ATAPI/PIO List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , John Snow , Stefan Hajnoczi From: John Snow 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 Signed-off-by: Stefan Hajnoczi --- hw/ide/ahci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 61dbed1..1f3f951 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; } -- 2.1.0