From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57135) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WtuIv-0004LD-7O for qemu-devel@nongnu.org; Mon, 09 Jun 2014 03:47:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WtuIl-00049e-Iz for qemu-devel@nongnu.org; Mon, 09 Jun 2014 03:47:41 -0400 Received: from mail-wi0-x22e.google.com ([2a00:1450:400c:c05::22e]:46181) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WtuIk-00049U-NQ for qemu-devel@nongnu.org; Mon, 09 Jun 2014 03:47:31 -0400 Received: by mail-wi0-f174.google.com with SMTP id r20so3740112wiv.13 for ; Mon, 09 Jun 2014 00:47:29 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <5395668F.5060101@redhat.com> Date: Mon, 09 Jun 2014 09:47:27 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1402248153-32686-1-git-send-email-uobergfe@redhat.com> In-Reply-To: <1402248153-32686-1-git-send-email-uobergfe@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] scsi-disk: fix bug in scsi_block_new_request() introduced by commit 137745c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Ulrich Obergfell , qemu-devel@nongnu.org Cc: armbru@redhat.com Il 08/06/2014 19:22, Ulrich Obergfell ha scritto: > This patch fixes a bug in scsi_block_new_request() that was introduced > by commit 137745c5c60f083ec982fe9e861e8c16ebca1ba8. If the host cache > is used - i.e. if BDRV_O_NOCACHE is _not_ set - the 'break' statement > needs to be executed to 'fall back' to SG_IO. > > Signed-off-by: Ulrich Obergfell > --- > hw/scsi/scsi-disk.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c > index 4bcef55..7e62dbd 100644 > --- a/hw/scsi/scsi-disk.c > +++ b/hw/scsi/scsi-disk.c > @@ -2526,7 +2526,7 @@ static SCSIRequest *scsi_block_new_request(SCSIDevice *d, uint32_t tag, > * ones (such as WRITE SAME or EXTENDED COPY, etc.). So, without > * O_DIRECT everything must go through SG_IO. > */ > - if (bdrv_get_flags(s->qdev.conf.bs) & BDRV_O_NOCACHE) { > + if (!(bdrv_get_flags(s->qdev.conf.bs) & BDRV_O_NOCACHE)) { > break; > } > > Applied, thanks. Paolo