qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] scsi-disk: fix bug in scsi_block_new_request() introduced by commit 137745c
@ 2014-06-08 17:22 Ulrich Obergfell
  2014-06-09  7:47 ` Paolo Bonzini
  0 siblings, 1 reply; 2+ messages in thread
From: Ulrich Obergfell @ 2014-06-08 17:22 UTC (permalink / raw)
  To: qemu-devel; +Cc: pbonzini, armbru, uobergfe

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 <uobergfe@redhat.com>
---
 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;
         }
 
-- 
1.7.11.7

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Qemu-devel] [PATCH] scsi-disk: fix bug in scsi_block_new_request() introduced by commit 137745c
  2014-06-08 17:22 [Qemu-devel] [PATCH] scsi-disk: fix bug in scsi_block_new_request() introduced by commit 137745c Ulrich Obergfell
@ 2014-06-09  7:47 ` Paolo Bonzini
  0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2014-06-09  7:47 UTC (permalink / raw)
  To: Ulrich Obergfell, qemu-devel; +Cc: armbru

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 <uobergfe@redhat.com>
> ---
>  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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-06-09  7:47 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-08 17:22 [Qemu-devel] [PATCH] scsi-disk: fix bug in scsi_block_new_request() introduced by commit 137745c Ulrich Obergfell
2014-06-09  7:47 ` Paolo Bonzini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).