commit 137745c5c60f083ec982fe9e861e8c16ebca1ba8
author Markus Armbruster <armbru@redhat.com> Tue Jun 05 16:49:25 2012 +0200
committer Kevin Wolf <kwolf@redhat.com> Fri Jun 15 14:03:43 2012 +0200
tree 10ef10f176861a368d9772f87bb25ca1d664feb0
parent c8433287830f342d8ee35d206afdf6cc6c5fe35a

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>

hw/scsi-disk.c

diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 1691491..9197b08 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -34,7 +34,6 @@
 #include "scsi-defs.h"
 #include "sysemu.h"
 #include "blockdev.h"
-#include "block_int.h"
 #include "dma.h"
 
 #ifdef __linux
@@ -1889,7 +1888,7 @@
 	 * 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;
         }