From patchwork Tue Jun 5 14:49:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 163090 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7333FB6FB7 for ; Wed, 6 Jun 2012 00:49:59 +1000 (EST) Received: from localhost ([::1]:39280 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sbv53-0001XT-9p for incoming@patchwork.ozlabs.org; Tue, 05 Jun 2012 10:49:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41205) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sbv4k-0001DG-Rm for qemu-devel@nongnu.org; Tue, 05 Jun 2012 10:49:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sbv4b-0005SM-6X for qemu-devel@nongnu.org; Tue, 05 Jun 2012 10:49:38 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:56540) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sbv4b-0005Rl-03 for qemu-devel@nongnu.org; Tue, 05 Jun 2012 10:49:29 -0400 Received: from blackfin.pond.sub.org (p5B32ACE6.dip.t-dialin.net [91.50.172.230]) by oxygen.pond.sub.org (Postfix) with ESMTPA id D9F6AA5A48 for ; Tue, 5 Jun 2012 16:49:26 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 1FB4C60099; Tue, 5 Jun 2012 16:49:26 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 5 Jun 2012 16:49:25 +0200 Message-Id: <1338907765-22078-3-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.6.5 In-Reply-To: <1338907765-22078-1-git-send-email-armbru@redhat.com> References: <1338907765-22078-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 78.46.104.156 Cc: kwolf@redhat.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 2/2] scsi-disk: Don't peek behind the BlockDriverState abstraction X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Use the appropriate interface instead. Signed-off-by: Markus Armbruster --- 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 045c764..1bfefb2 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 @@ -1877,7 +1876,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; }