From owner-svn-soc-all@FreeBSD.ORG  Sun Sep 15 09:51:04 2013
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id D6112209
 for <svn-soc-all@FreeBSD.org>; Sun, 15 Sep 2013 09:51:04 +0000 (UTC)
 (envelope-from zcore@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C34AA2893
 for <svn-soc-all@FreeBSD.org>; Sun, 15 Sep 2013 09:51:04 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8F9p4te073979
 for <svn-soc-all@FreeBSD.org>; Sun, 15 Sep 2013 09:51:04 GMT
 (envelope-from zcore@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r8F9p40D073974
 for svn-soc-all@FreeBSD.org; Sun, 15 Sep 2013 09:51:04 GMT
 (envelope-from zcore@FreeBSD.org)
Date: Sun, 15 Sep 2013 09:51:04 GMT
Message-Id: <201309150951.r8F9p40D073974@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 zcore@FreeBSD.org using -f
From: zcore@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r257365 - soc2013/zcore/head/usr.sbin/bhyve
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Sep 2013 09:51:04 -0000

Author: zcore
Date: Sun Sep 15 09:51:04 2013
New Revision: 257365
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257365

Log:
  support READ_12

Modified:
  soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c

Modified: soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c
==============================================================================
--- soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c	Sun Sep 15 09:50:42 2013	(r257364)
+++ soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c	Sun Sep 15 09:51:04 2013	(r257365)
@@ -841,7 +841,10 @@
 		return;
 	}
 	lba = be32dec(acmd + 2);
-	len = be16dec(acmd + 7);
+	if (acmd[0] == READ_10)
+		len = be16dec(acmd + 7);
+	else
+		len = be32dec(acmd + 6);
 	if (len == 0) {
 		cfis[4] = (cfis[4] & ~7) | ATA_I_CMD | ATA_I_IN;
 		ahci_write_fis_d2h(p, slot, cfis, ATA_S_READY | ATA_S_DSC);
@@ -929,6 +932,7 @@
 		atapi_read_toc(p, slot, cfis);
 		break;
 	case READ_10:
+	case READ_12:
 		atapi_read(p, slot, cfis);
 		break;
 	case REQUEST_SENSE: