From patchwork Wed Oct 29 07:53:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 404448 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 50767140077 for ; Wed, 29 Oct 2014 18:54:52 +1100 (AEDT) Received: from localhost ([::1]:43713 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XjO5g-0001X7-7c for incoming@patchwork.ozlabs.org; Wed, 29 Oct 2014 03:54:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45994) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XjO4y-0000Pf-OQ for qemu-devel@nongnu.org; Wed, 29 Oct 2014 03:54:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XjO4p-0008Us-J6 for qemu-devel@nongnu.org; Wed, 29 Oct 2014 03:54:04 -0400 Received: from cantor2.suse.de ([195.135.220.15]:56450 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XjO4p-0008UM-Ck for qemu-devel@nongnu.org; Wed, 29 Oct 2014 03:53:55 -0400 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id D75CCADC3; Wed, 29 Oct 2014 07:53:53 +0000 (UTC) From: Hannes Reinecke To: qemu-devel@nongnu.org Date: Wed, 29 Oct 2014 08:53:39 +0100 Message-Id: <1414569232-21357-5-git-send-email-hare@suse.de> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1414569232-21357-1-git-send-email-hare@suse.de> References: <1414569232-21357-1-git-send-email-hare@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 Cc: Hannes Reinecke , Paolo Bonzini , Nic Bellinger , Andreas Faerber , Alexander Graf Subject: [Qemu-devel] [PATCH 04/17] scsi: fixup lba calculation for 6 byte CDBs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 6 byte CDBs do not have a dedicated area for LBAs, and even if it certainly won't be at byte 0. Signed-off-by: Hannes Reinecke --- hw/scsi/scsi-bus.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 919a86c..64d0880 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -1195,9 +1195,6 @@ static uint64_t scsi_cmd_lba(SCSICommand *cmd) uint64_t lba; switch (buf[0] >> 5) { - case 0: - lba = ldl_be_p(&buf[0]) & 0x1fffff; - break; case 1: case 2: case 5: