[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH for-1.4] block/raw-posix: Build fix for O_ASYNC
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PATCH for-1.4] block/raw-posix: Build fix for O_ASYNC |
Date: |
Mon, 28 Jan 2013 10:47:28 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 |
Il 26/01/2013 14:38, Andreas Färber ha scritto:
> Commit eeb6b45d48800e96f67ef2a5c80332557fd45ddb (block: raw-posix image
> file reopen) broke the build on OpenIndiana.
>
> illumos has no O_ASYNC. Exclude it from flags to be compared and
> use I_SETSIG ioctl after newly opening file.
>
> Cf. e61ab1da7e98357da47c54d8f893b9bd6ff2f7f9 for qemu-ga.
>
> Cc: address@hidden (1.3.x)
> Cc: Jeff Cody <address@hidden>
> Signed-off-by: Andreas Färber <address@hidden>
> ---
> block/raw-posix.c | 14 +++++++++++++-
> 1 Datei geändert, 13 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)
>
> diff --git a/block/raw-posix.c b/block/raw-posix.c
> index 657af95..336c938 100644
> --- a/block/raw-posix.c
> +++ b/block/raw-posix.c
> @@ -46,6 +46,7 @@
> #ifdef __sun__
> #define _POSIX_PTHREAD_SEMANTICS 1
> #include <sys/dkio.h>
> +#include <stropts.h>
> #endif
> #ifdef __linux__
> #include <sys/types.h>
> @@ -345,7 +346,10 @@ static int raw_reopen_prepare(BDRVReopenState *state,
>
> raw_s->fd = -1;
>
> - int fcntl_flags = O_APPEND | O_ASYNC | O_NONBLOCK;
> + int fcntl_flags = O_APPEND | O_NONBLOCK;
> +#ifndef CONFIG_SOLARIS
> + fcntl_flags |= O_ASYNC;
> +#endif
> #ifdef O_NOATIME
> fcntl_flags |= O_NOATIME;
> #endif
> @@ -376,6 +380,14 @@ static int raw_reopen_prepare(BDRVReopenState *state,
> raw_s->fd = qemu_open(state->bs->filename, raw_s->open_flags);
> if (raw_s->fd == -1) {
> ret = -1;
> + } else {
> +#ifdef CONFIG_SOLARIS
> + ret = ioctl(raw_s->fd, I_SETSIG, S_OUTPUT | S_INPUT | S_HIPRI);
> + if (ret == -1) {
> + qemu_close(raw_s->fd);
> + raw_s->fd = -1;
> + }
> +#endif
The flag is not set unconditionally. It is only set if it was in
s->open_flags, and it should never be.
I would just add an
#ifdef O_ASYNC
/* Not all operating systems have O_ASYNC, and those that don't
* will not let us track the state into raw_s->open_flags (typically
* you achieve the same effect with an ioctl, for example I_SETSIG
* on Solaris). But we do not use O_ASYNC, so that's fine.
*/
assert((s->open_flags & O_ASYNC) == 0);
#endif
Paolo