From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfWfF-0001F8-M3 for qemu-devel@nongnu.org; Fri, 15 Jun 2012 09:34:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SfWf9-0004kN-Fe for qemu-devel@nongnu.org; Fri, 15 Jun 2012 09:34:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3181) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfWf9-0004k4-7f for qemu-devel@nongnu.org; Fri, 15 Jun 2012 09:34:07 -0400 From: Kevin Wolf Date: Fri, 15 Jun 2012 15:33:17 +0200 Message-Id: <1339767219-24297-18-git-send-email-kwolf@redhat.com> In-Reply-To: <1339767219-24297-1-git-send-email-kwolf@redhat.com> References: <1339767219-24297-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 17/39] scsi-disk: Don't peek behind the BlockDriverState abstraction List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster Use the appropriate interface instead. Signed-off-by: Markus Armbruster Acked-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- hw/scsi-disk.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) 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 @@ 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; } -- 1.7.6.5