summaryrefslogtreecommitdiffstats
path: root/hw/scsi
diff options
context:
space:
mode:
authorUlrich Obergfell2014-06-08 19:22:33 +0200
committerPaolo Bonzini2014-06-18 08:47:10 +0200
commit2fe5a9f73b3446690db2cae8a58473b0b4beaa32 (patch)
tree5dfd93d47e39e7c012c42309c21cda5ddcd7857d /hw/scsi
parentscsi-disk.c: Fix compilation with -DDEBUG_SCSI (diff)
downloadqemu-2fe5a9f73b3446690db2cae8a58473b0b4beaa32.tar.gz
qemu-2fe5a9f73b3446690db2cae8a58473b0b4beaa32.tar.xz
qemu-2fe5a9f73b3446690db2cae8a58473b0b4beaa32.zip
scsi-disk: fix bug in scsi_block_new_request() introduced by commit 137745c
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. Cc: qemu-stable@nongnu.org Signed-off-by: Ulrich Obergfell <uobergfe@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/scsi')
-rw-r--r--hw/scsi/scsi-disk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 9afbb8abf5..fd82a410b5 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;
}