From: Jeff Cody <jcody@redhat.com>
Date: Thu, 20 Sep 2012 19:13:23 +0000 (-0400)
Subject: block: use BDRV_O_NOCACHE instead of s->aligned_buf in raw-posix.c
X-Git-Tag: v1.3.0-rc0~436^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9acc5a06d41416400dda0ae9495707236911e234;p=thirdparty%2Fqemu.git

block: use BDRV_O_NOCACHE instead of s->aligned_buf in raw-posix.c

Rather than check for a non-NULL aligned_buf to determine if
raw_aio_submit needs to check for alignment, check for the presence
of BDRV_O_NOCACHE in the bs->open_flags.

Signed-off-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/block/raw-posix.c b/block/raw-posix.c
index 288e7ff238e..1e727eb0424 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -354,7 +354,7 @@ static BlockDriverAIOCB *raw_aio_submit(BlockDriverState *bs,
      * boundary.  Check if this is the case or tell the low-level
      * driver that it needs to copy the buffer.
      */
-    if (s->aligned_buf) {
+    if ((bs->open_flags & BDRV_O_NOCACHE)) {
         if (!qiov_is_aligned(bs, qiov)) {
             type |= QEMU_AIO_MISALIGNED;
 #ifdef CONFIG_LINUX_AIO