Re: [Qemu-devel] [PATCH v1 22/22] migration: remove qemu_get_fd method from QEMUFile

[Dr. David Alan Gilbert]

* Daniel P. Berrange (address@hidden) wrote:
> Now that there is a set_blocking callback in QEMUFileOps,
> and all users needing non-blocking support have been
> converted to QIOChannel, there is no longer any codepath
> requiring the qemu_get_fd() method for QEMUFile. Remove it
> to avoid further code being introduced with an expectation
> of direct file handle access.
> 
> Signed-off-by: Daniel P. Berrange <address@hidden>

Reviewed-by: Dr. David Alan Gilbert <address@hidden>

Dave

> ---
>  include/migration/qemu-file.h |  1 -
>  migration/qemu-file.c         | 14 --------------
>  2 files changed, 15 deletions(-)
> 
> diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h
> index 4ee40e4..68bc165 100644
> --- a/include/migration/qemu-file.h
> +++ b/include/migration/qemu-file.h
> @@ -104,7 +104,6 @@ typedef int (QEMUFileShutdownFunc)(void *opaque, bool rd, 
> bool wr);
>  typedef struct QEMUFileOps {
>      QEMUFileGetBufferFunc *get_buffer;
>      QEMUFileCloseFunc *close;
> -    QEMUFileGetFD *get_fd;
>      QEMUFileSetBlocking *set_blocking;
>      QEMUFileWritevBufferFunc *writev_buffer;
>      QEMURetPathFunc *get_return_path;
> diff --git a/migration/qemu-file.c b/migration/qemu-file.c
> index 372a6b9..baef865 100644
> --- a/migration/qemu-file.c
> +++ b/migration/qemu-file.c
> @@ -267,14 +267,6 @@ static ssize_t qemu_fill_buffer(QEMUFile *f)
>      return len;
>  }
>  
> -int qemu_get_fd(QEMUFile *f)
> -{
> -    if (f->ops->get_fd) {
> -        return f->ops->get_fd(f->opaque);
> -    }
> -    return -1;
> -}
> -
>  void qemu_update_position(QEMUFile *f, size_t size)
>  {
>      f->pos += size;
> @@ -687,11 +679,5 @@ void qemu_file_set_blocking(QEMUFile *f, bool block)
>  {
>      if (f->ops->set_blocking) {
>          f->ops->set_blocking(f->opaque, block);
> -    } else {
> -        if (block) {
> -            qemu_set_block(qemu_get_fd(f));
> -        } else {
> -            qemu_set_nonblock(qemu_get_fd(f));
> -        }
>      }
>  }
> -- 
> 2.5.0
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK