From: Markus Armbruster <armbru@redhat.com>
Date: Tue, 5 Jun 2012 14:49:25 +0000 (+0200)
Subject: scsi-disk: Don't peek behind the BlockDriverState abstraction
X-Git-Tag: qemu-xen-4.3.0-rc1~986^2~22
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=137745c;p=qemu-upstream-4.5-testing.git

scsi-disk: Don't peek behind the BlockDriverState abstraction

Use the appropriate interface instead.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 1691491c0..9197b08d8 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -34,7 +34,6 @@ do { printf("scsi-disk: " fmt , ## __VA_ARGS__); } while (0)
 #include "scsi-defs.h"
 #include "sysemu.h"
 #include "blockdev.h"
-#include "block_int.h"
 #include "dma.h"
 
 #ifdef __linux
@@ -1889,7 +1888,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 (!(s->qdev.conf.bs->open_flags & BDRV_O_NOCACHE)) {
+        if (bdrv_get_flags(s->qdev.conf.bs) & BDRV_O_NOCACHE) {
             break;
         }