diff mbox

[v2,2/2] blockdev: always compile in -drive aio= parsing

Message ID 1437143029-12100-3-git-send-email-stefanha@redhat.com
State New
Headers show

Commit Message

Stefan Hajnoczi July 17, 2015, 2:23 p.m. UTC 
CONFIG_LINUX_AIO is an implementation detail of raw-posix.c.  Don't
mention CONFIG_LINUX_AIO in blockdev.c.  Let raw-posix.c decide what to
do with BDRV_O_NATIVE_AIO if CONFIG_LINUX_AIO is not defined.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 blockdev.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Markus Armbruster July 23, 2015, 7:58 a.m. UTC | #1 
Stefan Hajnoczi <stefanha@redhat.com> writes:

> CONFIG_LINUX_AIO is an implementation detail of raw-posix.c.  Don't
> mention CONFIG_LINUX_AIO in blockdev.c.  Let raw-posix.c decide what to

To be precise: "raw-posix.c or raw-win32.c", or maybe "the block
driver".

> do with BDRV_O_NATIVE_AIO if CONFIG_LINUX_AIO is not defined.
>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  blockdev.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/blockdev.c b/blockdev.c
> index 62a4586..37b91c8 100644
> --- a/blockdev.c
> +++ b/blockdev.c
> @@ -405,7 +405,6 @@ static BlockBackend *blockdev_init(const char *file, QDict *bs_opts,
>          bdrv_flags |= BDRV_O_NO_FLUSH;
>      }
>  
> -#ifdef CONFIG_LINUX_AIO
>      if ((buf = qemu_opt_get(opts, "aio")) != NULL) {
>          if (!strcmp(buf, "native")) {
>              bdrv_flags |= BDRV_O_NATIVE_AIO;
> @@ -416,7 +415,6 @@ static BlockBackend *blockdev_init(const char *file, QDict *bs_opts,
>             goto early_err;
>          }
>      }
> -#endif
>  
>      if ((buf = qemu_opt_get(opts, "format")) != NULL) {
>          if (is_help_option(buf)) {
diff mbox

Patch

diff --git a/blockdev.c b/blockdev.c
index 62a4586..37b91c8 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -405,7 +405,6 @@  static BlockBackend *blockdev_init(const char *file, QDict *bs_opts,
         bdrv_flags |= BDRV_O_NO_FLUSH;
     }
 
-#ifdef CONFIG_LINUX_AIO
     if ((buf = qemu_opt_get(opts, "aio")) != NULL) {
         if (!strcmp(buf, "native")) {
             bdrv_flags |= BDRV_O_NATIVE_AIO;
@@ -416,7 +415,6 @@  static BlockBackend *blockdev_init(const char *file, QDict *bs_opts,
            goto early_err;
         }
     }
-#endif
 
     if ((buf = qemu_opt_get(opts, "format")) != NULL) {
         if (is_help_option(buf)) {