From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58176) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8ZI8-0007mz-Fq for qemu-devel@nongnu.org; Wed, 29 Jan 2014 12:51:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W8ZI2-0002Jv-FX for qemu-devel@nongnu.org; Wed, 29 Jan 2014 12:51:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:26664) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8ZI2-0002Jq-6u for qemu-devel@nongnu.org; Wed, 29 Jan 2014 12:51:06 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0THp5C3014448 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 29 Jan 2014 12:51:05 -0500 Message-ID: <52E93F87.5040600@redhat.com> Date: Wed, 29 Jan 2014 18:51:03 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1391017659-5506-1-git-send-email-armbru@redhat.com> In-Reply-To: <1391017659-5506-1-git-send-email-armbru@redhat.com> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] scsi-bus: Fix transfer length for VERIFY with BYTCHK=11b List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster , qemu-devel@nongnu.org Il 29/01/2014 18:47, Markus Armbruster ha scritto: > The transfer length depends on field BYTCHK, which is encoded in byte > 1, bits 1..2. However, the guard for for case BYTCHK=11b doesn't > work, and we get case 01b instead. Fix it. > > Note that since emulated scsi-hd fails the command outright, it takes > SCSI passthrough of a device that actually implements VERIFY with > BYTCHK=11b to make the bug bite. > > Screwed up in commit d12ad44. Spotted by Coverity. > > Signed-off-by: Markus Armbruster > --- > hw/scsi/scsi-bus.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c > index 50b89ad..285a58b 100644 > --- a/hw/scsi/scsi-bus.c > +++ b/hw/scsi/scsi-bus.c > @@ -909,7 +909,7 @@ static int scsi_req_length(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf) > case VERIFY_16: > if ((buf[1] & 2) == 0) { > cmd->xfer = 0; > - } else if ((buf[1] & 4) == 1) { > + } else if ((buf[1] & 4) != 0) { > cmd->xfer = 1; > } > cmd->xfer *= dev->blocksize; > Applied to scsi-next, thanks. Paolo