From: Ulrich Obergfell Date: Sun, 8 Jun 2014 17:22:33 +0000 (+0200) Subject: scsi-disk: fix bug in scsi_block_new_request() introduced by commit 137745c X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2fe5a9f73b3446690db2cae8a58473b0b4beaa32;p=osstest%2Fqemu.git 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 Signed-off-by: Paolo Bonzini --- diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 9afbb8abf..fd82a410b 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; }